Mercurial > public > mercurial-scm > hg-stable

diff mercurial/error.py @ 45151:e429e7c801b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: normalize "unresolved conflicts" error messages with a custom class Differential Revision: https://phab.mercurial-scm.org/D8713
author Daniel Ploch <dploch@google.com>
date Tue, 14 Jul 2020 13:35:54 -0700
parents 9f70512ae2cf
children bd5b2b29b82d
line wrap: on
line diff
--- a/mercurial/error.py	Mon Jul 13 16:42:44 2020 -0700
+++ b/mercurial/error.py	Tue Jul 14 13:35:54 2020 -0700
@@ -106,6 +106,22 @@
     __bytes__ = _tobytes
 
 
+class ConflictResolutionRequired(InterventionRequired):
+    """Exception raised when a continuable command required merge conflict resolution."""
+
+    def __init__(self, opname):
+        from .i18n import _
+
+        self.opname = opname
+        InterventionRequired.__init__(
+            self,
+            _(
+                b"unresolved conflicts (see 'hg resolve', then 'hg %s --continue')"
+            )
+            % opname,
+        )
+
+
 class Abort(Hint, Exception):
     """Raised if a command needs to print an error and exit."""