Mercurial > public > mercurial-scm > hg

comparison mercurial/scmutil.py @ 44000:60de488cad11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Tue, 07 Jan 2020 09:26:06 -0500
parents f2de8dc9c52f b4c82b704180
children 992f0d6e7f33
comparison
equal deleted inserted replaced
43997:6e8678e7223a 44000:60de488cad11
234 # it might be anything, for example a string 234 # it might be anything, for example a string
235 reason = inst.reason 235 reason = inst.reason
236 if isinstance(reason, pycompat.unicode): 236 if isinstance(reason, pycompat.unicode):
237 # SSLError of Python 2.7.9 contains a unicode 237 # SSLError of Python 2.7.9 contains a unicode
238 reason = encoding.unitolocal(reason) 238 reason = encoding.unitolocal(reason)
239 ui.error(_(b"abort: error: %s\n") % reason) 239 ui.error(_(b"abort: error: %s\n") % stringutil.forcebytestr(reason))
240 elif ( 240 elif (
241 util.safehasattr(inst, b"args") 241 util.safehasattr(inst, b"args")
242 and inst.args 242 and inst.args
243 and inst.args[0] == errno.EPIPE 243 and inst.args[0] == errno.EPIPE
244 ): 244 ):