Mercurial > hg

diff mercurial/wireproto.py @ 36719:390d16ea7c76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use pycompat.bytestr instead of str Differential Revision: https://phab.mercurial-scm.org/D2648
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 04 Mar 2018 22:33:59 +0530
parents ed7705017749
children 7bf80d9d9543
line wrap: on
line diff
--- a/mercurial/wireproto.py	Sun Mar 04 07:40:21 2018 -0800
+++ b/mercurial/wireproto.py	Sun Mar 04 22:33:59 2018 +0530
@@ -1043,7 +1043,7 @@
                         util.stderr.write("(%s)\n" % exc.hint)
                     return pushres(0, output.getvalue() if output else '')
                 except error.PushRaced:
-                    return pusherr(str(exc),
+                    return pusherr(pycompat.bytestr(exc),
                                    output.getvalue() if output else '')
 
             bundler = bundle2.bundle20(repo.ui)