merge with stable

merge with stable

--- 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)