Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: add a structured exception for unsupported merge records
authorSiddharth Agarwal <sid0@fb.com>
Tue, 17 Nov 2015 14:10:12 -0800
changeset 26985 039a53c87370
parent 26984 af2663680e95
child 26986 1ee5e48f09d4
error: add a structured exception for unsupported merge records We're going to use this in summary to print a better error message.
mercurial/error.py file | annotate | diff | comparison | revisions 
--- a/mercurial/error.py	Tue Nov 17 13:47:16 2015 -0800
+++ b/mercurial/error.py	Tue Nov 17 14:10:12 2015 -0800
@@ -112,6 +112,16 @@
 class RequirementError(RepoError):
     """Exception raised if .hg/requires has an unknown entry."""
 
+class UnsupportedMergeRecords(Abort):
+    def __init__(self, recordtypes):
+        from .i18n import _
+        self.recordtypes = sorted(recordtypes)
+        s = ' '.join(self.recordtypes)
+        Abort.__init__(
+            self, _('unsupported merge state records: %s') % s,
+            hint=_('see https://mercurial-scm.org/wiki/MergeStateRecords for '
+                   'more information'))
+
 class LockError(IOError):
     def __init__(self, errno, strerror, filename, desc):
         IOError.__init__(self, errno, strerror, filename)
Mercurial