changeset 40223:cabf09dbc6e0

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
author Pulkit Goyal <pulkit@yandex-team.ru>
date Sat, 13 Oct 2018 04:42:14 +0300
parents af5e2b23040a
children 63245ad598af
files contrib/python3-whitelist mercurial/color.py
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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):