simplemerge: remove now-unused arguments
The `ui` argument is no longer needed now that we don't handle
`--print` in the library code.
Differential Revision: https://phab.mercurial-scm.org/D12151
--- a/contrib/simplemerge Tue Jan 18 13:22:55 2022 -0800
+++ b/contrib/simplemerge Mon Feb 07 14:07:04 2022 -0800
@@ -118,14 +118,11 @@
_verifytext(other_input, ui, quiet=quiet, allow_binary=allow_binary)
merged_text, conflicts = simplemerge.simplemerge(
- ui,
local_input,
base_input,
other_input,
mode,
- quiet=True,
allow_binary=allow_binary,
- print_result=opts.get(b'print'),
)
if opts.get(b'print'):
ui.fout.write(merged_text)
--- a/mercurial/filemerge.py Tue Jan 18 13:22:55 2022 -0800
+++ b/mercurial/filemerge.py Mon Feb 07 14:07:04 2022 -0800
@@ -443,7 +443,7 @@
):
return 1 # continue merging
merged_text, conflicts = simplemerge.simplemerge(
- ui, local, base, other, mode=mode
+ local, base, other, mode=mode
)
if not conflicts or premerge in validkeep:
# fcd.flags() already has the merged flags (done in
@@ -492,7 +492,7 @@
return True, True, False
else:
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
# mergestate.resolve())
--- a/mercurial/simplemerge.py Tue Jan 18 13:22:55 2022 -0800
+++ b/mercurial/simplemerge.py Mon Feb 07 14:07:04 2022 -0800
@@ -493,14 +493,11 @@
def simplemerge(
- ui,
local,
base,
other,
mode=b'merge',
- quiet=False,
allow_binary=False,
- print_result=False,
):
"""Performs the simplemerge algorithm.