Mercurial > evolve

changeset 6332:58ba40d1f2c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: raise StateError when trying to prev/next from uncommitted merge
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 20 Nov 2022 17:47:13 +0400
parents 9c243e98d0be
children f4ffe1e67a9b
files hgext3rd/evolve/__init__.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py	Sun Nov 20 17:29:14 2022 +0400
+++ b/hgext3rd/evolve/__init__.py	Sun Nov 20 17:47:13 2022 +0400
@@ -783,7 +783,7 @@
         wkctx = repo[None]
         wparents = wkctx.parents()
         if len(wparents) != 1:
-            raise error.Abort(_(b'merge in progress'))
+            raise compat.StateError(_(b'merge in progress'))
         if not mergeopt:
             # we only skip the check if noconflict is set
             if ui.config(b'commands', b'update.check') == b'noconflict':
@@ -868,7 +868,7 @@
         wkctx = repo[None]
         wparents = wkctx.parents()
         if len(wparents) != 1:
-            raise error.Abort(_(b'merge in progress'))
+            raise compat.StateError(_(b'merge in progress'))
 
         children = [ctx for ctx in wparents[0].children() if not ctx.obsolete()]
         topic = _getcurrenttopic(repo)