# HG changeset patch # User FUJIWARA Katsunori # Date 1380555307 -32400 # Node ID e7fa36d2ad3a7944a52dca126458d6f482db3524 # Parent 577f4c562d52cd6f2e3030d616cff7924214bb1c rebase: catch RepoLookupError at restoring rebase state for summary Before this patch, "hg summary" may fail, when there is inconsistent rebase state: for example, the root of rebase destination revisions recorded in rebase state file is already stripped manually. Mercurial earlier than 2.7 allows users to do anything other than starting new rebase, even though current rebase is not finished or aborted yet. So, such inconsistent rebase states may be left and forgotten in repositories. This patch catches RepoLookupError at restoring rebase state for summary hook, and treat such state as "broken". diff -r 577f4c562d52 -r e7fa36d2ad3a hgext/rebase.py --- a/hgext/rebase.py Tue Oct 01 00:35:07 2013 +0900 +++ b/hgext/rebase.py Tue Oct 01 00:35:07 2013 +0900 @@ -813,7 +813,13 @@ def summaryhook(ui, repo): if not os.path.exists(repo.join('rebasestate')): return - state = restorestatus(repo)[2] + try: + state = restorestatus(repo)[2] + except error.RepoLookupError: + # i18n: column positioning for "hg summary" + msg = _('rebase: (use "hg rebase --abort" to clear broken state)\n') + ui.write(msg) + return numrebased = len([i for i in state.itervalues() if i != -1]) # i18n: column positioning for "hg summary" ui.write(_('rebase: %s, %s (rebase --continue)\n') % diff -r 577f4c562d52 -r e7fa36d2ad3a tests/test-rebase-abort.t --- a/tests/test-rebase-abort.t Tue Oct 01 00:35:07 2013 +0900 +++ b/tests/test-rebase-abort.t Tue Oct 01 00:35:07 2013 +0900 @@ -95,6 +95,8 @@ abort: cannot continue inconsistent rebase (use "hg rebase --abort" to clear borken state) [255] + $ hg summary | grep '^rebase: ' + rebase: (use "hg rebase --abort" to clear broken state) $ hg rebase --abort rebase aborted (no revision is removed, only broken state is cleared)