This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1909

cmdutil: add a kludge to make bytes repr() the same on 2 and 3
ClosedPublic

Authored by durin42 on Jan 18 2018, 1:17 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG1bee7762fd46: cmdutil: add a kludge to make bytes repr() the same on 2 and 3
rHG00466a8b4d13: cmdutil: add a kludge to make bytes repr() the same on 2 and 3
Summary

This fixes the output formatting problems I see in debugobsolete. I
still am seeing some effectflag differences, which we'll need to
tackle separately.

I'm not in love with this approach. There might be something better we
could do, and I'd love it if someone else wanted to take a run at
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

durin42 created this revision.Jan 18 2018, 1:17 PM
yuja accepted this revision.Jan 19 2018, 8:34 AM
yuja added a subscriber: yuja.

This looks ugly, but seems okay. Since sysstr() decodes bytes as latin-1,
8-bit characters will be escaped by \x, not by \u.

This revision is now accepted and ready to land.Jan 19 2018, 8:34 AM
durin42 updated this revision to Diff 4954.Jan 19 2018, 3:12 PM
yuja added a comment.Jan 27 2018, 4:37 AM

I'm thinking of adding a couple of utility functions as this sort of hack
is unavoidable around the codebase:

  • pycompat.maybebytestr(x)
  • make repr(bytestr) return repr(bytes)[1:]
  • pycompat.rapply(f, xs) to recursively apply f = maybebytestr to dict/list items
Closed by commit rHG00466a8b4d13: cmdutil: add a kludge to make bytes repr() the same on 2 and 3 (authored by durin42). · Explain WhyFeb 1 2018, 6:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (16 lines)

Diff 5130

mercurial/cmdutil.py

spec = _lookuplogtemplate(ui, opts.get('template'), opts.get('style')) spec = _lookuplogtemplate(ui, opts.get('template'), opts.get('style'))
if not spec.ref and not spec.tmpl and not spec.mapfile: if not spec.ref and not spec.tmpl and not spec.mapfile:
return changeset_printer(ui, repo, match, opts, buffered) return changeset_printer(ui, repo, match, opts, buffered)
return changeset_templater(ui, repo, spec, match, opts, buffered) return changeset_templater(ui, repo, spec, match, opts, buffered)
class _regrettablereprbytes(bytes):
"""Bytes subclass that makes the repr the same on Python 3 as Python 2.
This is a huge hack.
"""
def __repr__(self):
return repr(pycompat.sysstr(self))
def _maybebytestr(v):
if pycompat.ispy3 and isinstance(v, bytes):
return _regrettablereprbytes(v)
return v
def showmarker(fm, marker, index=None): def showmarker(fm, marker, index=None):
"""utility function to display obsolescence marker in a readable way """utility function to display obsolescence marker in a readable way
To be used by debug function.""" To be used by debug function."""
if index is not None: if index is not None:
fm.write('index', '%i ', index) fm.write('index', '%i ', index)
fm.write('prednode', '%s ', hex(marker.prednode())) fm.write('prednode', '%s ', hex(marker.prednode()))
succs = marker.succnodes() succs = marker.succnodes()
fm.condwrite(succs, 'succnodes', '%s ', fm.condwrite(succs, 'succnodes', '%s ',
fm.formatlist(map(hex, succs), name='node')) fm.formatlist(map(hex, succs), name='node'))
fm.write('flag', '%X ', marker.flags()) fm.write('flag', '%X ', marker.flags())
parents = marker.parentnodes() parents = marker.parentnodes()
if parents is not None: if parents is not None:
fm.write('parentnodes', '{%s} ', fm.write('parentnodes', '{%s} ',
fm.formatlist(map(hex, parents), name='node', sep=', ')) fm.formatlist(map(hex, parents), name='node', sep=', '))
fm.write('date', '(%s) ', fm.formatdate(marker.date())) fm.write('date', '(%s) ', fm.formatdate(marker.date()))
meta = marker.metadata().copy() meta = marker.metadata().copy()
meta.pop('date', None) meta.pop('date', None)
fm.write('metadata', '{%s}', fm.formatdict(meta, fmt='%r: %r', sep=', ')) smeta = {_maybebytestr(k): _maybebytestr(v) for k, v in meta.iteritems()}
fm.write('metadata', '{%s}', fm.formatdict(smeta, fmt='%r: %r', sep=', '))
fm.plain('\n') fm.plain('\n')
def finddate(ui, repo, date): def finddate(ui, repo, date):
"""Find the tipmost changeset that matches the given date spec""" """Find the tipmost changeset that matches the given date spec"""
df = util.matchdate(date) df = util.matchdate(date)
m = scmutil.matchall(repo) m = scmutil.matchall(repo)
results = {} results = {}