Mercurial > public > mercurial-scm > hg

comparison mercurial/scmutil.py @ 46672:aa2e38147e8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
46671:fa30292b680b 46672:aa2e38147e8b
199 except error.ResponseError as inst: 199 except error.ResponseError as inst:
200 ui.error(_(b"abort: %s") % inst.args[0]) 200 ui.error(_(b"abort: %s") % inst.args[0])
201 msg = inst.args[1] 201 msg = inst.args[1]
202 if isinstance(msg, type(u'')): 202 if isinstance(msg, type(u'')):
203 msg = pycompat.sysbytes(msg) 203 msg = pycompat.sysbytes(msg)
204 if not isinstance(msg, bytes): 204 if msg is None:
205 ui.error(b"\n")
206 elif not isinstance(msg, bytes):
205 ui.error(b" %r\n" % (msg,)) 207 ui.error(b" %r\n" % (msg,))
206 elif not msg: 208 elif not msg:
207 ui.error(_(b" empty string\n")) 209 ui.error(_(b" empty string\n"))
208 else: 210 else:
209 ui.error(b"\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg))) 211 ui.error(b"\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg)))