# HG changeset patch # User Anton Shestakov # Date 1647984101 -10800 # Node ID 889d21445ee997b1ebf83823af8787152c954255 # Parent b4e1d34ad1e99a0dd4f1adb39b7b3004b27fff48 next: use compat.StateError for missing state file diff -r b4e1d34ad1e9 -r 889d21445ee9 hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py Wed Mar 23 00:02:14 2022 +0300 +++ b/hgext3rd/evolve/__init__.py Wed Mar 23 00:21:41 2022 +0300 @@ -845,11 +845,11 @@ if abortopt: evolvestate = state.cmdstate(repo) if not evolvestate: - raise error.Abort(_(b'no interrupted next to abort')) + raise compat.StateError(_(b'no interrupted next to abort')) evolvestate.load() if evolvestate[b'command'] != b'next': - raise error.Abort(_(b'no interrupted next to abort')) + raise compat.StateError(_(b'no interrupted next to abort')) pctx = repo[b'.'] compat.clean_update(pctx) diff -r b4e1d34ad1e9 -r 889d21445ee9 tests/test-next-abort.t --- a/tests/test-next-abort.t Wed Mar 23 00:02:14 2022 +0300 +++ b/tests/test-next-abort.t Wed Mar 23 00:21:41 2022 +0300 @@ -36,7 +36,7 @@ working directory is now at 1c7f51cf0ef0 $ hg next --abort abort: no interrupted next to abort - [255] + [20] $ hg evolve --abort abort: no interrupted evolve to abort [255]