This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2809

rebase: extract function for rebasing a single node
ClosedPublic

Authored by martinvonz on Mar 12 2018, 2:22 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG28f988093911: rebase: extract function for rebasing a single node
rHGd56e4d78a366: rebase: extract function for rebasing a single node
Summary

We currently have _performrebase() and _performrebasesubset(), but we
don't have a method for rebasing a single node (that's inside a loop
in _performrebasesubset()). I think it makes sense to have such a
method, so that's what this patch does. I think it may simplify future
patches I'm working on that have to do with transactions, but I think
this patch makes sense on its own whether or not that future work
happens.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 12 2018, 2:22 PM
yuja accepted this revision.Mar 13 2018, 10:48 AM
This revision is now accepted and ready to land.Mar 13 2018, 10:48 AM
Closed by commit rHGd56e4d78a366: rebase: extract function for rebasing a single node (authored by martinvonz). · Explain WhyMar 13 2018, 10:55 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6874

hgext/rebase.py

total = len(cands) total = len(cands)
pos = 0 pos = 0
for subset in sortsource(self.destmap): for subset in sortsource(self.destmap):
pos = self._performrebasesubset(tr, subset, pos, total) pos = self._performrebasesubset(tr, subset, pos, total)
ui.progress(_('rebasing'), None) ui.progress(_('rebasing'), None)
ui.note(_('rebase merging completed\n')) ui.note(_('rebase merging completed\n'))
def _performrebasesubset(self, tr, subset, pos, total): def _performrebasesubset(self, tr, subset, pos, total):
repo, ui, opts = self.repo, self.ui, self.opts sortedrevs = self.repo.revs('sort(%ld, -topo)', subset)
sortedrevs = repo.revs('sort(%ld, -topo)', subset)
allowdivergence = self.ui.configbool( allowdivergence = self.ui.configbool(
'experimental', 'evolution.allowdivergence') 'experimental', 'evolution.allowdivergence')
if not allowdivergence: if not allowdivergence:
sortedrevs -= repo.revs( sortedrevs -= self.repo.revs(
'descendants(%ld) and not %ld', 'descendants(%ld) and not %ld',
self.obsoletewithoutsuccessorindestination, self.obsoletewithoutsuccessorindestination,
self.obsoletewithoutsuccessorindestination, self.obsoletewithoutsuccessorindestination,
) )
posholder = [pos]
def progress(ctx):
posholder[0] += 1
self.repo.ui.progress(_("rebasing"), posholder[0],
("%d:%s" % (ctx.rev(), ctx)), _('changesets'),
total)
for rev in sortedrevs: for rev in sortedrevs:
self._rebasenode(tr, rev, allowdivergence, progress)
return posholder[0]
def _rebasenode(self, tr, rev, allowdivergence, progressfn):
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
and rev in self.obsoletewithoutsuccessorindestination): and rev in self.obsoletewithoutsuccessorindestination):
msg = _('note: not rebasing %s and its descendants as ' msg = _('note: not rebasing %s and its descendants as '
'this would cause divergence\n') % desc 'this would cause divergence\n') % desc
repo.ui.status(msg) repo.ui.status(msg)
self.skipped.add(rev) self.skipped.add(rev)
elif rev in self.obsoletenotrebased: elif rev in self.obsoletenotrebased:
succ = self.obsoletenotrebased[rev] succ = self.obsoletenotrebased[rev]
if succ is None: if succ is None:
msg = _('note: not rebasing %s, it has no ' msg = _('note: not rebasing %s, it has no '
'successor\n') % desc 'successor\n') % desc
else: else:
succdesc = _ctxdesc(repo[succ]) succdesc = _ctxdesc(repo[succ])
msg = (_('note: not rebasing %s, already in ' msg = (_('note: not rebasing %s, already in '
'destination as %s\n') % (desc, succdesc)) 'destination as %s\n') % (desc, succdesc))
repo.ui.status(msg) repo.ui.status(msg)
# Make clearrebased aware state[rev] is not a true successor # Make clearrebased aware state[rev] is not a true successor
self.skipped.add(rev) self.skipped.add(rev)
# Record rev as moved to its desired destination in self.state. # Record rev as moved to its desired destination in self.state.
# This helps bookmark and working parent movement. # This helps bookmark and working parent movement.
dest = max(adjustdest(repo, rev, self.destmap, self.state, dest = max(adjustdest(repo, rev, self.destmap, self.state,
self.skipped)) self.skipped))
self.state[rev] = dest self.state[rev] = dest
elif self.state[rev] == revtodo: elif self.state[rev] == revtodo:
pos += 1
ui.status(_('rebasing %s\n') % desc) ui.status(_('rebasing %s\n') % desc)
ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)), progressfn(ctx)
_('changesets'), total)
p1, p2, base = defineparents(repo, rev, self.destmap, p1, p2, base = defineparents(repo, rev, self.destmap,
self.state, self.skipped, self.state, self.skipped,
self.obsoletenotrebased) self.obsoletenotrebased)
self.storestatus(tr=tr) self.storestatus(tr=tr)
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 and stats[3] > 0: if stats and stats[3] > 0:
if self.wctx.isinmemory(): if self.wctx.isinmemory():
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.wctx.isinmemory():
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.wctx.isinmemory():
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))
else: else:
if not self.collapsef: if not self.collapsef:
ui.warn(_('note: rebase of %d:%s created no changes ' ui.warn(_('note: rebase of %d:%s created no changes '
'to commit\n') % (rev, ctx)) 'to commit\n') % (rev, ctx))
self.skipped.add(rev) self.skipped.add(rev)
self.state[rev] = p1 self.state[rev] = p1
ui.debug('next revision set to %d\n' % p1) ui.debug('next revision set to %d\n' % p1)
else: else:
ui.status(_('already rebased %s as %s\n') % ui.status(_('already rebased %s as %s\n') %
(desc, repo[self.state[rev]])) (desc, repo[self.state[rev]]))
return pos
def _finishrebase(self): def _finishrebase(self):
repo, ui, opts = self.repo, self.ui, self.opts repo, ui, opts = self.repo, self.ui, self.opts
fm = ui.formatter('rebase', opts) fm = ui.formatter('rebase', opts)
fm.startitem() fm.startitem()
if self.collapsef: if self.collapsef:
p1, p2, _base = defineparents(repo, min(self.state), self.destmap, p1, p2, _base = defineparents(repo, min(self.state), self.destmap,
self.state, self.skipped, self.state, self.skipped,