( )⚙ D12015 filemerge: set default labels a little earlier

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12015

filemerge: set default labels a little earlier
ClosedPublic

Authored by martinvonz on Jan 21 2022, 6:31 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGa809f1465a76: filemerge: set default labels a little earlier
Summary

By setting the default labels a little earlier, we can rely on them
always being set, as far as I can tell. It may actually even be fine
to rely on that even if we don't set them earlier, but it makes more
sense to me to do it.

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.

Event Timeline

martinvonz created this revision.Jan 21 2022, 6:31 PM
Alphare accepted this revision.Jan 24 2022, 4:56 AM
This revision is now accepted and ready to land.Jan 24 2022, 4:56 AM
martinvonz added a commit: rHGa809f1465a76: filemerge: set default labels a little earlier.Jan 24 2022, 12:29 PM
Closed by commit rHGa809f1465a76: filemerge: set default labels a little earlier (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (11 lines)

Diff 31828

mercurial/filemerge.py

precheck=_mergecheck, precheck=_mergecheck,
) )
def _imerge3(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None): def _imerge3(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
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:
labels = _defaultconflictlabels
if len(labels) < 3: if len(labels) < 3:
labels.append(b'base') labels.append(b'base')
return _merge(repo, fcd, fco, fca, labels, b'merge3') return _merge(repo, fcd, fco, fca, labels, b'merge3')
@internaltool( @internaltool(
b'merge3-lie-about-conflicts', b'merge3-lie-about-conflicts',
fullmerge, fullmerge,
) )
def _imerge_diff(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None): def _imerge_diff(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
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. The marker will have two sections, one with the the partially merged file. The marker will have two sections, one with the
content from one side of the merge, and one with a diff from the base content from one side of the merge, and one with a diff from the base
content to the content on the other side. (experimental)""" content to the content on the other side. (experimental)"""
if not labels:
labels = _defaultconflictlabels
if len(labels) < 3: if len(labels) < 3:
labels.append(b'base') labels.append(b'base')
return _merge(repo, fcd, fco, fca, labels, b'mergediff') return _merge(repo, fcd, fco, fca, labels, b'mergediff')
@internaltool(b'merge-local', mergeonly, precheck=_mergecheck) @internaltool(b'merge-local', mergeonly, precheck=_mergecheck)
def _imergelocal(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None): def _imergelocal(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
label = (b'%s:' % label).ljust(pad + 1) label = (b'%s:' % label).ljust(pad + 1)
mark = b'%s %s' % (label, templateresult) mark = b'%s %s' % (label, templateresult)
mark = mark.splitlines()[0] # split for safety mark = mark.splitlines()[0] # split for safety
# 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
return stringutil.ellipsis(mark, 80 - 8) return stringutil.ellipsis(mark, 80 - 8)
_defaultconflictlabels = [b'local', b'other']
def _formatlabels(repo, fcd, fco, fca, labels, tool=None): def _formatlabels(repo, fcd, fco, fca, labels, tool=None):
"""Formats the given labels using the conflict marker template. """Formats the given labels using the conflict marker template.
Returns a list of formatted labels. Returns a list of formatted labels.
""" """
cd = fcd.changectx() cd = fcd.changectx()
co = fco.changectx() co = fco.changectx()
ca = fca.changectx() ca = fca.changectx()
func = _xmerge func = _xmerge
mergetype = fullmerge mergetype = fullmerge
onfailure = _(b"merging %s failed!\n") onfailure = _(b"merging %s failed!\n")
precheck = None precheck = None
isexternal = True isexternal = True
toolconf = tool, toolpath, binary, symlink, scriptfn toolconf = tool, toolpath, binary, symlink, scriptfn
if not labels:
labels = [b'local', b'other']
if mergetype == nomerge: if mergetype == nomerge:
return func(repo, mynode, fcd, fco, fca, toolconf, labels) return func(repo, mynode, fcd, fco, fca, toolconf, labels)
if orig != fco.path(): if orig != fco.path():
ui.status( ui.status(
_(b"merging %s and %s to %s\n") _(b"merging %s and %s to %s\n")
% (uipathfn(orig), uipathfn(fco.path()), fduipath) % (uipathfn(orig), uipathfn(fco.path()), fduipath)
) )
r = 1 r = 1
try: try:
internalmarkerstyle = ui.config(b'ui', b'mergemarkers') internalmarkerstyle = ui.config(b'ui', b'mergemarkers')
if isexternal: if isexternal:
markerstyle = _toolstr(ui, tool, b'mergemarkers') markerstyle = _toolstr(ui, tool, b'mergemarkers')
else: else:
markerstyle = internalmarkerstyle markerstyle = internalmarkerstyle
if not labels:
labels = _defaultconflictlabels
formattedlabels = labels formattedlabels = labels
if markerstyle != b'basic': if markerstyle != b'basic':
formattedlabels = _formatlabels( formattedlabels = _formatlabels(
repo, fcd, fco, fca, labels, tool=tool repo, fcd, fco, fca, labels, tool=tool
) )
if mergetype == fullmerge: if mergetype == fullmerge:
# conflict markers generated by premerge will use 'detailed' # conflict markers generated by premerge will use 'detailed'