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: pass wctx to rebasenode()
authorPhil Cohen <phillco@fb.com>
Thu, 07 Dec 2017 16:07:06 -0800
changeset 35316 259feddc04e6
parent 35315 e223c0438f89
child 35317 5c25fe7fb1e6
rebase: pass wctx to rebasenode() Differential Revision: https://phab.mercurial-scm.org/D1245
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Sat Dec 09 00:39:15 2017 +0900
+++ b/hgext/rebase.py	Thu Dec 07 16:07:06 2017 -0800
@@ -481,7 +481,7 @@
                         ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                                      'rebase')
                         stats = rebasenode(repo, rev, p1, base, self.state,
-                                           self.collapsef, dest)
+                                           self.collapsef, dest, wctx=self.wctx)
                         if stats and stats[3] > 0:
                             if self.wctx.isinmemory():
                                 raise error.InMemoryMergeConflictsError()
@@ -992,7 +992,7 @@
         repo.dirstate.setbranch(repo[newnode].branch())
         return newnode
 
-def rebasenode(repo, rev, p1, base, state, collapse, dest):
+def rebasenode(repo, rev, p1, base, state, 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