##// END OF EJS Templates
scmutil: fix oversight in b76248e51605c6 where I forgot to use msg...
Augie Fackler -
r36713:c442c4a9 default
parent child Browse files
Show More
@@ -189,12 +189,12 b' def callcatch(ui, func):'
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:
General Comments 0
You need to be logged in to leave comments. Login now