This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12017

filemerge: work with `simplemerge.MergeInput` in `filemerge()`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG07069fcd9a6e: filemerge: work with `simplemerge.MergeInput` in `filemerge()`
Summary

We currently pass around pairs of file context objects and labels
between functions in the filemerge module. I plan to pass around
simplemerge.MergeInput instead. This patch prepares for that by
using the type internally in filemerge.filemerge().

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 (64 lines)

Diff 31830

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 _formatlabel(ctx, template, label, pad): def _formatlabel(input, template, 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.
""" """
ctx = input.fctx.changectx()
if ctx.node() is None: if ctx.node() is None:
ctx = ctx.p1() ctx = ctx.p1()
props = {b'ctx': ctx} props = {b'ctx': ctx}
templateresult = template.renderdefault(props) templateresult = template.renderdefault(props)
label = (b'%s:' % label).ljust(pad + 1) label = (b'%s:' % input.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) input.label = stringutil.ellipsis(mark, 80 - 8)
def _formatlabels(repo, fcd, fco, fca, labels, tool=None): def _formatlabels(repo, inputs, 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()
co = fco.changectx()
ca = fca.changectx()
ui = repo.ui ui = repo.ui
template = ui.config(b'command-templates', b'mergemarker') template = ui.config(b'command-templates', b'mergemarker')
if tool is not None: if tool is not None:
template = _toolstr(ui, tool, b'mergemarkertemplate', template) template = _toolstr(ui, tool, b'mergemarkertemplate', template)
template = templater.unquotestring(template) template = templater.unquotestring(template)
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(input.label) for input in inputs)
newlabels = [ return [_formatlabel(input, tmpl, pad) for input in inputs]
_formatlabel(cd, tmpl, labels[0], pad),
_formatlabel(co, tmpl, labels[1], pad),
_formatlabel(ca, tmpl, labels[2], pad),
]
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".
""" """
if labels is None: if labels is None:
isexternal = True isexternal = True
toolconf = tool, toolpath, binary, symlink, scriptfn toolconf = tool, toolpath, binary, symlink, scriptfn
if not labels: if not labels:
labels = [b'local', b'other'] labels = [b'local', b'other']
if len(labels) < 3: if len(labels) < 3:
labels.append(b'base') labels.append(b'base')
local = simplemerge.MergeInput(fcd, labels[0])
other = simplemerge.MergeInput(fco, labels[1])
base = simplemerge.MergeInput(fca, labels[2])
if mergetype == nomerge: if mergetype == nomerge:
return func(repo, mynode, fcd, fco, fca, toolconf, labels) return func(
repo,
mynode,
fcd,
fco,
fca,
toolconf,
[local.label, other.label, base.label],
)
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)
) )
else: else:
ui.status(_(b"merging %s\n") % fduipath) ui.status(_(b"merging %s\n") % 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
formattedlabels = labels
if markerstyle != b'basic':
formattedlabels = _formatlabels(
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'
# settings if either ui.mergemarkers or the tool's mergemarkers # settings if either ui.mergemarkers or the tool's mergemarkers
# setting is 'detailed'. This way tools can have basic labels in # setting is 'detailed'. This way tools can have basic labels in
# space-constrained areas of the UI, but still get full information # space-constrained areas of the UI, but still get full information
# in conflict markers if premerge is 'keep' or 'keep-merge3'. # in conflict markers if premerge is 'keep' or 'keep-merge3'.
premergelabels = labels
labeltool = None labeltool = None
if markerstyle != b'basic': if markerstyle != b'basic':
# respect 'tool's mergemarkertemplate (which defaults to # respect 'tool's mergemarkertemplate (which defaults to
# command-templates.mergemarker) # command-templates.mergemarker)
labeltool = tool labeltool = tool
if internalmarkerstyle != b'basic' or markerstyle != b'basic': if internalmarkerstyle != b'basic' or markerstyle != b'basic':
premergelabels = _formatlabels( _formatlabels(repo, [local, other, base], tool=labeltool)
repo, fcd, fco, fca, premergelabels, tool=labeltool
)
r = _premerge( r = _premerge(
repo, fcd, fco, fca, toolconf, backup, labels=premergelabels repo,
fcd,
fco,
fca,
toolconf,
backup,
labels=[local.label, other.label, base.label],
) )
# we're done if premerge was successful (r is 0) # we're done if premerge was successful (r is 0)
if not r: if not r:
return r, False return r, False
# Reset to basic labels
local.label = labels[0]
other.label = labels[1]
base.label = labels[2]
if markerstyle != b'basic':
_formatlabels(repo, [local, other, base], tool=tool)
needcheck, r, deleted = func( needcheck, r, deleted = func(
repo, repo,
mynode, mynode,
fcd, fcd,
fco, fco,
fca, fca,
toolconf, toolconf,
backup, backup,
labels=formattedlabels, labels=[local.label, other.label, base.label],
) )
if needcheck: if needcheck:
r = _check(repo, r, ui, tool, fcd, backup) r = _check(repo, r, ui, tool, fcd, backup)
if r: if r:
if onfailure: if onfailure:
if wctx.isinmemory(): if wctx.isinmemory():