D2908: rebase: get "inmemory" state directly from rebase runtime
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Mar 21 19:18:21 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG81b35d275a60: rebase: get "inmemory" state directly from rebase runtime (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2908?vs=7171&id=7200
REVISION DETAIL
https://phab.mercurial-scm.org/D2908
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
@@ -390,7 +390,7 @@
else:
self.wctx = self.repo[None]
self.repo.ui.debug("rebasing on disk\n")
- self.repo.ui.log("rebase", "", rebase_imm_used=self.wctx.isinmemory())
+ self.repo.ui.log("rebase", "", rebase_imm_used=self.inmemory)
def _performrebase(self, tr):
self._assignworkingcopy()
@@ -489,7 +489,7 @@
stats = rebasenode(repo, rev, p1, base, self.collapsef,
dest, wctx=self.wctx)
if stats[3] > 0:
- if self.wctx.isinmemory():
+ if self.inmemory:
raise error.InMemoryMergeConflictsError()
else:
raise error.InterventionRequired(
@@ -500,7 +500,7 @@
editform = cmdutil.mergeeditform(merging, 'rebase')
editor = cmdutil.getcommiteditor(editform=editform,
**pycompat.strkwargs(opts))
- if self.wctx.isinmemory():
+ if self.inmemory:
newnode = concludememorynode(repo, rev, p1, p2,
wctx=self.wctx,
extrafn=_makeextrafn(self.extrafns),
@@ -522,7 +522,7 @@
mergemod.mergestate.clean(repo)
else:
# Skip commit if we are collapsing
- if self.wctx.isinmemory():
+ if self.inmemory:
self.wctx.setbase(repo[p1])
else:
repo.setparents(repo[p1].node())
To: martinvonz, phillco, #hg-reviewers, indygreg
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list