D2636: scmutil: fix oversight in b76248e51605c6 where I forgot to use msg
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Sun Mar 4 15:25:41 UTC 2018
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Thanks to Yuya for spotting my mistake.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2636
AFFECTED FILES
mercurial/scmutil.py
CHANGE DETAILS
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -189,12 +189,12 @@
msg = inst.args[1]
if isinstance(msg, type(u'')):
msg = pycompat.sysbytes(msg)
- elif not isinstance(inst.args[1], bytes):
- ui.warn(" %r\n" % (inst.args[1],))
- elif not inst.args[1]:
+ if not isinstance(msg, bytes):
+ ui.warn(" %r\n" % (msg,))
+ elif not msg:
ui.warn(_(" empty string\n"))
else:
- ui.warn("\n%r\n" % util.ellipsis(inst.args[1]))
+ ui.warn("\n%r\n" % util.ellipsis(msg))
except error.CensoredNodeError as inst:
ui.warn(_("abort: file censored %s!\n") % inst)
except error.RevlogError as inst:
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list