Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use stringutil.pprint() in color.py instead of '%r'
authorPulkit Goyal <pulkit@yandex-team.ru>
Sat, 13 Oct 2018 04:42:14 +0300
changeset 40223 cabf09dbc6e0
parent 40222 af5e2b23040a
child 40224 63245ad598af
py3: use stringutil.pprint() in color.py instead of '%r' This fixes the test-status-color.t on python 3. Differential Revision: https://phab.mercurial-scm.org/D5034
contrib/python3-whitelist file | annotate | diff | comparison | revisions
mercurial/color.py file | annotate | diff | comparison | revisions 
--- a/contrib/python3-whitelist	Sat Oct 13 04:36:04 2018 +0300
+++ b/contrib/python3-whitelist	Sat Oct 13 04:42:14 2018 +0300
@@ -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
--- a/mercurial/color.py	Sat Oct 13 04:36:04 2018 +0300
+++ b/mercurial/color.py	Sat Oct 13 04:42:14 2018 +0300
@@ -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):
Mercurial