This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5108

context: raise runtime errors with sysstrs
ClosedPublic

Authored by durin42 on Oct 14 2018, 11:07 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGaf2306bf7d5d: context: raise runtime errors with sysstrs
Summary

We should probably *not* use RuntimeError for this, but let's deal
with that later, rather than as part of the Python 3 effort.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Oct 14 2018, 11:07 AM
Closed by commit rHGaf2306bf7d5d: context: raise runtime errors with sysstrs (authored by durin42). · Explain WhyOct 15 2018, 11:22 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (8 lines)

Diff 12151

mercurial/context.py

while len(parents) < 2: while len(parents) < 2:
parents.append(repo[nullid]) parents.append(repo[nullid])
p1, p2 = self._parents = parents p1, p2 = self._parents = parents
# sanity check to ensure that the reused manifest parents are # sanity check to ensure that the reused manifest parents are
# manifests of our commit parents # manifests of our commit parents
mp1, mp2 = self.manifestctx().parents mp1, mp2 = self.manifestctx().parents
if p1 != nullid and p1.manifestnode() != mp1: if p1 != nullid and p1.manifestnode() != mp1:
raise RuntimeError('can\'t reuse the manifest: ' raise RuntimeError(r"can't reuse the manifest: its p1 "
'its p1 doesn\'t match the new ctx p1') r"doesn't match the new ctx p1")
if p2 != nullid and p2.manifestnode() != mp2: if p2 != nullid and p2.manifestnode() != mp2:
raise RuntimeError('can\'t reuse the manifest: ' raise RuntimeError(r"can't reuse the manifest: "
'its p2 doesn\'t match the new ctx p2') r"its p2 doesn't match the new ctx p2")
self._files = originalctx.files() self._files = originalctx.files()
self.substate = {} self.substate = {}
if editor: if editor:
self._text = editor(self._repo, self, []) self._text = editor(self._repo, self, [])
self._repo.savecommitmessage(self._text) self._repo.savecommitmessage(self._text)