This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4170

linelog: fix bytes/str issue in exception raise on Python 3
ClosedPublic

Authored by durin42 on Aug 9 2018, 10:17 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG70a19e804deb: linelog: fix bytes/str issue in exception raise on Python 3

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.Aug 9 2018, 10:17 AM
yuja added a subscriber: yuja.Aug 9 2018, 10:38 AM

Queued, thanks.

raise LineLogError(
  • 'Probably hit an infinite loop in linelog. Program:\n' +

+ r'Probably hit an infinite loop in linelog. Program:\n' +

self.debugstr())

I assume LineLogError is a kind of a ProgrammingError. If it's a user-facing
error, we'll have to convert a message to bytes.

Closed by commit rHG70a19e804deb: linelog: fix bytes/str issue in exception raise on Python 3 (authored by durin42). · Explain WhyAug 9 2018, 10:54 AM
This revision was automatically updated to reflect the committed changes.
durin42 added a comment.Aug 9 2018, 11:24 PM

I assume LineLogError is a kind of a ProgrammingError. If it's a user-facing
error, we'll have to convert a message to bytes.

Yep - it should never happen (barring misuse of the API or woefully corrupt linelog files).

Revision Contents
Changeset List

PathPackages
Mmercurial/linelog.py (2 lines)

Diff 10102

mercurial/linelog.py

# should stop. # should stop.
while pc is not None and executed < len(self._program): while pc is not None and executed < len(self._program):
inst = self._program[pc] inst = self._program[pc]
lastpc = pc lastpc = pc
pc = inst.execute(rev, pc, lines.append) pc = inst.execute(rev, pc, lines.append)
executed += 1 executed += 1
if pc is not None: if pc is not None:
raise LineLogError( raise LineLogError(
'Probably hit an infinite loop in linelog. Program:\n' + r'Probably hit an infinite loop in linelog. Program:\n' +
self.debugstr()) self.debugstr())
ar = annotateresult(rev, lines, lastpc) ar = annotateresult(rev, lines, lastpc)
self._lastannotate = ar self._lastannotate = ar
return ar return ar
@property @property
def maxrev(self): def maxrev(self):
return self._maxrev return self._maxrev