Mercurial > hg > mercurial-crew-with-dirclash
comparison hgext/churn.py @ 3048:7ffaf5aba4d8
[churn] Fix progress bar not incrementing when merge cset is encountered
author | Josef "Jeff" Sipek <jeffpc@josefsipek.net> |
---|---|
date | Sun, 03 Sep 2006 18:41:16 -0400 |
parents | dd1a142988d3 |
children |
comparison
equal
deleted
inserted
replaced
3047:dd1a142988d3 | 3048:7ffaf5aba4d8 |
---|---|
80 | 80 |
81 nr_revs = len(revs) | 81 nr_revs = len(revs) |
82 cur_rev = 0 | 82 cur_rev = 0 |
83 | 83 |
84 for rev in revs: | 84 for rev in revs: |
85 cur_rev += 1 # next revision | |
86 | |
85 node2 = cl.node(rev) | 87 node2 = cl.node(rev) |
86 node1 = cl.parents(node2)[0] | 88 node1 = cl.parents(node2)[0] |
87 | 89 |
88 if cl.parents(node2)[1] != node.nullid: | 90 if cl.parents(node2)[1] != node.nullid: |
89 ui.note(_('Revision %d is a merge, ignoring...\n') % (rev,)) | 91 ui.note(_('Revision %d is a merge, ignoring...\n') % (rev,)) |
100 stats[who] = 0 | 102 stats[who] = 0 |
101 stats[who] += lines | 103 stats[who] += lines |
102 | 104 |
103 ui.note("rev %d: %d lines by %s\n" % (rev, lines, who)) | 105 ui.note("rev %d: %d lines by %s\n" % (rev, lines, who)) |
104 | 106 |
105 cur_rev += 1 | |
106 if progress: | 107 if progress: |
107 if int(100.0*(cur_rev - 1)/nr_revs) < int(100.0*cur_rev/nr_revs): | 108 if int(100.0*(cur_rev - 1)/nr_revs) < int(100.0*cur_rev/nr_revs): |
108 ui.write("%d%%.." % (int(100.0*cur_rev/nr_revs),)) | 109 ui.write("%d%%.." % (int(100.0*cur_rev/nr_revs),)) |
109 sys.stdout.flush() | 110 sys.stdout.flush() |
110 | 111 |