D1245: rebase: pass wctx to rebasenode()
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Thu Dec 7 21:45:55 UTC 2017
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
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
To: phillco, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list