Mercurial > public > mercurial-scm > hg

comparison mercurial/scmutil.py @ 36695:c442c4a92ae8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
scmutil: fix oversight in b76248e51605c6 where I forgot to use msg Thanks to Yuya for spotting my mistake. Differential Revision: https://phab.mercurial-scm.org/D2636
author Augie Fackler <augie@google.com>
date Sun, 04 Mar 2018 10:20:41 -0500
parents b76248e51605
children a00c38b33047
comparison
equal deleted inserted replaced
36694:1d06407d0ee9 36695:c442c4a92ae8
187 except error.ResponseError as inst: 187 except error.ResponseError as inst:
188 ui.warn(_("abort: %s") % inst.args[0]) 188 ui.warn(_("abort: %s") % inst.args[0])
189 msg = inst.args[1] 189 msg = inst.args[1]
190 if isinstance(msg, type(u'')): 190 if isinstance(msg, type(u'')):
191 msg = pycompat.sysbytes(msg) 191 msg = pycompat.sysbytes(msg)
192 elif not isinstance(inst.args[1], bytes): 192 if not isinstance(msg, bytes):
193 ui.warn(" %r\n" % (inst.args[1],)) 193 ui.warn(" %r\n" % (msg,))
194 elif not inst.args[1]: 194 elif not msg:
195 ui.warn(_(" empty string\n")) 195 ui.warn(_(" empty string\n"))
196 else: 196 else:
197 ui.warn("\n%r\n" % util.ellipsis(inst.args[1])) 197 ui.warn("\n%r\n" % util.ellipsis(msg))
198 except error.CensoredNodeError as inst: 198 except error.CensoredNodeError as inst:
199 ui.warn(_("abort: file censored %s!\n") % inst) 199 ui.warn(_("abort: file censored %s!\n") % inst)
200 except error.RevlogError as inst: 200 except error.RevlogError as inst:
201 ui.warn(_("abort: %s!\n") % inst) 201 ui.warn(_("abort: %s!\n") % inst)
202 except error.InterventionRequired as inst: 202 except error.InterventionRequired as inst: