D2810: rebase: inline _performrebasesubset()
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0cc850a43e6c: rebase: inline _performrebasesubset()
(authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2810?vs=6875&id=6989
REVISION DETAIL
https://phab.mercurial-scm.org/D2810
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -425,30 +425,27 @@
total = len(cands)
pos = 0
for subset in sortsource(self.destmap):
-pos = self._performrebasesubset(tr, subset, pos, total)
+sortedrevs = self.repo.revs('sort(%ld, -topo)', subset)
+allowdivergence = self.ui.configbool(
+'experimental', 'evolution.allowdivergence')
+if not allowdivergence:
+sortedrevs -= self.repo.revs(
+'descendants(%ld) and not %ld',
+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:
+self._rebasenode(tr, rev, allowdivergence, progress)
+pos = posholder[0]
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)
-allowdivergence = self.ui.configbool(
-'experimental', 'evolution.allowdivergence')
-if not allowdivergence:
-sortedrevs -= self.repo.revs(
-'descendants(%ld) and not %ld',
-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:
-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]
To: martinvonz, #hg-reviewers, yuja
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D2810: rebase: inline _performrebasesubset()
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Now that most of _performrebasesubset() has been moved into
_rebasenode(), it's simple enough that we can inline it.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2810
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -425,30 +425,27 @@
total = len(cands)
pos = 0
for subset in sortsource(self.destmap):
-pos = self._performrebasesubset(tr, subset, pos, total)
+sortedrevs = self.repo.revs('sort(%ld, -topo)', subset)
+allowdivergence = self.ui.configbool(
+'experimental', 'evolution.allowdivergence')
+if not allowdivergence:
+sortedrevs -= self.repo.revs(
+'descendants(%ld) and not %ld',
+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:
+self._rebasenode(tr, rev, allowdivergence, progress)
+pos = posholder[0]
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)
-allowdivergence = self.ui.configbool(
-'experimental', 'evolution.allowdivergence')
-if not allowdivergence:
-sortedrevs -= self.repo.revs(
-'descendants(%ld) and not %ld',
-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:
-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]
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
