This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2914

rebase: extract common _concludenode()
ClosedPublic

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

Details

Reviewers
phillco
indygreg
Group Reviewers
hg-reviewers
Commits
rHG5f99142f59cc: rebase: extract common _concludenode()
Summary

_rebasenode() and _finishrebase() had a lot of code in common. This
commit extracts some of that. This means we will also have a single
caller of concludenode() and concludememorynode(), which gives us a
place to put code that is common between those two functions (which is
quite a bit).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 21 2018, 2:10 PM
indygreg accepted this revision.Mar 21 2018, 7:31 PM
indygreg added a subscriber: indygreg.

Nice.

This revision is now accepted and ready to land.Mar 21 2018, 7:31 PM
Closed by commit rHG5f99142f59cc: rebase: extract common _concludenode() (authored by martinvonz). · Explain WhyMar 21 2018, 7:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (73 lines)

Diff 7177

hgext/rebase.py

self.obsoletewithoutsuccessorindestination, self.obsoletewithoutsuccessorindestination,
self.obsoletewithoutsuccessorindestination, self.obsoletewithoutsuccessorindestination,
) )
for rev in sortedrevs: for rev in sortedrevs:
self._rebasenode(tr, rev, allowdivergence, progress) self._rebasenode(tr, rev, allowdivergence, progress)
ui.progress(_('rebasing'), None) ui.progress(_('rebasing'), None)
ui.note(_('rebase merging completed\n')) ui.note(_('rebase merging completed\n'))
def _concludenode(self, rev, p1, p2, editor, commitmsg=None):
'''Commit the wd changes with parents p1 and p2.
Reuse commit info from rev but also store useful information in extra.
Return node of committed revision.'''
repo = self.repo
if self.inmemory:
newnode = concludememorynode(repo, rev, p1, p2,
wctx=self.wctx,
extrafn=_makeextrafn(self.extrafns),
commitmsg=commitmsg,
editor=editor,
keepbranches=self.keepbranchesf,
date=self.date)
mergemod.mergestate.clean(repo)
else:
newnode = concludenode(repo, rev, p1, p2,
extrafn=_makeextrafn(self.extrafns),
commitmsg=commitmsg,
editor=editor,
keepbranches=self.keepbranchesf,
date=self.date)
if newnode is None:
# If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it
# here. Fix issue5494
mergemod.mergestate.clean(repo)
return newnode
def _rebasenode(self, tr, rev, allowdivergence, progressfn): def _rebasenode(self, tr, rev, allowdivergence, progressfn):
repo, ui, opts = self.repo, self.ui, self.opts repo, ui, opts = self.repo, self.ui, self.opts
dest = self.destmap[rev] dest = self.destmap[rev]
ctx = repo[rev] ctx = repo[rev]
desc = _ctxdesc(ctx) desc = _ctxdesc(ctx)
if self.state[rev] == rev: if self.state[rev] == rev:
ui.status(_('already rebased %s\n') % desc) ui.status(_('already rebased %s\n') % desc)
elif (not allowdivergence elif (not allowdivergence
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.inmemory: newnode = self._concludenode(rev, p1, p2, editor)
newnode = concludememorynode(repo, rev, p1, p2,
wctx=self.wctx,
extrafn=_makeextrafn(self.extrafns),
editor=editor,
keepbranches=self.keepbranchesf,
date=self.date)
mergemod.mergestate.clean(repo)
else:
newnode = concludenode(repo, rev, p1, p2,
extrafn=_makeextrafn(self.extrafns),
editor=editor,
keepbranches=self.keepbranchesf,
date=self.date)
if newnode is None:
# If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it
# here. Fix issue5494
mergemod.mergestate.clean(repo)
else: else:
# Skip commit if we are collapsing # Skip commit if we are collapsing
if self.inmemory: 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
commitmsg = 'Collapsed revision' commitmsg = 'Collapsed revision'
for rebased in sorted(self.state): for rebased in sorted(self.state):
if rebased not in self.skipped: if rebased not in self.skipped:
commitmsg += '\n* %s' % repo[rebased].description() commitmsg += '\n* %s' % repo[rebased].description()
editopt = True editopt = True
editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
revtoreuse = max(self.state) revtoreuse = max(self.state)
if self.inmemory: newnode = self._concludenode(revtoreuse, p1, self.external,
newnode = concludememorynode(repo, revtoreuse, p1, editor, commitmsg=commitmsg)
self.external,
commitmsg=commitmsg,
extrafn=_makeextrafn(self.extrafns),
editor=editor,
keepbranches=self.keepbranchesf,
date=self.date, wctx=self.wctx)
else:
newnode = concludenode(repo, revtoreuse, p1, self.external,
commitmsg=commitmsg,
extrafn=_makeextrafn(self.extrafns),
editor=editor,
keepbranches=self.keepbranchesf,
date=self.date)
if newnode is None:
# If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it
# here. Fix issue5494
mergemod.mergestate.clean(repo)
if newnode is not None: if newnode is not None:
newrev = repo[newnode].rev() newrev = repo[newnode].rev()
for oldrev in self.state: for oldrev in self.state:
self.state[oldrev] = newrev self.state[oldrev] = newrev
if 'qtip' in repo.tags(): if 'qtip' in repo.tags():
updatemq(repo, self.state, self.skipped, updatemq(repo, self.state, self.skipped,
**pycompat.strkwargs(opts)) **pycompat.strkwargs(opts))