Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use stringutil.pprint() to print NoneType
authorPulkit Goyal <7895pulkit@gmail.com>
Mon, 25 Jun 2018 01:07:23 +0530
changeset 38449 a0c3d83d5f04
parent 38448 e6b643ccf87d
child 38450 afa96dd5a483
py3: use stringutil.pprint() to print NoneType Before this patch, when running test-debugcommands.t, we get a TypeError because NoneType can't be converted into bytes. This patch uses stringutil.pprint() to print the ui._colormode. We are now close to getting test-debugcommands.t passing on Python 3. Differential Revision: https://phab.mercurial-scm.org/D3831
mercurial/debugcommands.py file | annotate | diff | comparison | revisions
tests/test-debugcommands.t file | annotate | diff | comparison | revisions 
--- a/mercurial/debugcommands.py	Sat Jun 23 08:59:18 2018 +0530
+++ b/mercurial/debugcommands.py	Mon Jun 25 01:07:23 2018 +0530
@@ -427,7 +427,7 @@
         'hg debugcolor')
 def debugcolor(ui, repo, **opts):
     """show available color, effects or style"""
-    ui.write(('color mode: %s\n') % ui._colormode)
+    ui.write(('color mode: %s\n') % stringutil.pprint(ui._colormode))
     if opts.get(r'style'):
         return _debugdisplaystyle(ui)
     else:
--- a/tests/test-debugcommands.t	Sat Jun 23 08:59:18 2018 +0530
+++ b/tests/test-debugcommands.t	Mon Jun 25 01:07:23 2018 +0530
@@ -337,7 +337,7 @@
 
 #if no-windows
   $ hg debugcolor --style --color always | egrep 'mode|style|log\.'
-  color mode: ansi
+  color mode: 'ansi'
   available style:
   \x1b[0;33mlog.changeset\x1b[0m:                      \x1b[0;33myellow\x1b[0m (esc)
 #endif
hg-stable