Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: drop b'' while formatting ResponseError
authorYuya Nishihara <yuya@tcha.org>
Sun, 08 Jul 2018 18:58:11 +0900
changeset 38605 85c74c5a1590
parent 38604 2834ac06d5a9
child 38606 15622e72307d
py3: drop b'' while formatting ResponseError
contrib/python3-whitelist file | annotate | diff | comparison | revisions
mercurial/scmutil.py file | annotate | diff | comparison | revisions 
--- 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:
Mercurial