This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11801

filemerge: rename _formatconflictmarker() since it formats a label
ClosedPublic

Authored by martinvonz on Nov 24 2021, 12:05 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG1eeec02cd919: filemerge: rename _formatconflictmarker() since it formats a label
Summary

_formatconflictmarker()'s name made me think that it would create
something like <<<<<<< and maybe some more stuff after it, but it's
actually just the label that comes after on the same line. So let's
rename it to _formatlabel(). That's better aligned with the
variables the result is assigned 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.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (8 lines)

Diff 31153

mercurial/filemerge.py

ui, repo, b"merge", toolpath, mergefn, {b'args': argslist}, True ui, repo, b"merge", toolpath, mergefn, {b'args': argslist}, True
) )
if raised: if raised:
r = 1 r = 1
repo.ui.debug(b'merge tool returned: %d\n' % r) repo.ui.debug(b'merge tool returned: %d\n' % r)
return True, r, False return True, r, False
def _formatconflictmarker(ctx, template, label, pad): def _formatlabel(ctx, template, label, pad):
"""Applies the given template to the ctx, prefixed by the label. """Applies the given template to the ctx, prefixed by the label.
Pad is the minimum width of the label prefix, so that multiple markers Pad is the minimum width of the label prefix, so that multiple markers
can have aligned templated parts. can have aligned templated parts.
""" """
if ctx.node() is None: if ctx.node() is None:
ctx = ctx.p1() ctx = ctx.p1()
tres = formatter.templateresources(ui, repo) tres = formatter.templateresources(ui, repo)
tmpl = formatter.maketemplater( tmpl = formatter.maketemplater(
ui, template, defaults=templatekw.keywords, resources=tres ui, template, defaults=templatekw.keywords, resources=tres
) )
pad = max(len(l) for l in labels) pad = max(len(l) for l in labels)
newlabels = [ newlabels = [
_formatconflictmarker(cd, tmpl, labels[0], pad), _formatlabel(cd, tmpl, labels[0], pad),
_formatconflictmarker(co, tmpl, labels[1], pad), _formatlabel(co, tmpl, labels[1], pad),
] ]
if len(labels) > 2: if len(labels) > 2:
newlabels.append(_formatconflictmarker(ca, tmpl, labels[2], pad)) newlabels.append(_formatlabel(ca, tmpl, labels[2], pad))
return newlabels return newlabels
def partextras(labels): def partextras(labels):
"""Return a dictionary of extra labels for use in prompts to the user """Return a dictionary of extra labels for use in prompts to the user
Intended use is in strings of the form "(l)ocal%(l)s". Intended use is in strings of the form "(l)ocal%(l)s".
""" """