This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2636

scmutil: fix oversight in b76248e51605c6 where I forgot to use msg
ClosedPublic

Authored by durin42 on Mar 4 2018, 10:25 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc442c4a92ae8: scmutil: fix oversight in b76248e51605c6 where I forgot to use msg
Summary

Thanks to Yuya for spotting my mistake.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Mar 4 2018, 10:25 AM
pulkit accepted this revision.Mar 4 2018, 11:25 AM
Closed by commit rHGc442c4a92ae8: scmutil: fix oversight in b76248e51605c6 where I forgot to use msg (authored by durin42). · Explain WhyMar 4 2018, 11:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (8 lines)

Diff 6551

mercurial/scmutil.py

ui.warn(_("abort: %s!\n") % inst) ui.warn(_("abort: %s!\n") % inst)
if inst.hint: if inst.hint:
ui.warn(_("(%s)\n") % inst.hint) ui.warn(_("(%s)\n") % inst.hint)
except error.ResponseError as inst: except error.ResponseError as inst:
ui.warn(_("abort: %s") % inst.args[0]) ui.warn(_("abort: %s") % inst.args[0])
msg = inst.args[1] msg = inst.args[1]
if isinstance(msg, type(u'')): if isinstance(msg, type(u'')):
msg = pycompat.sysbytes(msg) msg = pycompat.sysbytes(msg)
elif not isinstance(inst.args[1], bytes): if not isinstance(msg, bytes):
ui.warn(" %r\n" % (inst.args[1],)) ui.warn(" %r\n" % (msg,))
elif not inst.args[1]: elif not msg:
ui.warn(_(" empty string\n")) ui.warn(_(" empty string\n"))
else: else:
ui.warn("\n%r\n" % util.ellipsis(inst.args[1])) ui.warn("\n%r\n" % util.ellipsis(msg))
except error.CensoredNodeError as inst: except error.CensoredNodeError as inst:
ui.warn(_("abort: file censored %s!\n") % inst) ui.warn(_("abort: file censored %s!\n") % inst)
except error.RevlogError as inst: except error.RevlogError as inst:
ui.warn(_("abort: %s!\n") % inst) ui.warn(_("abort: %s!\n") % inst)
except error.InterventionRequired as inst: except error.InterventionRequired as inst:
ui.warn("%s\n" % inst) ui.warn("%s\n" % inst)
if inst.hint: if inst.hint:
ui.warn(_("(%s)\n") % inst.hint) ui.warn(_("(%s)\n") % inst.hint)