Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: remove unused argument "state" from rebasenode()
authorMartin von Zweigbergk <martinvonz@google.com>
Wed, 07 Mar 2018 09:46:53 -0800
changeset 36772 0f3116c08e65
parent 36771 f7e3fe95b663
child 36773 1004fd71810f
rebase: remove unused argument "state" from rebasenode() Differential Revision: https://phab.mercurial-scm.org/D2709
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Wed Mar 07 10:31:01 2018 -0800
+++ b/hgext/rebase.py	Wed Mar 07 09:46:53 2018 -0800
@@ -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
Mercurial