Patchwork D2541: verify: fix exception formatting bug in Python 3

login
register
mail settings
Submitter phabricator
Date March 2, 2018, 7:51 p.m.
Message ID <183cf0940a4c788f04960948ab96e5fd@localhost.localdomain>
Download mbox | patch
Permalink /patch/28707/
State Not Applicable
Headers show

Comments

phabricator - March 2, 2018, 7:51 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd85ef895d5f6: verify: fix exception formatting bug in Python 3 (authored by durin42, committed by ).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D2541?vs=6364&id=6370#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2541?vs=6364&id=6370

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

AFFECTED FILES
  mercurial/verify.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/verify.py b/mercurial/verify.py
--- a/mercurial/verify.py
+++ b/mercurial/verify.py
@@ -70,9 +70,10 @@ 
         self.errors += 1
 
     def exc(self, linkrev, msg, inst, filename=None):
-        if not str(inst):
-            inst = repr(inst)
-        self.err(linkrev, "%s: %s" % (msg, inst), filename)
+        fmsg = pycompat.bytestr(inst)
+        if not fmsg:
+            fmsg = pycompat.byterepr(inst)
+        self.err(linkrev, "%s: %s" % (msg, fmsg), filename)
 
     def checklog(self, obj, name, linkrev):
         if not len(obj) and (self.havecl or self.havemf):