##// END OF EJS Templates
rebase: properly calculate total commits to rebase (issue5347)...
timeless -
r29872:58db005d default
parent child Browse files
Show More
@@ -336,7 +336,8 b' class rebaseruntime(object):'
336 bookmarks.deactivate(repo)
336 bookmarks.deactivate(repo)
337
337
338 sortedrevs = sorted(self.state)
338 sortedrevs = sorted(self.state)
339 total = len(self.state)
339 cands = [k for k, v in self.state.iteritems() if v == revtodo]
340 total = len(cands)
340 pos = 0
341 pos = 0
341 for rev in sortedrevs:
342 for rev in sortedrevs:
342 ctx = repo[rev]
343 ctx = repo[rev]
@@ -345,8 +346,8 b' class rebaseruntime(object):'
345 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
346 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
346 if names:
347 if names:
347 desc += ' (%s)' % ' '.join(names)
348 desc += ' (%s)' % ' '.join(names)
348 pos += 1
349 if self.state[rev] == revtodo:
349 if self.state[rev] == revtodo:
350 pos += 1
350 ui.status(_('rebasing %s\n') % desc)
351 ui.status(_('rebasing %s\n') % desc)
351 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)),
352 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, ctx)),
352 _('changesets'), total)
353 _('changesets'), total)
General Comments 0
You need to be logged in to leave comments. Login now