Show More
@@ -813,7 +813,13 b' def pullrebase(orig, ui, repo, *args, **' | |||||
813 | def summaryhook(ui, repo): |
|
813 | def summaryhook(ui, repo): | |
814 | if not os.path.exists(repo.join('rebasestate')): |
|
814 | if not os.path.exists(repo.join('rebasestate')): | |
815 | return |
|
815 | return | |
816 | state = restorestatus(repo)[2] |
|
816 | try: | |
|
817 | state = restorestatus(repo)[2] | |||
|
818 | except error.RepoLookupError: | |||
|
819 | # i18n: column positioning for "hg summary" | |||
|
820 | msg = _('rebase: (use "hg rebase --abort" to clear broken state)\n') | |||
|
821 | ui.write(msg) | |||
|
822 | return | |||
817 | numrebased = len([i for i in state.itervalues() if i != -1]) |
|
823 | numrebased = len([i for i in state.itervalues() if i != -1]) | |
818 | # i18n: column positioning for "hg summary" |
|
824 | # i18n: column positioning for "hg summary" | |
819 | ui.write(_('rebase: %s, %s (rebase --continue)\n') % |
|
825 | ui.write(_('rebase: %s, %s (rebase --continue)\n') % |
@@ -95,6 +95,8 b' earlier than 2.7 by renaming ".hg/rebase' | |||||
95 | abort: cannot continue inconsistent rebase |
|
95 | abort: cannot continue inconsistent rebase | |
96 | (use "hg rebase --abort" to clear borken state) |
|
96 | (use "hg rebase --abort" to clear borken state) | |
97 | [255] |
|
97 | [255] | |
|
98 | $ hg summary | grep '^rebase: ' | |||
|
99 | rebase: (use "hg rebase --abort" to clear broken state) | |||
98 | $ hg rebase --abort |
|
100 | $ hg rebase --abort | |
99 | rebase aborted (no revision is removed, only broken state is cleared) |
|
101 | rebase aborted (no revision is removed, only broken state is cleared) | |
100 |
|
102 |
General Comments 0
You need to be logged in to leave comments.
Login now