D5034: py3: use stringutil.pprint() in color.py instead of '%r'
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sat Oct 13 01:59:06 UTC 2018
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This fixes the test-status-color.t on python 3.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5034
AFFECTED FILES
contrib/python3-whitelist
mercurial/color.py
CHANGE DETAILS
diff --git a/mercurial/color.py b/mercurial/color.py
--- a/mercurial/color.py
+++ b/mercurial/color.py
@@ -296,9 +296,9 @@
if valideffect(ui, e):
good.append(e)
else:
- ui.warn(_("ignoring unknown color/effect %r "
+ ui.warn(_("ignoring unknown color/effect %s "
"(configured in color.%s)\n")
- % (e, status))
+ % (stringutil.pprint(e), status))
ui._styles[status] = ' '.join(good)
def _activeeffects(ui):
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -534,6 +534,7 @@
test-ssh.t
test-sshserver.py
test-stack.t
+test-status-color.t
test-status-inprocess.py
test-status-rev.t
test-status-terse.t
To: pulkit, #hg-reviewers
Cc: mercurial-devel, spectral
More information about the Mercurial-devel
mailing list