This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3831

py3: use stringutil.pprint() to print NoneType
ClosedPublic

Authored by pulkit on Jun 25 2018, 6:33 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa0c3d83d5f04: py3: use stringutil.pprint() to print NoneType
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Jun 25 2018, 6:33 AM
Closed by commit rHGa0c3d83d5f04: py3: use stringutil.pprint() to print NoneType (authored by pulkit). · Explain WhyJun 25 2018, 8:01 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9278

mercurial/debugcommands.py

error = _(".hg/dirstate inconsistent with current parent's manifest") error = _(".hg/dirstate inconsistent with current parent's manifest")
raise error.Abort(error) raise error.Abort(error)
@command('debugcolor', @command('debugcolor',
[('', 'style', None, _('show all configured styles'))], [('', 'style', None, _('show all configured styles'))],
'hg debugcolor') 'hg debugcolor')
def debugcolor(ui, repo, **opts): def debugcolor(ui, repo, **opts):
"""show available color, effects or style""" """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'): if opts.get(r'style'):
return _debugdisplaystyle(ui) return _debugdisplaystyle(ui)
else: else:
return _debugdisplaycolor(ui) return _debugdisplaycolor(ui)
def _debugdisplaycolor(ui): def _debugdisplaycolor(ui):
ui = ui.copy() ui = ui.copy()
ui._styles.clear() ui._styles.clear()

tests/test-debugcommands.t

.hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1
.hg/cache/rbc-names-v1 .hg/cache/rbc-names-v1
.hg/cache/branch2-served .hg/cache/branch2-served
Test debugcolor Test debugcolor
#if no-windows #if no-windows
$ hg debugcolor --style --color always | egrep 'mode|style|log\.' $ hg debugcolor --style --color always | egrep 'mode|style|log\.'
color mode: ansi color mode: 'ansi'
available style: available style:
\x1b[0;33mlog.changeset\x1b[0m: \x1b[0;33myellow\x1b[0m (esc) \x1b[0;33mlog.changeset\x1b[0m: \x1b[0;33myellow\x1b[0m (esc)
#endif #endif
$ hg debugcolor --style --color never $ hg debugcolor --style --color never
color mode: None color mode: None
available style: available style: