Mercurial > evolve

changeset 6263:889d21445ee9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
next: use compat.StateError for missing state file
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 23 Mar 2022 00:21:41 +0300
parents b4e1d34ad1e9
children 917cd662ef6c
files hgext3rd/evolve/__init__.py tests/test-next-abort.t
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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]