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

hgext/rebase.py

@@ -425,11 +425,6 b' class rebaseruntime(object):'
         total = len(cands)
         pos = 0
         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)
         allowdivergence = self.ui.configbool(
             'experimental', 'evolution.allowdivergence')
@@ -443,11 +438,13 b' class rebaseruntime(object):'
         def progress(ctx):
             posholder[0] += 1
             self.repo.ui.progress(_("rebasing"), posholder[0],
-                                  ("%d:%s" % (ctx.rev(), ctx)), _('changesets'),
-                                  total)
+                                      ("%d:%s" % (ctx.rev(), ctx)),
+                                      _('changesets'), total)
         for rev in sortedrevs:
             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):
         repo, ui, opts = self.repo, self.ui, self.opts