Mercurial > hg
comparison hgext/rebase.py @ 11729:c91b86a291b0
rebase/progress: Adding progress for rebasing
| author | timeless <timeless@gmail.com> |
|---|---|
| date | Tue, 20 Jul 2010 20:53:48 +0200 |
| parents | 134eb1c97e94 |
| children | e27a0fa7ba59 |
comparison
equal
deleted
inserted
replaced
| 11728:226a328a7ff3 | 11729:c91b86a291b0 |
|---|---|
| 146 # Rebase | 146 # Rebase |
| 147 if not targetancestors: | 147 if not targetancestors: |
| 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 for rev in sorted(state): | 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.debug("rebasing %d:%s\n" % (rev, repo[rev])) | 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, |
| 157 targetancestors) | 161 targetancestors) |
| 158 if len(repo.parents()) == 2: | 162 if len(repo.parents()) == 2: |
| 177 ui.note(_('no changes, revision %d skipped\n') % rev) | 181 ui.note(_('no changes, revision %d skipped\n') % rev) |
| 178 ui.debug('next revision set to %s\n' % p1) | 182 ui.debug('next revision set to %s\n' % p1) |
| 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: |
| 185 p1, p2 = defineparents(repo, min(state), target, | 190 p1, p2 = defineparents(repo, min(state), target, |
| 186 state, targetancestors) | 191 state, targetancestors) |