This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5787

diff: support ignoring config settings when parsing optional diffopts
AbandonedPublic

Authored by spectral on Jan 31 2019, 6:49 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Previously, there was no supported way of respecting diff options set on the
command line without picking up potentially breaking settings from the config.

With this change, we can call difffeatureopts(..., whitespace='noconfig') to
ignore the user's config for the whitespace category of "optional features",
but respect options set on the commandline (even whitespace options) and respect
the user's config for "non-optional features" (nodates, showfunc, context).

It's not clear if that last aspect is useful, but it seemed plausible that
setting diff.nodates or diff.showfunc should be respected even when running
commit --interactive, while it seems unlikely that the user intended to have
diff.ignoreblanklines apply when calling commit --interactive.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/diffutil.py (34 lines)

Diff 13660

mercurial/diffutil.py

whitespace=False, formatchanging=False): whitespace=False, formatchanging=False):
'''return diffopts with only opted-in features parsed '''return diffopts with only opted-in features parsed
Features: Features:
- git: git-style diffs - git: git-style diffs
- whitespace: whitespace options like ignoreblanklines and ignorews - whitespace: whitespace options like ignoreblanklines and ignorews
- formatchanging: options that will likely break or cause correctness issues - formatchanging: options that will likely break or cause correctness issues
with most diff parsers with most diff parsers
For the category settings (whitespace, git, formatchanging), the valid
values are True, False, or the string 'noconfig'. If the string 'noconfig'
is used, then only values in `opts` are considered, otherwise this returns
False (which is the default value for all options besides 'unified', which
does not set 'category').
''' '''
def get(key, name=None, getter=ui.configbool, forceplain=None): def get(key, name=None, getter=ui.configbool, forceplain=None,
category=None):
if opts: if opts:
v = opts.get(key) v = opts.get(key)
# diffopts flags are either None-default (which is passed # diffopts flags are either None-default (which is passed
# through unchanged, so we can identify unset values), or # through unchanged, so we can identify unset values), or
# some other falsey default (eg --unified, which defaults # some other falsey default (eg --unified, which defaults
# to an empty string). We only want to override the config # to an empty string). We only want to override the config
# entries from hgrc with command line values if they # entries from hgrc with command line values if they
# appear to have been set, which is any truthy value, # appear to have been set, which is any truthy value,
# True, or False. # True, or False.
if v or isinstance(v, bool): if v or isinstance(v, bool):
return v return v
if forceplain is not None and ui.plain(): if forceplain is not None and ui.plain():
return forceplain return forceplain
if category == 'noconfig':
return False
return getter(section, name or key, untrusted=untrusted) return getter(section, name or key, untrusted=untrusted)
# core options, expected to be understood by every diff parser # core options, expected to be understood by every diff parser
buildopts = { buildopts = {
'nodates': get('nodates'), 'nodates': get('nodates'),
'showfunc': get('show_function', 'showfunc'), 'showfunc': get('show_function', 'showfunc'),
'context': get('unified', getter=ui.config), 'context': get('unified', getter=ui.config),
} }
buildopts['xdiff'] = ui.configbool('experimental', 'xdiff') buildopts['xdiff'] = ui.configbool('experimental', 'xdiff')
if git: if git:
buildopts['git'] = get('git') buildopts['git'] = get('git', category=git)
# since this is in the experimental section, we need to call # since this is in the experimental section, we need to call
# ui.configbool directory # ui.configbool directory
buildopts['showsimilarity'] = ui.configbool('experimental', buildopts['showsimilarity'] = ui.configbool('experimental',
'extendedheader.similarity') 'extendedheader.similarity')
# need to inspect the ui object instead of using get() since we want to # need to inspect the ui object instead of using get() since we want to
# test for an int # test for an int
hlen = 40 hlen = 40
elif hconf != 'none': elif hconf != 'none':
msg = _("invalid value for extendedheader.index: '%s'\n") msg = _("invalid value for extendedheader.index: '%s'\n")
ui.warn(msg % hconf) ui.warn(msg % hconf)
finally: finally:
buildopts['index'] = hlen buildopts['index'] = hlen
if whitespace: if whitespace:
buildopts['ignorews'] = get('ignore_all_space', 'ignorews') getws = lambda *args, **kwargs: get(*args, category=whitespace,
buildopts['ignorewsamount'] = get('ignore_space_change', **kwargs)
buildopts['ignorews'] = getws('ignore_all_space', 'ignorews')
buildopts['ignorewsamount'] = getws('ignore_space_change',
'ignorewsamount') 'ignorewsamount')
buildopts['ignoreblanklines'] = get('ignore_blank_lines', buildopts['ignoreblanklines'] = getws('ignore_blank_lines',
'ignoreblanklines') 'ignoreblanklines')
buildopts['ignorewseol'] = get('ignore_space_at_eol', 'ignorewseol') buildopts['ignorewseol'] = getws('ignore_space_at_eol', 'ignorewseol')
if formatchanging: if formatchanging:
getfc = lambda *args, **kwargs: get(*args, category=formatchanging,
**kwargs)
buildopts['text'] = opts and opts.get('text') buildopts['text'] = opts and opts.get('text')
binary = None if opts is None else opts.get('binary') binary = None if opts is None else opts.get('binary')
buildopts['nobinary'] = (not binary if binary is not None buildopts['nobinary'] = (not binary if binary is not None
else get('nobinary', forceplain=False)) else getfc('nobinary', forceplain=False))
buildopts['noprefix'] = get('noprefix', forceplain=False) buildopts['noprefix'] = getfc('noprefix', forceplain=False)
buildopts['worddiff'] = get('word_diff', 'word-diff', forceplain=False) buildopts['worddiff'] = getfc('word_diff', 'word-diff',
forceplain=False)
return mdiff.diffopts(**pycompat.strkwargs(buildopts)) return mdiff.diffopts(**pycompat.strkwargs(buildopts))