Show More
@@ -148,9 +148,13 b' def rebase(ui, repo, **opts):' | |||||
148 | targetancestors = set(repo.changelog.ancestors(target)) |
|
148 | targetancestors = set(repo.changelog.ancestors(target)) | |
149 | targetancestors.add(target) |
|
149 | targetancestors.add(target) | |
150 |
|
150 | |||
151 |
|
|
151 | sortedstate = sorted(state) | |
|
152 | total = len(sortedstate) | |||
|
153 | pos = 0 | |||
|
154 | for rev in sortedstate: | |||
|
155 | pos += 1 | |||
152 | if state[rev] == -1: |
|
156 | if state[rev] == -1: | |
153 |
ui. |
|
157 | ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])), _(' changesets'), total) | |
154 | storestatus(repo, originalwd, target, state, collapsef, keepf, |
|
158 | storestatus(repo, originalwd, target, state, collapsef, keepf, | |
155 | keepbranchesf, external) |
|
159 | keepbranchesf, external) | |
156 | p1, p2 = defineparents(repo, rev, target, state, |
|
160 | p1, p2 = defineparents(repo, rev, target, state, | |
@@ -179,6 +183,7 b' def rebase(ui, repo, **opts):' | |||||
179 | skipped.add(rev) |
|
183 | skipped.add(rev) | |
180 | state[rev] = p1 |
|
184 | state[rev] = p1 | |
181 |
|
185 | |||
|
186 | ui.progress(_('rebasing'), None) | |||
182 | ui.note(_('rebase merging completed\n')) |
|
187 | ui.note(_('rebase merging completed\n')) | |
183 |
|
188 | |||
184 | if collapsef and not keepopen: |
|
189 | if collapsef and not keepopen: |
General Comments 0
You need to be logged in to leave comments.
Login now