This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12151

simplemerge: remove now-unused arguments
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7dad4665d223: simplemerge: remove now-unused arguments
Summary

The ui argument is no longer needed now that we don't handle
--print in the library code.

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.Feb 8 2022, 4:26 PM
martinvonz updated this revision to Diff 32105.Feb 8 2022, 5:10 PM
martinvonz added a parent revision: D12150: merge: fix documented order of `labels` argument.Feb 10 2022, 9:55 PM
martinvonz retitled this revision from simplemerge: remove now-unused `ui` argument to simplemerge: remove now-unused arguments.
martinvonz added a child revision: D12153: mergestate: use an early return for trivial merges.
martinvonz updated this revision to Diff 32140.
Alphare accepted this revision.Feb 14 2022, 5:50 AM
This revision is now accepted and ready to land.Feb 14 2022, 5:50 AM
martinvonz added a commit: rHG7dad4665d223: simplemerge: remove now-unused arguments.Feb 15 2022, 7:56 AM
Closed by commit rHG7dad4665d223: simplemerge: remove now-unused arguments (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/simplemerge (3 lines)
Mmercurial/filemerge.py (4 lines)
Mmercurial/simplemerge.py (3 lines)

Diff 32195

contrib/simplemerge

quiet = opts.get(b'quiet') quiet = opts.get(b'quiet')
allow_binary = opts.get(b'text') allow_binary = opts.get(b'text')
ui = uimod.ui.load() ui = uimod.ui.load()
_verifytext(local_input, ui, quiet=quiet, allow_binary=allow_binary) _verifytext(local_input, ui, quiet=quiet, allow_binary=allow_binary)
_verifytext(base_input, ui, quiet=quiet, allow_binary=allow_binary) _verifytext(base_input, ui, quiet=quiet, allow_binary=allow_binary)
_verifytext(other_input, ui, quiet=quiet, allow_binary=allow_binary) _verifytext(other_input, ui, quiet=quiet, allow_binary=allow_binary)
merged_text, conflicts = simplemerge.simplemerge( merged_text, conflicts = simplemerge.simplemerge(
ui,
local_input, local_input,
base_input, base_input,
other_input, other_input,
mode, mode,
quiet=True,
allow_binary=allow_binary, allow_binary=allow_binary,
print_result=opts.get(b'print'),
) )
if opts.get(b'print'): if opts.get(b'print'):
ui.fout.write(merged_text) ui.fout.write(merged_text)
else: else:
util.writefile(local, merged_text) util.writefile(local, merged_text)
sys.exit(1 if conflicts else 0) 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'
if any( if any(
stringutil.binary(input.text()) for input in (local, base, other) stringutil.binary(input.text()) for input in (local, base, other)
): ):
return 1 # continue merging return 1 # continue merging
merged_text, conflicts = simplemerge.simplemerge( merged_text, conflicts = simplemerge.simplemerge(
ui, local, base, other, mode=mode local, base, other, mode=mode
) )
if not conflicts or premerge in validkeep: if not conflicts or premerge in validkeep:
# fcd.flags() already has the merged flags (done in # fcd.flags() already has the merged flags (done in
# mergestate.resolve()) # mergestate.resolve())
local.fctx.write(merged_text, local.fctx.flags()) local.fctx.write(merged_text, local.fctx.flags())
if not conflicts: if not conflicts:
ui.debug(b" premerge successful\n") ui.debug(b" premerge successful\n")
return 0 return 0
try: try:
_verifytext(local, ui) _verifytext(local, ui)
_verifytext(base, ui) _verifytext(base, ui)
_verifytext(other, ui) _verifytext(other, ui)
except error.Abort: except error.Abort:
return True, True, False return True, True, False
else: else:
merged_text, conflicts = simplemerge.simplemerge( merged_text, conflicts = simplemerge.simplemerge(
ui, local, base, other, mode=mode local, base, other, mode=mode
) )
# fcd.flags() already has the merged flags (done in # fcd.flags() already has the merged flags (done in
# mergestate.resolve()) # mergestate.resolve())
local.fctx.write(merged_text, local.fctx.flags()) local.fctx.write(merged_text, local.fctx.flags())
return True, conflicts, False return True, conflicts, False
@internaltool( @internaltool(

mercurial/simplemerge.py

# Maintain that behavior today for BC, though perhaps in the future # Maintain that behavior today for BC, though perhaps in the future
# it'd be worth considering whether merging encoded data (what the # it'd be worth considering whether merging encoded data (what the
# repository usually sees) might be more useful. # repository usually sees) might be more useful.
self._text = self.fctx.decodeddata() self._text = self.fctx.decodeddata()
return self._text return self._text
def simplemerge( def simplemerge(
ui,
local, local,
base, base,
other, other,
mode=b'merge', mode=b'merge',
quiet=False,
allow_binary=False, allow_binary=False,
print_result=False,
): ):
"""Performs the simplemerge algorithm. """Performs the simplemerge algorithm.
The merged result is written into `localctx`. The merged result is written into `localctx`.
""" """
if not allow_binary: if not allow_binary:
_verifytext(local) _verifytext(local)