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

login
register
mail settings
Submitter phabricator
Date Aug. 9, 2018, 2:54 p.m.
Message ID <868701d59669686b8014d1b00c2712c9@localhost.localdomain>
Download mbox | patch
Permalink /patch/33452/
State Not Applicable
Headers show

Comments

phabricator - Aug. 9, 2018, 2:54 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG70a19e804deb: linelog: fix bytes/str issue in exception raise on Python 3 (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4170?vs=10100&id=10102

REVISION DETAIL
  https://phab.mercurial-scm.org/D4170

AFFECTED FILES
  mercurial/linelog.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: yuja, mercurial-devel

Patch

diff --git a/mercurial/linelog.py b/mercurial/linelog.py
--- a/mercurial/linelog.py
+++ b/mercurial/linelog.py
@@ -371,7 +371,7 @@ 
             executed += 1
         if pc is not None:
             raise LineLogError(
-                'Probably hit an infinite loop in linelog. Program:\n' +
+                r'Probably hit an infinite loop in linelog. Program:\n' +
                 self.debugstr())
         ar = annotateresult(rev, lines, lastpc)
         self._lastannotate = ar