D2905: rebase: pass "inmemory" directly to _definedestmap()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Mar 21 00:34:18 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0782ac132a41: rebase: pass "inmemory" directly to _definedestmap() (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2905?vs=7164&id=7168
REVISION DETAIL
https://phab.mercurial-scm.org/D2905
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
@@ -840,8 +840,8 @@
if retcode is not None:
return retcode
else:
- destmap = _definedestmap(ui, repo, rbsrt, destf, srcf, basef, revf,
- destspace=destspace)
+ destmap = _definedestmap(ui, repo, inmemory, destf, srcf, basef,
+ revf, destspace=destspace)
retcode = rbsrt._preparenewrebase(destmap)
if retcode is not None:
return retcode
@@ -866,7 +866,7 @@
rbsrt._performrebase(tr)
rbsrt._finishrebase()
-def _definedestmap(ui, repo, rbsrt, destf=None, srcf=None, basef=None,
+def _definedestmap(ui, repo, inmemory, destf=None, srcf=None, basef=None,
revf=None, destspace=None):
"""use revisions argument to define destmap {srcrev: destrev}"""
if revf is None:
@@ -881,7 +881,7 @@
if revf and srcf:
raise error.Abort(_('cannot specify both a revision and a source'))
- if not rbsrt.inmemory:
+ if not inmemory:
cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo)
@@ -959,7 +959,7 @@
rebasingwcp = repo['.'].rev() in rebaseset
ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp)
- if rbsrt.inmemory and rebasingwcp:
+ if inmemory and rebasingwcp:
# Check these since we did not before.
cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo)
To: martinvonz, #hg-reviewers, yuja
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list