Mercurial > hg-stable

changeset 38701:f016eac2a466

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()
author Yuya Nishihara <yuya@tcha.org>
date Sun, 08 Jul 2018 19:52:35 +0900
parents cfdf7bfb0ac0
children 992e108212a9
files contrib/python3-whitelist mercurial/bundle2.py
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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'))