152 total = len(sortedstate) |
152 total = len(sortedstate) |
153 pos = 0 |
153 pos = 0 |
154 for rev in sortedstate: |
154 for rev in sortedstate: |
155 pos += 1 |
155 pos += 1 |
156 if state[rev] == -1: |
156 if state[rev] == -1: |
157 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])), _(' changesets'), total) |
157 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])), |
|
158 _(' changesets'), total) |
158 storestatus(repo, originalwd, target, state, collapsef, keepf, |
159 storestatus(repo, originalwd, target, state, collapsef, keepf, |
159 keepbranchesf, external) |
160 keepbranchesf, external) |
160 p1, p2 = defineparents(repo, rev, target, state, |
161 p1, p2 = defineparents(repo, rev, target, state, |
161 targetancestors) |
162 targetancestors) |
162 if len(repo.parents()) == 2: |
163 if len(repo.parents()) == 2: |