Mercurial > hg
comparison hgext/rebase.py @ 12744:0793d763e413
progress: dropping superfluous space from units
| author | timeless <timeless@gmail.com> |
|---|---|
| date | Tue, 20 Jul 2010 20:53:48 +0200 |
| parents | c327bfa5e831 |
| children | 1c57a66bf985 |
comparison
equal
deleted
inserted
replaced
| 12743:4c4aeaab2339 | 12744:0793d763e413 |
|---|---|
| 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])), | 157 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])), |
| 158 _(' changesets'), total) | 158 _('changesets'), total) |
| 159 storestatus(repo, originalwd, target, state, collapsef, keepf, | 159 storestatus(repo, originalwd, target, state, collapsef, keepf, |
| 160 keepbranchesf, external) | 160 keepbranchesf, external) |
| 161 p1, p2 = defineparents(repo, rev, target, state, | 161 p1, p2 = defineparents(repo, rev, target, state, |
| 162 targetancestors) | 162 targetancestors) |
| 163 if len(repo.parents()) == 2: | 163 if len(repo.parents()) == 2: |