diff mercurial/error.py @ 45859:527ce85c2e60

errors: introduce StateError and use it from commands and cmdutil This very similar to an earlier patch (which was for `InputError`). In this patch, I also updated the transplant extension only because `test-transplant.t` would otherwise have needed a `#if continueflag`. Differential Revision: https://phab.mercurial-scm.org/D9310
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 12 Oct 2020 12:44:18 -0700
parents 8d72e29ad1e0
children ac362d5a7893
line wrap: on
line diff
--- a/mercurial/error.py	Thu Oct 22 13:31:34 2020 -0700
+++ b/mercurial/error.py	Mon Oct 12 12:44:18 2020 -0700
@@ -188,6 +188,13 @@
     """
 
 
+class StateError(Abort):
+    """Indicates that the operation might work if retried in a different state.
+
+    Examples: Unresolved merge conflicts, unfinished operations.
+    """
+
+
 class HookLoadError(Abort):
     """raised when loading a hook fails, aborting an operation