( )⚙ D12148 simplemerge: move printing of merge result to extension

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12148

simplemerge: move printing of merge result to extension
ClosedPublic

Authored by martinvonz on Feb 8 2022, 4:26 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6ae3c97a0919: simplemerge: move printing of merge result to extension
Summary

The mercurial.simplemerge module still has some command-lines
processing that doesn't belong in such a low-level module. This patch
moves the handling of hg simplemerge --print to the extension by
having mercurial.simplemerge.simplemerge() return the merged text.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Feb 8 2022, 4:26 PM
Alphare added a subscriber: Alphare.Feb 14 2022, 5:47 AM
Alphare added inline comments.
contrib/simplemerge
115

Shouldn't this be using util.writefile?

martinvonz marked an inline comment as done.Feb 14 2022, 11:28 AM
Alphare accepted this revision.Feb 15 2022, 7:52 AM
This revision is now accepted and ready to land.Feb 15 2022, 7:52 AM

Revision Contents
Changeset List

PathPackages
Mcontrib/simplemerge (13 lines)
Mmercurial/filemerge.py (28 lines)
Mmercurial/simplemerge.py (9 lines)

Diff 32097

contrib/simplemerge

opts = pycompat.strkwargs(opts) opts = pycompat.strkwargs(opts)
try: try:
local_input.verifytext(ui, **opts) local_input.verifytext(ui, **opts)
base_input.verifytext(ui, **opts) base_input.verifytext(ui, **opts)
other_input.verifytext(ui, **opts) other_input.verifytext(ui, **opts)
except error.Abort: except error.Abort:
sys.exit(1) sys.exit(1)
sys.exit( merged_text, conflicts = simplemerge.simplemerge(
simplemerge.simplemerge(
ui, local_input, base_input, other_input, **opts ui, local_input, base_input, other_input, **opts
) )
) if merged_text is not None:
if opts['print']:
ui.fout.write(merged_text)
else:
AlphareUnsubmitted
Done

Shouldn't this be using util.writefile?

Alphare: Shouldn't this be using `util.writefile`?
with open(local, 'wb') as f:
f.write(merged_text)
sys.exit(1 if conflicts else 0)
except ParseError as e: except ParseError as e:
e = stringutil.forcebytestr(e) e = stringutil.forcebytestr(e)
procutil.stdout.write(b"%s: %s\n" % (sys.argv[0].encode('utf8'), e)) procutil.stdout.write(b"%s: %s\n" % (sys.argv[0].encode('utf8'), e))
showhelp() showhelp()
sys.exit(1) sys.exit(1)
except error.Abort as e: except error.Abort as e:
procutil.stderr.write(b"abort: %s\n" % e) procutil.stderr.write(b"abort: %s\n" % e)
sys.exit(255) sys.exit(255)
except KeyboardInterrupt: except KeyboardInterrupt:
sys.exit(255) sys.exit(255)

mercurial/filemerge.py

mode = b'mergediff' mode = b'mergediff'
elif premerge == b'keep-merge3': elif premerge == b'keep-merge3':
mode = b'merge3' mode = b'merge3'
try: try:
local.verifytext(ui, quiet=True) local.verifytext(ui, quiet=True)
base.verifytext(ui, quiet=True) base.verifytext(ui, quiet=True)
other.verifytext(ui, quiet=True) other.verifytext(ui, quiet=True)
except error.Abort: except error.Abort:
r = True return 1
else: else:
r = simplemerge.simplemerge(ui, local, base, other, mode=mode) merged_text, conflicts = simplemerge.simplemerge(
if not r: ui, local, base, other, mode=mode
)
# fcd.flags() already has the merged flags (done in
# mergestate.resolve())
if merged_text is not None:
local.fctx.write(merged_text, local.fctx.flags())
if not conflicts:
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
_restorebackup(local.fctx, backup) _restorebackup(local.fctx, backup)
return 1 # continue merging return 1 # continue merging
def _mergecheck(repo, mynode, fcd, fco, fca, toolconf): def _mergecheck(repo, mynode, fcd, fco, fca, toolconf):
tool, toolpath, binary, symlink, scriptfn = toolconf tool, toolpath, binary, symlink, scriptfn = toolconf
of merge, unless mode equals 'union' which suppresses the markers.""" of merge, unless mode equals 'union' which suppresses the markers."""
ui = repo.ui ui = repo.ui
try: try:
local.verifytext(ui) local.verifytext(ui)
base.verifytext(ui) base.verifytext(ui)
other.verifytext(ui) other.verifytext(ui)
except error.Abort: except error.Abort:
r = True conflicts = True
else: else:
r = simplemerge.simplemerge(ui, local, base, other, mode=mode) merged_text, conflicts = simplemerge.simplemerge(
return True, r, False ui, local, base, other, mode=mode
)
# fcd.flags() already has the merged flags (done in
# mergestate.resolve())
if merged_text is not None:
local.fctx.write(merged_text, local.fctx.flags())
return True, conflicts, False
@internaltool( @internaltool(
b'union', b'union',
fullmerge, fullmerge,
_( _(
b"warning: conflicts while merging %s! " b"warning: conflicts while merging %s! "
b"(edit, then use 'hg resolve --mark')\n" b"(edit, then use 'hg resolve --mark')\n"

mercurial/simplemerge.py

elif mode == b'merge3': elif mode == b'merge3':
labels = _format_labels(local, other, base) labels = _format_labels(local, other, base)
lines, conflicts = render_merge3(m3, *labels) lines, conflicts = render_merge3(m3, *labels)
else: else:
labels = _format_labels(local, other) labels = _format_labels(local, other)
lines, conflicts = render_minimized(m3, *labels) lines, conflicts = render_minimized(m3, *labels)
mergedtext = b''.join(lines) mergedtext = b''.join(lines)
if opts.get('print'): return mergedtext, conflicts
ui.fout.write(mergedtext)
else:
# local.fctx.flags() already has the merged flags (done in
# mergestate.resolve())
local.fctx.write(mergedtext, local.fctx.flags())
return conflicts