[Updated] D12151: simplemerge: remove now-unused arguments

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHG7dad4665d223: simplemerge: remove now-unused arguments (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D12151?vs=32166&id=32195

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D12151/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D12151

AFFECTED FILES
  contrib/simplemerge
  mercurial/filemerge.py
  mercurial/simplemerge.py

CHANGE DETAILS

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -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.
 
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -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())
diff --git a/contrib/simplemerge b/contrib/simplemerge
--- a/contrib/simplemerge
+++ b/contrib/simplemerge
@@ -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)



To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220215/34d6396f/attachment-0002.html>