Mercurial > hg
comparison mercurial/wireproto.py @ 36719:390d16ea7c76
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 |
comparison
equal
deleted
inserted
replaced
| 36718:59802fa590db | 36719:390d16ea7c76 |
|---|---|
| 1041 util.stderr.write("abort: %s\n" % exc) | 1041 util.stderr.write("abort: %s\n" % exc) |
| 1042 if exc.hint is not None: | 1042 if exc.hint is not None: |
| 1043 util.stderr.write("(%s)\n" % exc.hint) | 1043 util.stderr.write("(%s)\n" % exc.hint) |
| 1044 return pushres(0, output.getvalue() if output else '') | 1044 return pushres(0, output.getvalue() if output else '') |
| 1045 except error.PushRaced: | 1045 except error.PushRaced: |
| 1046 return pusherr(str(exc), | 1046 return pusherr(pycompat.bytestr(exc), |
| 1047 output.getvalue() if output else '') | 1047 output.getvalue() if output else '') |
| 1048 | 1048 |
| 1049 bundler = bundle2.bundle20(repo.ui) | 1049 bundler = bundle2.bundle20(repo.ui) |
| 1050 for out in getattr(exc, '_bundle2salvagedoutput', ()): | 1050 for out in getattr(exc, '_bundle2salvagedoutput', ()): |
| 1051 bundler.addpart(out) | 1051 bundler.addpart(out) |