[PATCH 5 of 7] py3: drop b'' while formatting BundleUnknownFeatureError message

Yuya Nishihara yuya at tcha.org
Mon Jul 9 09:24:35 EDT 2018


# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1531045959 -32400
#      Sun Jul 08 19:32:39 2018 +0900
# Node ID a695979732a9b26b78e465096bc3434aef6e40f6
# Parent  ad368dee20a7762100e5c46e152e67d838e15d9b
py3: drop b'' while formatting BundleUnknownFeatureError message

diff --git a/mercurial/error.py b/mercurial/error.py
--- a/mercurial/error.py
+++ b/mercurial/error.py
@@ -241,7 +241,7 @@ class BundleUnknownFeatureError(BundleVa
                 if val is None:
                     entries.append(val)
                 else:
-                    entries.append("%s=%r" % (par, val))
+                    entries.append("%s=%r" % (par, pycompat.maybebytestr(val)))
         if entries:
             msg = '%s - %s' % (msg, ', '.join(entries))
         ValueError.__init__(self, msg)


More information about the Mercurial-devel mailing list