Mercurial > hg-stable
changeset 40302:af2306bf7d5d
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
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 14 Oct 2018 11:05:41 -0400 |
| parents | b929bce413f4 |
| children | b8db53f786f0 |
| files | mercurial/context.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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 = {}