equal
deleted
inserted
replaced
2255 except error.RepoLookupError: |
2255 except error.RepoLookupError: |
2256 # i18n: column positioning for "hg summary" |
2256 # i18n: column positioning for "hg summary" |
2257 msg = _(b'rebase: (use "hg rebase --abort" to clear broken state)\n') |
2257 msg = _(b'rebase: (use "hg rebase --abort" to clear broken state)\n') |
2258 ui.write(msg) |
2258 ui.write(msg) |
2259 return |
2259 return |
2260 numrebased = len([i for i in pycompat.itervalues(state) if i >= 0]) |
2260 numrebased = len([i for i in state.values() if i >= 0]) |
2261 # i18n: column positioning for "hg summary" |
2261 # i18n: column positioning for "hg summary" |
2262 ui.write( |
2262 ui.write( |
2263 _(b'rebase: %s, %s (rebase --continue)\n') |
2263 _(b'rebase: %s, %s (rebase --continue)\n') |
2264 % ( |
2264 % ( |
2265 ui.label(_(b'%d rebased'), b'rebase.rebased') % numrebased, |
2265 ui.label(_(b'%d rebased'), b'rebase.rebased') % numrebased, |