( )⚙ D2908 rebase: get "inmemory" state directly from rebase runtime

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2908

rebase: get "inmemory" state directly from rebase runtime
ClosedPublic

Authored by martinvonz on Mar 21 2018, 2:10 PM.

Details

Reviewers
phillco
indygreg
Group Reviewers
hg-reviewers
Commits
rHG81b35d275a60: rebase: get "inmemory" state directly from rebase runtime
Summary

As far as I can tell, rbsrt.inmemory is equivalent to
rbsrt.wctx.isinmemory(), so let's use the shorter form.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 21 2018, 2:10 PM
indygreg accepted this revision.Mar 21 2018, 7:10 PM
This revision is now accepted and ready to land.Mar 21 2018, 7:10 PM
Closed by commit rHG81b35d275a60: rebase: get "inmemory" state directly from rebase runtime (authored by martinvonz). · Explain WhyMar 21 2018, 7:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (8 lines)

Diff 7200

hgext/rebase.py

def _assignworkingcopy(self): def _assignworkingcopy(self):
if self.inmemory: if self.inmemory:
from mercurial.context import overlayworkingctx from mercurial.context import overlayworkingctx
self.wctx = overlayworkingctx(self.repo) self.wctx = overlayworkingctx(self.repo)
self.repo.ui.debug("rebasing in-memory\n") self.repo.ui.debug("rebasing in-memory\n")
else: else:
self.wctx = self.repo[None] self.wctx = self.repo[None]
self.repo.ui.debug("rebasing on disk\n") 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): def _performrebase(self, tr):
self._assignworkingcopy() self._assignworkingcopy()
repo, ui = self.repo, self.ui repo, ui = self.repo, self.ui
if self.keepbranchesf: if self.keepbranchesf:
# insert _savebranch at the start of extrafns so if # insert _savebranch at the start of extrafns so if
# there's a user-provided extrafn it can clobber branch if # there's a user-provided extrafn it can clobber branch if
# desired # desired
if len(repo[None].parents()) == 2: if len(repo[None].parents()) == 2:
repo.ui.debug('resuming interrupted rebase\n') repo.ui.debug('resuming interrupted rebase\n')
else: else:
overrides = {('ui', 'forcemerge'): opts.get('tool', '')} overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
stats = rebasenode(repo, rev, p1, base, self.collapsef, stats = rebasenode(repo, rev, p1, base, self.collapsef,
dest, wctx=self.wctx) dest, wctx=self.wctx)
if stats[3] > 0: if stats[3] > 0:
if self.wctx.isinmemory(): if self.inmemory:
raise error.InMemoryMergeConflictsError() raise error.InMemoryMergeConflictsError()
else: else:
raise error.InterventionRequired( raise error.InterventionRequired(
_('unresolved conflicts (see hg ' _('unresolved conflicts (see hg '
'resolve, then hg rebase --continue)')) 'resolve, then hg rebase --continue)'))
if not self.collapsef: if not self.collapsef:
merging = p2 != nullrev merging = p2 != nullrev
editform = cmdutil.mergeeditform(merging, 'rebase') editform = cmdutil.mergeeditform(merging, 'rebase')
editor = cmdutil.getcommiteditor(editform=editform, editor = cmdutil.getcommiteditor(editform=editform,
**pycompat.strkwargs(opts)) **pycompat.strkwargs(opts))
if self.wctx.isinmemory(): if self.inmemory:
newnode = concludememorynode(repo, rev, p1, p2, newnode = concludememorynode(repo, rev, p1, p2,
wctx=self.wctx, wctx=self.wctx,
extrafn=_makeextrafn(self.extrafns), extrafn=_makeextrafn(self.extrafns),
editor=editor, editor=editor,
keepbranches=self.keepbranchesf, keepbranches=self.keepbranchesf,
date=self.date) date=self.date)
mergemod.mergestate.clean(repo) mergemod.mergestate.clean(repo)
else: else:
newnode = concludenode(repo, rev, p1, p2, newnode = concludenode(repo, rev, p1, p2,
extrafn=_makeextrafn(self.extrafns), extrafn=_makeextrafn(self.extrafns),
editor=editor, editor=editor,
keepbranches=self.keepbranchesf, keepbranches=self.keepbranchesf,
date=self.date) date=self.date)
if newnode is None: if newnode is None:
# If it ended up being a no-op commit, then the normal # If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it # merge state clean-up path doesn't happen, so do it
# here. Fix issue5494 # here. Fix issue5494
mergemod.mergestate.clean(repo) mergemod.mergestate.clean(repo)
else: else:
# Skip commit if we are collapsing # Skip commit if we are collapsing
if self.wctx.isinmemory(): if self.inmemory:
self.wctx.setbase(repo[p1]) self.wctx.setbase(repo[p1])
else: else:
repo.setparents(repo[p1].node()) repo.setparents(repo[p1].node())
newnode = None newnode = None
# Update the state # Update the state
if newnode is not None: if newnode is not None:
self.state[rev] = repo[newnode].rev() self.state[rev] = repo[newnode].rev()
ui.debug('rebased as %s\n' % short(newnode)) ui.debug('rebased as %s\n' % short(newnode))