# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1600440523 14400
# Node ID e3df1f560d9a23753bcca4244cf80ea221be340a
# Parent  a8843eda9a35e4880dda58f59be42823e1078308# Parent  bd5b2b29b82df1e2de214a59a8aa60eb80ee27f9
merge with stable

diff -r a8843eda9a35 -r e3df1f560d9a mercurial/error.py
--- a/mercurial/error.py	Fri Sep 18 20:19:52 2020 +0900
+++ b/mercurial/error.py	Fri Sep 18 10:48:43 2020 -0400
@@ -73,7 +73,10 @@
             from .node import short
 
             name = short(name)
-        RevlogError.__init__(self, b'%s@%s: %s' % (index, name, message))
+        # if name is a binary node, it can be None
+        RevlogError.__init__(
+            self, b'%s@%s: %s' % (index, pycompat.bytestr(name), message)
+        )
 
     def __bytes__(self):
         return RevlogError.__bytes__(self)