--- a/mercurial/cmdutil.py Thu Jan 31 14:29:24 2019 -0800
+++ b/mercurial/cmdutil.py Thu Jan 31 14:47:34 2019 -0800
@@ -282,7 +282,9 @@
status = repo.status(match=match)
if not force:
repo.checkcommitpatterns(wctx, vdirs, match, status, fail)
- diffopts = patch.difffeatureopts(ui, opts=opts)
+ diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True,
+ section='commands',
+ configprefix='commit.interactive.')
diffopts.nodates = True
diffopts.git = True
diffopts.showfunc = True
@@ -3126,7 +3128,9 @@
# Prompt the user for changes to revert
torevert = [f for f in actions['revert'][0] if f not in excluded_files]
m = scmutil.matchfiles(repo, torevert)
- diffopts = patch.difffeatureopts(repo.ui)
+ diffopts = patch.difffeatureopts(repo.ui, whitespace=True,
+ section='commands',
+ configprefix='revert.interactive.')
diffopts.nodates = True
diffopts.git = True
operation = 'discard'