This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11977

simplemerge: move default labels to simplemerge extension
ClosedPublic

Authored by martinvonz on Jan 12 2022, 1:55 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6ad70879d2bd: simplemerge: move default labels to simplemerge extension
rHG36f1591316aa: simplemerge: move default labels to simplemerge extension
Summary

I want to remove knowledge of paths from the simplemerge core
module. As part of that, let's move the default labels from the core
module to the extension.

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
Mcontrib/simplemerge (4 lines)
Mmercurial/simplemerge.py (8 lines)

Diff 31671

contrib/simplemerge

if opts[b'help']: if opts[b'help']:
showhelp() showhelp()
sys.exit(0) sys.exit(0)
if len(args) != 3: if len(args) != 3:
raise ParseError(_(b'wrong number of arguments').decode('utf8')) raise ParseError(_(b'wrong number of arguments').decode('utf8'))
if len(opts[b'label']) > 2: if len(opts[b'label']) > 2:
opts[b'mode'] = b'merge3' opts[b'mode'] = b'merge3'
local, base, other = args local, base, other = args
overrides = opts[b'label']
labels = [local, other, base]
labels[: len(overrides)] = overrides
opts[b'label'] = labels
sys.exit( sys.exit(
simplemerge.simplemerge( simplemerge.simplemerge(
uimod.ui.load(), uimod.ui.load(),
context.arbitraryfilectx(local), context.arbitraryfilectx(local),
context.arbitraryfilectx(base), context.arbitraryfilectx(base),
context.arbitraryfilectx(other), context.arbitraryfilectx(other),
**pycompat.strkwargs(opts) **pycompat.strkwargs(opts)
) )

mercurial/simplemerge.py

msg = _(b"%s looks like a binary file.") % path msg = _(b"%s looks like a binary file.") % path
if not opts.get('quiet'): if not opts.get('quiet'):
ui.warn(_(b'warning: %s\n') % msg) ui.warn(_(b'warning: %s\n') % msg)
if not opts.get('text'): if not opts.get('text'):
raise error.Abort(msg) raise error.Abort(msg)
return text return text
def _picklabels(defaults, overrides): def _picklabels(overrides):
if len(overrides) > 3: if len(overrides) > 3:
raise error.Abort(_(b"can only specify three labels.")) raise error.Abort(_(b"can only specify three labels."))
result = defaults[:] result = [None, None, None]
for i, override in enumerate(overrides): for i, override in enumerate(overrides):
result[i] = override result[i] = override
return result return result
def _detect_newline(m3): def _detect_newline(m3):
if len(m3.a) > 0: if len(m3.a) > 0:
if m3.a[0].endswith(b'\r\n'): if m3.a[0].endswith(b'\r\n'):
mode = opts.get('mode', b'merge') mode = opts.get('mode', b'merge')
if mode == b'union': if mode == b'union':
lines = _resolve(m3, (1, 2)) lines = _resolve(m3, (1, 2))
elif mode == b'local': elif mode == b'local':
lines = _resolve(m3, (1,)) lines = _resolve(m3, (1,))
elif mode == b'other': elif mode == b'other':
lines = _resolve(m3, (2,)) lines = _resolve(m3, (2,))
else: else:
name_a, name_b, name_base = _picklabels( name_a, name_b, name_base = _picklabels(opts.get('label', []))
[localctx.path(), otherctx.path(), None], opts.get('label', [])
)
if mode == b'mergediff': if mode == b'mergediff':
lines, conflicts = render_mergediff(m3, name_a, name_b, name_base) lines, conflicts = render_mergediff(m3, name_a, name_b, name_base)
else: else:
extrakwargs = { extrakwargs = {
'minimize': True, 'minimize': True,
} }
if mode == b'merge3': if mode == b'merge3':
extrakwargs['base_marker'] = b'|||||||' extrakwargs['base_marker'] = b'|||||||'