# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2018-03-02 23:38:20
# Node ID 437f804361866de4759178633875fce0d51f0994
# Parent  28f988093911fb97bc2a6bc7df0f254e19e0e468

rebase: inline _performrebasesubset()

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

Differential Revision: https://phab.mercurial-scm.org/D2810

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -425,30 +425,27 @@ class rebaseruntime(object):
         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]