Patchwork D1245: rebase: pass wctx to rebasenode()

login
register
mail settings
Submitter phabricator
Date Dec. 7, 2017, 9:45 p.m.
Message ID <7225f2f171ea215025828a83d9dd3e74@localhost.localdomain>
Download mbox | patch
Permalink /patch/26042/
State Not Applicable
Headers show

Comments

phabricator - Dec. 7, 2017, 9:45 p.m.
phillco updated this revision to Diff 4210.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1245?vs=4191&id=4210

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

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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=None):
     'Rebase a single revision rev on top of p1 using base as merge ancestor'
     # Merge phase
     # Update to destination and merge it with local