This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11887

simplemerge: make `localorother` a "mode" instead of a separate thing
ClosedPublic

Authored by martinvonz on Dec 8 2021, 12:56 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG5151b0f6519e: simplemerge: make `localorother` a "mode" instead of a separate thing
Summary

simplemerge() takes a mode argument, which can be "union", "merge"
or "mergediff", and a localorother argument, which can be None,
"local", or "other". The two options are not at all orthogonal -- most
combinations don't make sense. Also, at least "union", "local", and
"other" are very closely related. Therefore, it makes sense to combine
them into one.

It probably makes sense to split the mode argument into resolve
and marker_style, where the former can be None, "union", "local",
or "other", and the latter can be "merge", "merge3", "mergediff", or
"minimize". This is a good step in that direction whether or not we
end up doing that.

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

Diff 31548

mercurial/filemerge.py

labels = _defaultconflictlabels labels = _defaultconflictlabels
if len(labels) < 3: if len(labels) < 3:
labels.append(b'base') labels.append(b'base')
return _merge( return _merge(
repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'mergediff' repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'mergediff'
) )
def _imergeauto(
repo,
mynode,
fcd,
fco,
fca,
toolconf,
backup,
labels=None,
localorother=None,
):
"""
Generic driver for _imergelocal and _imergeother
"""
assert localorother is not None
r = simplemerge.simplemerge(
repo.ui, fcd, fca, fco, label=labels, localorother=localorother
)
return True, r
@internaltool(b'merge-local', mergeonly, precheck=_mergecheck) @internaltool(b'merge-local', mergeonly, precheck=_mergecheck)
def _imergelocal(*args, **kwargs): def _imergelocal(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
Like :merge, but resolve all conflicts non-interactively in favor Like :merge, but resolve all conflicts non-interactively in favor
of the local `p1()` changes.""" of the local `p1()` changes."""
success, status = _imergeauto(localorother=b'local', *args, **kwargs) return _merge(
return success, status, False repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'local'
)
@internaltool(b'merge-other', mergeonly, precheck=_mergecheck) @internaltool(b'merge-other', mergeonly, precheck=_mergecheck)
def _imergeother(*args, **kwargs): def _imergeother(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
Like :merge, but resolve all conflicts non-interactively in favor Like :merge, but resolve all conflicts non-interactively in favor
of the other `p2()` changes.""" of the other `p2()` changes."""
success, status = _imergeauto(localorother=b'other', *args, **kwargs) return _merge(
return success, status, False repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'other'
)
@internaltool( @internaltool(
b'tagmerge', b'tagmerge',
mergeonly, mergeonly,
_( _(
b"automatic tag merging of %s failed! " b"automatic tag merging of %s failed! "
b"(use 'hg resolve --tool :merge' or another merge " b"(use 'hg resolve --tool :merge' or another merge "

mercurial/simplemerge.py

localtext = readctx(localctx) localtext = readctx(localctx)
basetext = readctx(basectx) basetext = readctx(basectx)
othertext = readctx(otherctx) othertext = readctx(otherctx)
except error.Abort: except error.Abort:
return 1 return 1
m3 = Merge3Text(basetext, localtext, othertext) m3 = Merge3Text(basetext, localtext, othertext)
extrakwargs = { extrakwargs = {
"localorother": opts.get("localorother", None), "localorother": None,
'minimize': True, 'minimize': True,
} }
if mode == b'union': if mode == b'union':
extrakwargs['start_marker'] = None extrakwargs['start_marker'] = None
extrakwargs['mid_marker'] = None extrakwargs['mid_marker'] = None
extrakwargs['end_marker'] = None extrakwargs['end_marker'] = None
elif mode == b'local':
extrakwargs['localorother'] = b'local'
elif mode == b'other':
extrakwargs['localorother'] = b'other'
elif name_base is not None: elif name_base is not None:
extrakwargs['base_marker'] = b'|||||||' extrakwargs['base_marker'] = b'|||||||'
extrakwargs['name_base'] = name_base extrakwargs['name_base'] = name_base
extrakwargs['minimize'] = False extrakwargs['minimize'] = False
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: