--- a/contrib/python3-whitelist Sun Jul 08 18:52:28 2018 +0900
+++ b/contrib/python3-whitelist Sun Jul 08 18:58:11 2018 +0900
@@ -36,6 +36,7 @@
test-bundle-type.t
test-bundle-vs-outgoing.t
test-bundle.t
+test-bundle2-exchange.t
test-bundle2-multiple-changegroups.t
test-bundle2-pushback.t
test-cappedreader.py
--- a/mercurial/scmutil.py Sun Jul 08 18:52:28 2018 +0900
+++ b/mercurial/scmutil.py Sun Jul 08 18:58:11 2018 +0900
@@ -201,7 +201,7 @@
elif not msg:
ui.warn(_(" empty string\n"))
else:
- ui.warn("\n%r\n" % stringutil.ellipsis(msg))
+ ui.warn("\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg)))
except error.CensoredNodeError as inst:
ui.warn(_("abort: file censored %s!\n") % inst)
except error.RevlogError as inst: