Patchwork [6,of,7] revlog: use pycompat.bytestr() to reliably have a %s-able value

login
register
mail settings
Submitter Augie Fackler
Date Aug. 29, 2017, 3:22 p.m.
Message ID <ae30c980ec329715171d.1504020123@augie-macbookpro2.roam.corp.google.com>
Download mbox | patch
Permalink /patch/23474/
State Accepted
Headers show

Comments

Augie Fackler - Aug. 29, 2017, 3:22 p.m.
# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1503451303 14400
#      Tue Aug 22 21:21:43 2017 -0400
# Node ID ae30c980ec329715171d142644a6bda68114df57
# Parent  8d65029a473f6ff1b1fde49403dd467caf3fd1c0
revlog: use pycompat.bytestr() to reliably have a %s-able value

Patch

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -1473,7 +1473,7 @@  class revlog(object):
             if revornode is None:
                 revornode = templatefilters.short(hex(node))
             raise RevlogError(_("integrity check failed on %s:%s")
-                % (self.indexfile, revornode))
+                % (self.indexfile, pycompat.bytestr(revornode)))
 
     def checkinlinesize(self, tr, fp=None):
         """Check if the revlog is too big for inline and convert if so.