# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1531047155 -32400
# Node ID f016eac2a466ff9431af7aa495ba4ef591e7aa29
# Parent  cfdf7bfb0ac01d8ea2e69c2a9e77ed9694b7fd85
py3: use bytes() to byte-stringify Abort message in handleremotechangegroup()

diff -r cfdf7bfb0ac0 -r f016eac2a466 contrib/python3-whitelist
--- 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
diff -r cfdf7bfb0ac0 -r f016eac2a466 mercurial/bundle2.py
--- 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'))