Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use bytes() to byte-stringify Abort message in handleremotechangegroup()
authorYuya Nishihara <yuya@tcha.org>
Sun, 08 Jul 2018 19:52:35 +0900
changeset 38701 f016eac2a466
parent 38700 cfdf7bfb0ac0
child 38702 992e108212a9
py3: use bytes() to byte-stringify Abort message in handleremotechangegroup()
contrib/python3-whitelist file | annotate | diff | comparison | revisions
mercurial/bundle2.py file | annotate | diff | comparison | revisions 
--- a/contrib/python3-whitelist	Sun Jul 08 19:44:51 2018 +0900
+++ b/contrib/python3-whitelist	Sun Jul 08 19:52:35 2018 +0900
@@ -41,6 +41,7 @@
 test-bundle2-format.t
 test-bundle2-multiple-changegroups.t
 test-bundle2-pushback.t
+test-bundle2-remote-changegroup.t
 test-cappedreader.py
 test-casecollision.t
 test-cat.t
--- a/mercurial/bundle2.py	Sun Jul 08 19:44:51 2018 +0900
+++ b/mercurial/bundle2.py	Sun Jul 08 19:52:35 2018 +0900
@@ -1878,7 +1878,7 @@
         real_part.validate()
     except error.Abort as e:
         raise error.Abort(_('bundle at %s is corrupted:\n%s') %
-            (util.hidepassword(raw_url), str(e)))
+                          (util.hidepassword(raw_url), bytes(e)))
     assert not inpart.read()
 
 @parthandler('reply:changegroup', ('return', 'in-reply-to'))
mercurial