Mercurial > public > mercurial-scm > hg
diff mercurial/scmutil.py @ 46672:aa2e38147e8b
wireprotov1peer: don't raise internal errors in some cases
Specifically, when the peer is closed in the middle of a batch of rpcs.
Differential Revision: https://phab.mercurial-scm.org/D10074
| author | Valentin Gatien-Baron <vgatien-baron@janestreet.com> |
|---|---|
| date | Thu, 25 Feb 2021 10:08:33 -0500 |
| parents | 768056549737 |
| children | d4ba4d51f85f |
line wrap: on
line diff
--- a/mercurial/scmutil.py Thu Feb 25 10:00:08 2021 -0500 +++ b/mercurial/scmutil.py Thu Feb 25 10:08:33 2021 -0500 @@ -201,7 +201,9 @@ msg = inst.args[1] if isinstance(msg, type(u'')): msg = pycompat.sysbytes(msg) - if not isinstance(msg, bytes): + if msg is None: + ui.error(b"\n") + elif not isinstance(msg, bytes): ui.error(b" %r\n" % (msg,)) elif not msg: ui.error(_(b" empty string\n"))