This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11972

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc91418480cb0: simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
rHG18a01dce3d22: simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
Summary

Before this patch, we use a combination of mode and labels to
decide which marker style to use. That's mostly my own fault because I
was the one who added the mergediff as a "mode" instead of adding a
separate argument for marker style. Still, let's make these arguments
more orthogonal by ignoring the number of labels when deciding which
marker style to use.

This refactoring makes it a little clearer in the simplemerge
*extension* that passing more than 2 --label arguments changes the
marker style.

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 (2 lines)
Mmercurial/filemerge.py (19 lines)
Mmercurial/simplemerge.py (2 lines)

Diff 31666

contrib/simplemerge

args = fancyopts.fancyopts(bargv, options, opts) args = fancyopts.fancyopts(bargv, options, opts)
except getopt.GetoptError as e: except getopt.GetoptError as e:
raise ParseError(e) raise ParseError(e)
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:
opts[b'mode'] = b'merge3'
local, base, other = args local, base, other = args
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/filemerge.py

if premerge not in validkeep: if premerge not in validkeep:
_valid = b', '.join([b"'" + v + b"'" for v in validkeep]) _valid = b', '.join([b"'" + v + b"'" for v in validkeep])
raise error.ConfigError( raise error.ConfigError(
_(b"%s.premerge not valid ('%s' is neither boolean nor %s)") _(b"%s.premerge not valid ('%s' is neither boolean nor %s)")
% (tool, premerge, _valid) % (tool, premerge, _valid)
) )
if premerge: if premerge:
mode = b'merge'
if premerge in {b'keep-merge3', b'keep-mergediff'}:
if not labels: if not labels:
labels = _defaultconflictlabels labels = _defaultconflictlabels
if len(labels) < 3: if len(labels) < 3:
labels.append(b'base') labels.append(b'base')
mode = b'merge'
if premerge == b'keep-mergediff': if premerge == b'keep-mergediff':
mode = b'mergediff' mode = b'mergediff'
elif premerge == b'keep-merge3':
mode = b'merge3'
r = simplemerge.simplemerge( r = simplemerge.simplemerge(
ui, fcd, fca, fco, quiet=True, label=labels, mode=mode ui, fcd, fca, fco, quiet=True, label=labels, mode=mode
) )
if not r: if not r:
ui.debug(b" premerge successful\n") ui.debug(b" premerge successful\n")
return 0 return 0
if premerge not in validkeep: if premerge not in validkeep:
# restore from backup and try again # restore from backup and try again
Uses the internal non-interactive simple merge algorithm for merging Uses the internal non-interactive simple merge algorithm for merging
files. It will fail if there are any conflicts and leave markers in files. It will fail if there are any conflicts and leave markers in
the partially merged file. Marker will have three sections, one from each the partially merged file. Marker will have three sections, one from each
side of the merge and one for the base content.""" side of the merge and one for the base content."""
if not labels: if not labels:
labels = _defaultconflictlabels labels = _defaultconflictlabels
if len(labels) < 3: if len(labels) < 3:
labels.append(b'base') labels.append(b'base')
return _imerge(repo, mynode, fcd, fco, fca, toolconf, backup, labels) return _merge(
repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'merge3'
)
@internaltool( @internaltool(
b'merge3-lie-about-conflicts', b'merge3-lie-about-conflicts',
fullmerge, fullmerge,
b'', b'',
precheck=_mergecheck, precheck=_mergecheck,
) )

mercurial/simplemerge.py

[localctx.path(), otherctx.path(), None], opts.get('label', []) [localctx.path(), otherctx.path(), None], opts.get('label', [])
) )
if mode == b'mergediff': if mode == b'mergediff':
lines, conflicts = _mergediff(m3, name_a, name_b, name_base) lines, conflicts = _mergediff(m3, name_a, name_b, name_base)
else: else:
extrakwargs = { extrakwargs = {
'minimize': True, 'minimize': True,
} }
if name_base is not None: if mode == b'merge3':
extrakwargs['base_marker'] = b'|||||||' extrakwargs['base_marker'] = b'|||||||'
extrakwargs['name_base'] = name_base extrakwargs['name_base'] = name_base
extrakwargs['minimize'] = False extrakwargs['minimize'] = False
lines = list( lines = list(
m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs) m3.merge_lines(name_a=name_a, name_b=name_b, **extrakwargs)
) )
conflicts = m3.conflicts conflicts = m3.conflicts