Patchwork D2709: rebase: remove unused argument "state" from rebasenode()

login
register
mail settings
Submitter phabricator
Date March 7, 2018, 9:15 p.m.
Message ID <96509bd6770623cfb872fa0c7c46f623@localhost.localdomain>
Download mbox | patch
Permalink /patch/29103/
State Not Applicable
Headers show

Comments

phabricator - March 7, 2018, 9:15 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0f3116c08e65: rebase: remove unused argument &quot;state&quot; from rebasenode() (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2709?vs=6697&id=6704

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

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -485,8 +485,8 @@ 
                     try:
                         ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                                      'rebase')
-                        stats = rebasenode(repo, rev, p1, base, self.state,
-                                           self.collapsef, dest, wctx=self.wctx)
+                        stats = rebasenode(repo, rev, p1, base, self.collapsef,
+                                           dest, wctx=self.wctx)
                         if stats and stats[3] > 0:
                             if self.wctx.isinmemory():
                                 raise error.InMemoryMergeConflictsError()
@@ -1108,7 +1108,7 @@ 
         repo.dirstate.setbranch(repo[newnode].branch())
         return newnode
 
-def rebasenode(repo, rev, p1, base, state, collapse, dest, wctx):
+def rebasenode(repo, rev, p1, base, collapse, dest, wctx):
     'Rebase a single revision rev on top of p1 using base as merge ancestor'
     # Merge phase
     # Update to destination and merge it with local