##// END OF EJS Templates
rebase: get "inmemory" state directly from rebase runtime...
Martin von Zweigbergk -
r37045:81b35d27 default
parent child Browse files
Show More
@@ -390,7 +390,7 b' class rebaseruntime(object):'
390 else:
390 else:
391 self.wctx = self.repo[None]
391 self.wctx = self.repo[None]
392 self.repo.ui.debug("rebasing on disk\n")
392 self.repo.ui.debug("rebasing on disk\n")
393 self.repo.ui.log("rebase", "", rebase_imm_used=self.wctx.isinmemory())
393 self.repo.ui.log("rebase", "", rebase_imm_used=self.inmemory)
394
394
395 def _performrebase(self, tr):
395 def _performrebase(self, tr):
396 self._assignworkingcopy()
396 self._assignworkingcopy()
@@ -489,7 +489,7 b' class rebaseruntime(object):'
489 stats = rebasenode(repo, rev, p1, base, self.collapsef,
489 stats = rebasenode(repo, rev, p1, base, self.collapsef,
490 dest, wctx=self.wctx)
490 dest, wctx=self.wctx)
491 if stats[3] > 0:
491 if stats[3] > 0:
492 if self.wctx.isinmemory():
492 if self.inmemory:
493 raise error.InMemoryMergeConflictsError()
493 raise error.InMemoryMergeConflictsError()
494 else:
494 else:
495 raise error.InterventionRequired(
495 raise error.InterventionRequired(
@@ -500,7 +500,7 b' class rebaseruntime(object):'
500 editform = cmdutil.mergeeditform(merging, 'rebase')
500 editform = cmdutil.mergeeditform(merging, 'rebase')
501 editor = cmdutil.getcommiteditor(editform=editform,
501 editor = cmdutil.getcommiteditor(editform=editform,
502 **pycompat.strkwargs(opts))
502 **pycompat.strkwargs(opts))
503 if self.wctx.isinmemory():
503 if self.inmemory:
504 newnode = concludememorynode(repo, rev, p1, p2,
504 newnode = concludememorynode(repo, rev, p1, p2,
505 wctx=self.wctx,
505 wctx=self.wctx,
506 extrafn=_makeextrafn(self.extrafns),
506 extrafn=_makeextrafn(self.extrafns),
@@ -522,7 +522,7 b' class rebaseruntime(object):'
522 mergemod.mergestate.clean(repo)
522 mergemod.mergestate.clean(repo)
523 else:
523 else:
524 # Skip commit if we are collapsing
524 # Skip commit if we are collapsing
525 if self.wctx.isinmemory():
525 if self.inmemory:
526 self.wctx.setbase(repo[p1])
526 self.wctx.setbase(repo[p1])
527 else:
527 else:
528 repo.setparents(repo[p1].node())
528 repo.setparents(repo[p1].node())
General Comments 0
You need to be logged in to leave comments. Login now