diffutil.py
135 lines
| 4.5 KiB
| text/x-python
|
PythonLexer
/ mercurial / diffutil.py
|
r38607 | # diffutil.py - utility functions related to diff and patch | ||
# | ||||
# Copyright 2006 Brendan Cully <brendan@kublai.com> | ||||
# Copyright 2007 Chris Mason <chris.mason@oracle.com> | ||||
# Copyright 2018 Octobus <octobus@octobus.net> | ||||
# | ||||
# This software may be used and distributed according to the terms of the | ||||
# GNU General Public License version 2 or any later version. | ||||
from .i18n import _ | ||||
from . import ( | ||||
mdiff, | ||||
pycompat, | ||||
) | ||||
|
r43346 | |||
def diffallopts( | ||||
|
r43347 | ui, opts=None, untrusted=False, section=b'diff', configprefix=b'' | ||
|
r43346 | ): | ||
|
r38607 | '''return diffopts with all features supported and parsed''' | ||
|
r43346 | return difffeatureopts( | ||
ui, | ||||
opts=opts, | ||||
untrusted=untrusted, | ||||
section=section, | ||||
git=True, | ||||
whitespace=True, | ||||
formatchanging=True, | ||||
configprefix=configprefix, | ||||
) | ||||
|
r38607 | |||
|
r43346 | |||
def difffeatureopts( | ||||
ui, | ||||
opts=None, | ||||
untrusted=False, | ||||
|
r43347 | section=b'diff', | ||
|
r43346 | git=False, | ||
whitespace=False, | ||||
formatchanging=False, | ||||
|
r43347 | configprefix=b'', | ||
|
r43346 | ): | ||
|
r46554 | """return diffopts with only opted-in features parsed | ||
|
r38607 | |||
Features: | ||||
- git: git-style diffs | ||||
- whitespace: whitespace options like ignoreblanklines and ignorews | ||||
- formatchanging: options that will likely break or cause correctness issues | ||||
with most diff parsers | ||||
|
r46554 | """ | ||
|
r43346 | |||
|
r38607 | def get(key, name=None, getter=ui.configbool, forceplain=None): | ||
if opts: | ||||
v = opts.get(key) | ||||
# diffopts flags are either None-default (which is passed | ||||
# through unchanged, so we can identify unset values), or | ||||
# some other falsey default (eg --unified, which defaults | ||||
# to an empty string). We only want to override the config | ||||
# entries from hgrc with command line values if they | ||||
# appear to have been set, which is any truthy value, | ||||
# True, or False. | ||||
if v or isinstance(v, bool): | ||||
return v | ||||
if forceplain is not None and ui.plain(): | ||||
return forceplain | ||||
|
r43346 | return getter( | ||
section, configprefix + (name or key), untrusted=untrusted | ||||
) | ||||
|
r38607 | |||
# core options, expected to be understood by every diff parser | ||||
buildopts = { | ||||
|
r43347 | b'nodates': get(b'nodates'), | ||
b'showfunc': get(b'show_function', b'showfunc'), | ||||
b'context': get(b'unified', getter=ui.config), | ||||
|
r38607 | } | ||
|
r43347 | buildopts[b'xdiff'] = ui.configbool(b'experimental', b'xdiff') | ||
|
r38607 | |||
if git: | ||||
|
r43347 | buildopts[b'git'] = get(b'git') | ||
|
r38607 | |||
# since this is in the experimental section, we need to call | ||||
# ui.configbool directory | ||||
|
r43347 | buildopts[b'showsimilarity'] = ui.configbool( | ||
b'experimental', b'extendedheader.similarity' | ||||
|
r43346 | ) | ||
|
r38607 | |||
# need to inspect the ui object instead of using get() since we want to | ||||
# test for an int | ||||
|
r43347 | hconf = ui.config(b'experimental', b'extendedheader.index') | ||
|
r38607 | if hconf is not None: | ||
hlen = None | ||||
try: | ||||
# the hash config could be an integer (for length of hash) or a | ||||
# word (e.g. short, full, none) | ||||
hlen = int(hconf) | ||||
if hlen < 0 or hlen > 40: | ||||
|
r43347 | msg = _(b"invalid length for extendedheader.index: '%d'\n") | ||
|
r38607 | ui.warn(msg % hlen) | ||
except ValueError: | ||||
# default value | ||||
|
r43347 | if hconf == b'short' or hconf == b'': | ||
|
r38607 | hlen = 12 | ||
|
r43347 | elif hconf == b'full': | ||
|
r38607 | hlen = 40 | ||
|
r43347 | elif hconf != b'none': | ||
msg = _(b"invalid value for extendedheader.index: '%s'\n") | ||||
|
r38607 | ui.warn(msg % hconf) | ||
finally: | ||||
|
r43347 | buildopts[b'index'] = hlen | ||
|
r38607 | |||
if whitespace: | ||||
|
r43347 | buildopts[b'ignorews'] = get(b'ignore_all_space', b'ignorews') | ||
buildopts[b'ignorewsamount'] = get( | ||||
b'ignore_space_change', b'ignorewsamount' | ||||
|
r43346 | ) | ||
|
r43347 | buildopts[b'ignoreblanklines'] = get( | ||
b'ignore_blank_lines', b'ignoreblanklines' | ||||
|
r43346 | ) | ||
|
r43347 | buildopts[b'ignorewseol'] = get(b'ignore_space_at_eol', b'ignorewseol') | ||
|
r38607 | if formatchanging: | ||
|
r50793 | buildopts[b'text'] = None if opts is None else opts.get(b'text') | ||
|
r43347 | binary = None if opts is None else opts.get(b'binary') | ||
buildopts[b'nobinary'] = ( | ||||
|
r43346 | not binary | ||
if binary is not None | ||||
|
r43347 | else get(b'nobinary', forceplain=False) | ||
|
r43346 | ) | ||
|
r43347 | buildopts[b'noprefix'] = get(b'noprefix', forceplain=False) | ||
buildopts[b'worddiff'] = get( | ||||
b'word_diff', b'word-diff', forceplain=False | ||||
) | ||||
|
r38607 | |||
return mdiff.diffopts(**pycompat.strkwargs(buildopts)) | ||||