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.
merge: use ProgrammingError
authorJun Wu <quark@fb.com>
Sun, 26 Mar 2017 16:55:56 -0700
changeset 31646 e960eba3581c
parent 31645 7095e783958d
child 31647 4dbef666c6c9
merge: use ProgrammingError
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Sun Mar 26 16:53:28 2017 -0700
+++ b/mercurial/merge.py	Sun Mar 26 16:55:56 2017 -0700
@@ -315,13 +315,15 @@
     @util.propertycache
     def localctx(self):
         if self._local is None:
-            raise RuntimeError("localctx accessed but self._local isn't set")
+            msg = "localctx accessed but self._local isn't set"
+            raise error.ProgrammingError(msg)
         return self._repo[self._local]
 
     @util.propertycache
     def otherctx(self):
         if self._other is None:
-            raise RuntimeError("otherctx accessed but self._other isn't set")
+            msg = "otherctx accessed but self._other isn't set"
+            raise error.ProgrammingError(msg)
         return self._repo[self._other]
 
     def active(self):
Mercurial