diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -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' diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -201,6 +201,7 @@ coreconfigitem('color', 'pagermode', default=dynamicdefault, ) +_registerdiffopts(section='commands', configprefix='commit.interactive.') coreconfigitem('commands', 'grep.all-files', default=False, ) @@ -213,6 +214,7 @@ coreconfigitem('commands', 'resolve.mark-check', default='none', ) +_registerdiffopts(section='commands', configprefix='revert.interactive.') coreconfigitem('commands', 'show.aliasprefix', default=list, )