This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5833

diff: when looking for diff configs, support a configurable prefix
ClosedPublic

Authored by spectral on Feb 4 2019, 3:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG78b270a55dc6: diff: when looking for diff configs, support a configurable prefix
Summary

In a future commit, I want to make it possible to have the diff options pulled
from (as an example) commands.commit.interactive.ignorews; previously we only
supported this for customizable sections (so this would have needed a
commit-interactive section and been named commit-interactive.ignorews, which
felt a bit weird.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/diffutil.py (11 lines)

Diff 13803

mercurial/diffutil.py

from .i18n import _ from .i18n import _
from . import ( from . import (
mdiff, mdiff,
pycompat, pycompat,
) )
def diffallopts(ui, opts=None, untrusted=False, section='diff'): def diffallopts(ui, opts=None, untrusted=False, section='diff',
configprefix=''):
'''return diffopts with all features supported and parsed''' '''return diffopts with all features supported and parsed'''
return difffeatureopts(ui, opts=opts, untrusted=untrusted, section=section, return difffeatureopts(ui, opts=opts, untrusted=untrusted, section=section,
git=True, whitespace=True, formatchanging=True) git=True, whitespace=True, formatchanging=True,
configprefix=configprefix)
def difffeatureopts(ui, opts=None, untrusted=False, section='diff', git=False, def difffeatureopts(ui, opts=None, untrusted=False, section='diff', git=False,
whitespace=False, formatchanging=False): whitespace=False, formatchanging=False, configprefix=''):
'''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
''' '''
def get(key, name=None, getter=ui.configbool, forceplain=None): def get(key, name=None, getter=ui.configbool, forceplain=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
return getter(section, name or key, untrusted=untrusted) return getter(section, configprefix + (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')