Mercurial > hg-stable

changeset 45515:e3df1f560d9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Fri, 18 Sep 2020 10:48:43 -0400
parents a8843eda9a35 (current diff) bd5b2b29b82d (diff)
children 1f50bcc96595
files
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)