Patchwork D12014: filemerge: remove unused arguments from `_merge()`

login
register
mail settings
Submitter phabricator
Date Jan. 21, 2022, 11:37 p.m.
Message ID <differential-rev-PHID-DREV-frgdtnwkqu5of6t36rzl-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50339/
State New
Headers show

Comments

phabricator - Jan. 21, 2022, 11:37 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -464,7 +464,7 @@ 
     return True
 
 
-def _merge(repo, mynode, fcd, fco, fca, toolconf, backup, labels, mode):
+def _merge(repo, fcd, fco, fca, labels, mode):
     """
     Uses the internal non-interactive simple merge algorithm for merging
     files. It will fail if there are any conflicts and leave markers in
@@ -499,9 +499,7 @@ 
     Uses the internal non-interactive simple merge algorithm for merging
     files. It will use both left and right sides for conflict regions.
     No markers are inserted."""
-    return _merge(
-        repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'union'
-    )
+    return _merge(repo, fcd, fco, fca, labels, b'union')
 
 
 @internaltool(
@@ -519,9 +517,7 @@ 
     files. It will fail if there are any conflicts and leave markers in
     the partially merged file. Markers will have two sections, one for each side
     of merge."""
-    return _merge(
-        repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'merge'
-    )
+    return _merge(repo, fcd, fco, fca, labels, b'merge')
 
 
 @internaltool(
@@ -543,9 +539,7 @@ 
         labels = _defaultconflictlabels
     if len(labels) < 3:
         labels.append(b'base')
-    return _merge(
-        repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'merge3'
-    )
+    return _merge(repo, fcd, fco, fca, labels, b'merge3')
 
 
 @internaltool(
@@ -587,9 +581,7 @@ 
         labels = _defaultconflictlabels
     if len(labels) < 3:
         labels.append(b'base')
-    return _merge(
-        repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'mergediff'
-    )
+    return _merge(repo, fcd, fco, fca, labels, b'mergediff')
 
 
 @internaltool(b'merge-local', mergeonly, precheck=_mergecheck)
@@ -597,9 +589,7 @@ 
     """
     Like :merge, but resolve all conflicts non-interactively in favor
     of the local `p1()` changes."""
-    return _merge(
-        repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'local'
-    )
+    return _merge(repo, fcd, fco, fca, labels, b'local')
 
 
 @internaltool(b'merge-other', mergeonly, precheck=_mergecheck)
@@ -607,9 +597,7 @@ 
     """
     Like :merge, but resolve all conflicts non-interactively in favor
     of the other `p2()` changes."""
-    return _merge(
-        repo, mynode, fcd, fco, fca, toolconf, backup, labels, b'other'
-    )
+    return _merge(repo, fcd, fco, fca, labels, b'other')
 
 
 @internaltool(