Mercurial > public > mercurial-scm > hg
comparison mercurial/linelog.py @ 38962:70a19e804deb
linelog: fix bytes/str issue in exception raise on Python 3
Differential Revision: https://phab.mercurial-scm.org/D4170
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Thu, 09 Aug 2018 10:10:09 -0400 |
| parents | 27a54096c92e |
| children | 32b1967b8734 |
comparison
equal
deleted
inserted
replaced
| 38961:19344143b3e1 | 38962:70a19e804deb |
|---|---|
| 369 lastpc = pc | 369 lastpc = pc |
| 370 pc = inst.execute(rev, pc, lines.append) | 370 pc = inst.execute(rev, pc, lines.append) |
| 371 executed += 1 | 371 executed += 1 |
| 372 if pc is not None: | 372 if pc is not None: |
| 373 raise LineLogError( | 373 raise LineLogError( |
| 374 'Probably hit an infinite loop in linelog. Program:\n' + | 374 r'Probably hit an infinite loop in linelog. Program:\n' + |
| 375 self.debugstr()) | 375 self.debugstr()) |
| 376 ar = annotateresult(rev, lines, lastpc) | 376 ar = annotateresult(rev, lines, lastpc) |
| 377 self._lastannotate = ar | 377 self._lastannotate = ar |
| 378 return ar | 378 return ar |
| 379 | 379 |