# HG changeset patch
# User Josef "Jeff" Sipek <jeffpc@josefsipek.net>
# Date 1157323276 14400
# Node ID 7ffaf5aba4d8041896d776e7d4f47dc1338fb186
# Parent  dd1a142988d36f2b1dad3c33ab1d63d962298404
[churn] Fix progress bar not incrementing when merge cset is encountered

diff -r dd1a142988d3 -r 7ffaf5aba4d8 hgext/churn.py
--- a/hgext/churn.py	Sun Sep 03 16:30:07 2006 -0400
+++ b/hgext/churn.py	Sun Sep 03 18:41:16 2006 -0400
@@ -82,6 +82,8 @@
     cur_rev = 0
 
     for rev in revs:
+        cur_rev += 1 # next revision
+
         node2    = cl.node(rev)
         node1    = cl.parents(node2)[0]
 
@@ -102,7 +104,6 @@
 
         ui.note("rev %d: %d lines by %s\n" % (rev, lines, who))
 
-        cur_rev += 1
         if progress:
             if int(100.0*(cur_rev - 1)/nr_revs) < int(100.0*cur_rev/nr_revs):
                 ui.write("%d%%.." % (int(100.0*cur_rev/nr_revs),))