Patchwork D602: simplemerge: remove unused `repo` parameter

login
register
mail settings
Submitter phabricator
Date Sept. 1, 2017, 8:58 p.m.
Message ID <6646209299d177a01d1a8f59f9db9882@localhost.localdomain>
Download mbox | patch
Permalink /patch/23605/
State Not Applicable
Headers show

Comments

phabricator - Sept. 1, 2017, 8:58 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG834d08c17e57: simplemerge: remove unused `repo` parameter (authored by phillco).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D602?vs=1541&id=1557#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D602?vs=1541&id=1557

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

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

CHANGE DETAILS




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

Patch

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -413,7 +413,7 @@ 
         result[i] = override
     return result
 
-def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):
+def simplemerge(ui, localctx, basectx, otherctx, **opts):
     """Performs the simplemerge algorithm.
 
     The merged result is written into `localctx`.
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -341,8 +341,7 @@ 
                 labels = _defaultconflictlabels
             if len(labels) < 3:
                 labels.append('base')
-        r = simplemerge.simplemerge(ui, fcd, fca, fco,
-                                    quiet=True, label=labels, repo=repo)
+        r = simplemerge.simplemerge(ui, fcd, fca, fco, quiet=True, label=labels)
         if not r:
             ui.debug(" premerge successful\n")
             return 0
@@ -371,8 +370,7 @@ 
     of merge, unless mode equals 'union' which suppresses the markers."""
     ui = repo.ui
 
-    r = simplemerge.simplemerge(ui, fcd, fca, fco,
-                                label=labels, mode=mode, repo=repo)
+    r = simplemerge.simplemerge(ui, fcd, fca, fco, label=labels, mode=mode)
     return True, r, False
 
 @internaltool('union', fullmerge,
@@ -423,9 +421,8 @@ 
     """
     assert localorother is not None
     tool, toolpath, binary, symlink = toolconf
-    r = simplemerge.simplemerge(repo.ui, fcd, fca, fco,
-                                label=labels, localorother=localorother,
-                                repo=repo)
+    r = simplemerge.simplemerge(repo.ui, fcd, fca, fco, label=labels,
+                                localorother=localorother)
     return True, r
 
 @internaltool('merge-local', mergeonly, precheck=_mergecheck)