( )⚙ D12151 simplemerge: remove now-unused arguments

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
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

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 (2 lines)
Mmercurial/filemerge.py (4 lines)
Mmercurial/simplemerge.py (2 lines)

Diff 32105

contrib/simplemerge

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)
merged_text, conflicts = simplemerge.simplemerge( merged_text, conflicts = simplemerge.simplemerge(
ui, local_input, base_input, other_input, **opts local_input, base_input, other_input, **opts
) )
if merged_text is not None: if merged_text is not None:
if opts['print']: if opts['print']:
ui.fout.write(merged_text) ui.fout.write(merged_text)
else: else:
with open(local, 'wb') as f: with open(local, 'wb') as f:
f.write(merged_text) f.write(merged_text)
sys.exit(1 if conflicts else 0) sys.exit(1 if conflicts else 0)

mercurial/filemerge.py

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:
return 1 return 1
else: else:
merged_text, conflicts = simplemerge.simplemerge( merged_text, conflicts = simplemerge.simplemerge(
ui, local, base, other, mode=mode local, base, other, mode=mode
) )
if merged_text is not None and ( if merged_text is not None and (
not conflicts or premerge in validkeep 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:
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:
conflicts = True conflicts = True
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())
if merged_text is not None: if merged_text is not None:
local.fctx.write(merged_text, local.fctx.flags()) local.fctx.write(merged_text, local.fctx.flags())
return True, conflicts, False return True, conflicts, False

mercurial/simplemerge.py

if stringutil.binary(text): if stringutil.binary(text):
msg = _(b"%s looks like a binary file.") % self.fctx.path() msg = _(b"%s looks like a binary file.") % self.fctx.path()
if not opts.get('quiet'): if not opts.get('quiet'):
ui.warn(_(b'warning: %s\n') % msg) ui.warn(_(b'warning: %s\n') % msg)
if not opts.get('text'): if not opts.get('text'):
raise error.Abort(msg) raise error.Abort(msg)
def simplemerge(ui, local, base, other, **opts): def simplemerge(local, base, other, **opts):
"""Performs the simplemerge algorithm. """Performs the simplemerge algorithm.
The merged result is written into `localctx`. The merged result is written into `localctx`.
""" """
m3 = Merge3Text(base.text(), local.text(), other.text()) m3 = Merge3Text(base.text(), local.text(), other.text())
conflicts = False conflicts = False
mode = opts.get('mode', b'merge') mode = opts.get('mode', b'merge')