Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: raise runtime errors with sysstrs
authorAugie Fackler <augie@google.com>
Sun, 14 Oct 2018 11:05:41 -0400
changeset 40302 af2306bf7d5d
parent 40301 b929bce413f4
child 40303 b8db53f786f0
context: raise runtime errors with sysstrs We should probably *not* use RuntimeError for this, but let's deal with that later, rather than as part of the Python 3 effort. Differential Revision: https://phab.mercurial-scm.org/D5108
mercurial/context.py file | annotate | diff | comparison | revisions 
--- a/mercurial/context.py	Mon Oct 15 11:16:12 2018 +0200
+++ b/mercurial/context.py	Sun Oct 14 11:05:41 2018 -0400
@@ -2337,11 +2337,11 @@
         # manifests of our commit parents
         mp1, mp2 = self.manifestctx().parents
         if p1 != nullid and p1.manifestnode() != mp1:
-            raise RuntimeError('can\'t reuse the manifest: '
-                               'its p1 doesn\'t match the new ctx p1')
+            raise RuntimeError(r"can't reuse the manifest: its p1 "
+                               r"doesn't match the new ctx p1")
         if p2 != nullid and p2.manifestnode() != mp2:
-            raise RuntimeError('can\'t reuse the manifest: '
-                               'its p2 doesn\'t match the new ctx p2')
+            raise RuntimeError(r"can't reuse the manifest: "
+                               r"its p2 doesn't match the new ctx p2")
 
         self._files = originalctx.files()
         self.substate = {}
mercurial