This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2810

rebase: inline _performrebasesubset()
ClosedPublic

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

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG437f80436186: rebase: inline _performrebasesubset()
rHG0cc850a43e6c: rebase: inline _performrebasesubset()
Summary

Now that most of _performrebasesubset() has been moved into
_rebasenode(), it's simple enough that we can inline it.

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 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 rHG0cc850a43e6c: rebase: inline _performrebasesubset() (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 6989

hgext/rebase.py

# Store the state before we begin so users can run 'hg rebase --abort' # Store the state before we begin so users can run 'hg rebase --abort'
# if we fail before the transaction closes. # if we fail before the transaction closes.
self.storestatus() self.storestatus()
cands = [k for k, v in self.state.iteritems() if v == revtodo] cands = [k for k, v in self.state.iteritems() if v == revtodo]
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)
ui.progress(_('rebasing'), None)
ui.note(_('rebase merging completed\n'))
def _performrebasesubset(self, tr, subset, pos, total):
sortedrevs = self.repo.revs('sort(%ld, -topo)', subset) sortedrevs = self.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 -= self.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] posholder = [pos]
def progress(ctx): def progress(ctx):
posholder[0] += 1 posholder[0] += 1
self.repo.ui.progress(_("rebasing"), posholder[0], self.repo.ui.progress(_("rebasing"), posholder[0],
("%d:%s" % (ctx.rev(), ctx)), _('changesets'), ("%d:%s" % (ctx.rev(), ctx)),
total) _('changesets'), total)
for rev in sortedrevs: for rev in sortedrevs:
self._rebasenode(tr, rev, allowdivergence, progress) self._rebasenode(tr, rev, allowdivergence, progress)
return posholder[0] pos = posholder[0]
ui.progress(_('rebasing'), None)
ui.note(_('rebase merging completed\n'))
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)