# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 2016-08-26 00:16:51
# Node ID 58db005d870ea22f650b13e01467777816bebfa2
# Parent  90af59b40d8a007fb8811daf0c3e64aca43aa6b0

rebase: properly calculate total commits to rebase (issue5347)

Before this, predecessor commits were being included in the count

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -336,7 +336,8 @@ class rebaseruntime(object):
             bookmarks.deactivate(repo)
 
         sortedrevs = sorted(self.state)
-        total = len(self.state)
+        cands = [k for k, v in self.state.iteritems() if v == revtodo]
+        total = len(cands)
         pos = 0
         for rev in sortedrevs:
             ctx = repo[rev]
@@ -345,8 +346,8 @@ class rebaseruntime(object):
             names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
             if names:
                 desc += ' (%s)' % ' '.join(names)
-            pos += 1
             if self.state[rev] == revtodo:
+                pos += 1
                 ui.status(_('rebasing %s\n') % desc)
                 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)),
                             _('changesets'), total)