This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4398

stringutil: emit multiple chunks when pretty printing
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5ed7c6caf24d: stringutil: emit multiple chunks when pretty printing
Summary

This avoids concatenating output inside pprintgen() itself. But
the real reason for this is it will make it easier to add
indentation, as we'll need to account for indentation when emitting
each individual object in a collection.

The verbosity of this code compared to the original is a bit
unfortunate. But I suppose this is the price to pay for having
nice things (streaming and indenting).

We could probably abstract the "print a collection" bits into a
generic function to avoid some duplication. But I'm not
overly inclined to do this.

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:05 PM
Closed by commit rHG5ed7c6caf24d: stringutil: emit multiple chunks when pretty printing (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 (96 lines)

Diff 10657

mercurial/utils/stringutil.py

yield "b'%s'" % escapestr(o) yield "b'%s'" % escapestr(o)
else: else:
yield "'%s'" % escapestr(o) 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.
yield "bytearray['%s']" % escapestr(bytes(o)) yield "bytearray['%s']" % escapestr(bytes(o))
elif isinstance(o, list): elif isinstance(o, list):
yield '[%s]' % (b', '.join(pprint(a, bprefix=bprefix) for a in o)) if not o:
yield '[]'
return
yield '['
for i, a in enumerate(o):
for chunk in pprintgen(a, bprefix=bprefix):
yield chunk
if i + 1 < len(o):
yield ', '
yield ']'
elif isinstance(o, dict): elif isinstance(o, dict):
yield '{%s}' % (b', '.join( if not o:
'%s: %s' % (pprint(k, bprefix=bprefix), yield '{}'
pprint(v, bprefix=bprefix)) return
for k, v in sorted(o.items())))
yield '{'
for i, (k, v) in enumerate(sorted(o.items())):
for chunk in pprintgen(k, bprefix=bprefix):
yield chunk
yield ': '
for chunk in pprintgen(v, bprefix=bprefix):
yield chunk
if i + 1 < len(o):
yield ', '
yield '}'
elif isinstance(o, set): elif isinstance(o, set):
yield 'set([%s])' % (b', '.join( if not o:
pprint(k, bprefix=bprefix) for k in sorted(o))) yield 'set([])'
return
yield 'set(['
for i, k in enumerate(sorted(o)):
for chunk in pprintgen(k, bprefix=bprefix):
yield chunk
if i + 1 < len(o):
yield ', '
yield '])'
elif isinstance(o, tuple): elif isinstance(o, tuple):
yield '(%s)' % (b', '.join(pprint(a, bprefix=bprefix) for a in o)) if not o:
yield '()'
return
yield '('
for i, a in enumerate(o):
for chunk in pprintgen(a, bprefix=bprefix):
yield chunk
if i + 1 < len(o):
yield ', '
yield ')'
elif isinstance(o, types.GeneratorType): elif isinstance(o, types.GeneratorType):
yield 'gen[%s]' % (b', '.join(pprint(a, bprefix=bprefix) for a in o)) # Special case of empty generator.
try:
nextitem = next(o)
except StopIteration:
yield 'gen[]'
return
yield 'gen['
last = False
while not last:
current = nextitem
try:
nextitem = next(o)
except StopIteration:
last = True
for chunk in pprintgen(current, bprefix=bprefix):
yield chunk
if not last:
yield ', '
yield ']'
else: else:
yield 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