Skip to content
Snippets Groups Projects
Commit c91b86a291b0 authored by timeless developer's avatar timeless developer
Browse files

rebase/progress: Adding progress for rebasing

parent 226a328a7ff3
No related branches found
No related tags found
No related merge requests found
......@@ -148,5 +148,9 @@
targetancestors = set(repo.changelog.ancestors(target))
targetancestors.add(target)
for rev in sorted(state):
sortedstate = sorted(state)
total = len(sortedstate)
pos = 0
for rev in sortedstate:
pos += 1
if state[rev] == -1:
......@@ -152,5 +156,5 @@
if state[rev] == -1:
ui.debug("rebasing %d:%s\n" % (rev, repo[rev]))
ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])), _(' changesets'), total)
storestatus(repo, originalwd, target, state, collapsef, keepf,
keepbranchesf, external)
p1, p2 = defineparents(repo, rev, target, state,
......@@ -179,6 +183,7 @@
skipped.add(rev)
state[rev] = p1
ui.progress(_('rebasing'), None)
ui.note(_('rebase merging completed\n'))
if collapsef and not keepopen:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment