This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4397

stringutil: refactor core of pprint so it emits chunks
ClosedPublic

Authored by indygreg on Aug 27 2018, 12:15 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0d21b1f1722c: stringutil: refactor core of pprint so it emits chunks
Summary

This commit splits the core of pprint() to a new function that is
a generator of chunks instead of a function returning a single
value. This will make it possible to stream output without waiting for
all data to be formatted first. And it will make it easier to
implement support for indenting.

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

indygreg created this revision.Aug 27 2018, 12:15 PM
pulkit accepted this revision.Aug 29 2018, 4:04 PM
Closed by commit rHG0d21b1f1722c: stringutil: refactor core of pprint so it emits chunks (authored by indygreg). · Explain WhyAug 29 2018, 4:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/stringutil.py (24 lines)

Diff 10656

mercurial/utils/stringutil.py

pat = pat.decode('latin1') pat = pat.decode('latin1')
pat = pat.translate(_regexescapemap) pat = pat.translate(_regexescapemap)
if wantuni: if wantuni:
return pat return pat
return pat.encode('latin1') return pat.encode('latin1')
def pprint(o, bprefix=False): def pprint(o, bprefix=False):
"""Pretty print an object.""" """Pretty print an object."""
return b''.join(pprintgen(o, bprefix=bprefix))
def pprintgen(o, bprefix=False):
"""Pretty print an object to a generator of atoms."""
if isinstance(o, bytes): if isinstance(o, bytes):
if bprefix: if bprefix:
return "b'%s'" % escapestr(o) yield "b'%s'" % escapestr(o)
return "'%s'" % escapestr(o) else:
yield "'%s'" % escapestr(o)
elif isinstance(o, bytearray): elif isinstance(o, bytearray):
# codecs.escape_encode() can't handle bytearray, so escapestr fails # codecs.escape_encode() can't handle bytearray, so escapestr fails
# without coercion. # without coercion.
return "bytearray['%s']" % escapestr(bytes(o)) yield "bytearray['%s']" % escapestr(bytes(o))
elif isinstance(o, list): elif isinstance(o, list):
return '[%s]' % (b', '.join(pprint(a, bprefix=bprefix) for a in o)) yield '[%s]' % (b', '.join(pprint(a, bprefix=bprefix) for a in o))
elif isinstance(o, dict): elif isinstance(o, dict):
return '{%s}' % (b', '.join( yield '{%s}' % (b', '.join(
'%s: %s' % (pprint(k, bprefix=bprefix), '%s: %s' % (pprint(k, bprefix=bprefix),
pprint(v, bprefix=bprefix)) pprint(v, bprefix=bprefix))
for k, v in sorted(o.items()))) for k, v in sorted(o.items())))
elif isinstance(o, set): elif isinstance(o, set):
return 'set([%s])' % (b', '.join( yield 'set([%s])' % (b', '.join(
pprint(k, bprefix=bprefix) for k in sorted(o))) pprint(k, bprefix=bprefix) for k in sorted(o)))
elif isinstance(o, tuple): elif isinstance(o, tuple):
return '(%s)' % (b', '.join(pprint(a, bprefix=bprefix) for a in o)) yield '(%s)' % (b', '.join(pprint(a, bprefix=bprefix) for a in o))
elif isinstance(o, types.GeneratorType): elif isinstance(o, types.GeneratorType):
return 'gen[%s]' % (b', '.join(pprint(a, bprefix=bprefix) for a in o)) yield 'gen[%s]' % (b', '.join(pprint(a, bprefix=bprefix) for a in o))
else: else:
return pycompat.byterepr(o) yield pycompat.byterepr(o)
def prettyrepr(o): def prettyrepr(o):
"""Pretty print a representation of a possibly-nested object""" """Pretty print a representation of a possibly-nested object"""
lines = [] lines = []
rs = pycompat.byterepr(o) rs = pycompat.byterepr(o)
p0 = p1 = 0 p0 = p1 = 0
while p0 < len(rs): while p0 < len(rs):
# '... field=<type ... field=<type ...' # '... field=<type ... field=<type ...'