Mercurial > hg
view hgext/fastannotate/formatter.py @ 41017:d7d3164e6a31 stable
phabricator: properly encode boolean types in the request body
I tripped over this playing with `hg debugcallconduit` to query for valid
reviewers. If the JSON on stdin is written as 'True' or 'False', python
complains it isn't valid JSON. If it's written as 'true' or 'false', it made it
to the server, but got kicked back with this:
abort: Conduit Error (ERR-CONDUIT-CORE): Error while reading "isBot":
Expected boolean (true or false), got something else.
The test isn't really relevant here (the code can be reverted, and it will
pass), but this gives us coverage for the debug command.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 21 Dec 2018 17:36:12 -0500 |
parents | 7e3ce2131882 |
children | 001f27970b60 |
line wrap: on
line source
# Copyright 2016-present Facebook. All Rights Reserved. # # format: defines the format used to output annotate result # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import absolute_import from mercurial import ( encoding, node, pycompat, templatefilters, util, ) from mercurial.utils import ( dateutil, ) # imitating mercurial.commands.annotate, not using the vanilla formatter since # the data structures are a bit different, and we have some fast paths. class defaultformatter(object): """the default formatter that does leftpad and support some common flags""" def __init__(self, ui, repo, opts): self.ui = ui self.opts = opts if ui.quiet: datefunc = dateutil.shortdate else: datefunc = dateutil.datestr datefunc = util.cachefunc(datefunc) getctx = util.cachefunc(lambda x: repo[x[0]]) hexfunc = self._hexfunc # special handling working copy "changeset" and "rev" functions if self.opts.get('rev') == 'wdir()': orig = hexfunc hexfunc = lambda x: None if x is None else orig(x) wnode = hexfunc(repo[None].p1().node()) + '+' wrev = str(repo[None].p1().rev()) wrevpad = '' if not opts.get('changeset'): # only show + if changeset is hidden wrev += '+' wrevpad = ' ' revenc = lambda x: wrev if x is None else str(x) + wrevpad csetenc = lambda x: wnode if x is None else str(x) + ' ' else: revenc = csetenc = str # opt name, separator, raw value (for json/plain), encoder (for plain) opmap = [('user', ' ', lambda x: getctx(x).user(), ui.shortuser), ('number', ' ', lambda x: getctx(x).rev(), revenc), ('changeset', ' ', lambda x: hexfunc(x[0]), csetenc), ('date', ' ', lambda x: getctx(x).date(), datefunc), ('file', ' ', lambda x: x[2], str), ('line_number', ':', lambda x: x[1] + 1, str)] fieldnamemap = {'number': 'rev', 'changeset': 'node'} funcmap = [(get, sep, fieldnamemap.get(op, op), enc) for op, sep, get, enc in opmap if opts.get(op)] # no separator for first column funcmap[0] = list(funcmap[0]) funcmap[0][1] = '' self.funcmap = funcmap def write(self, annotatedresult, lines=None, existinglines=None): """(annotateresult, [str], set([rev, linenum])) -> None. write output. annotateresult can be [(node, linenum, path)], or [(node, linenum)] """ pieces = [] # [[str]] maxwidths = [] # [int] # calculate padding for f, sep, name, enc in self.funcmap: l = [enc(f(x)) for x in annotatedresult] pieces.append(l) if name in ['node', 'date']: # node and date has fixed size l = l[:1] widths = pycompat.maplist(encoding.colwidth, set(l)) maxwidth = (max(widths) if widths else 0) maxwidths.append(maxwidth) # buffered output result = '' for i in pycompat.xrange(len(annotatedresult)): for j, p in enumerate(pieces): sep = self.funcmap[j][1] padding = ' ' * (maxwidths[j] - len(p[i])) result += sep + padding + p[i] if lines: if existinglines is None: result += ': ' + lines[i] else: # extra formatting showing whether a line exists key = (annotatedresult[i][0], annotatedresult[i][1]) if key in existinglines: result += ': ' + lines[i] else: result += ': ' + self.ui.label('-' + lines[i], 'diff.deleted') if result[-1] != '\n': result += '\n' self.ui.write(result) @util.propertycache def _hexfunc(self): if self.ui.debugflag or self.opts.get('long_hash'): return node.hex else: return node.short def end(self): pass class jsonformatter(defaultformatter): def __init__(self, ui, repo, opts): super(jsonformatter, self).__init__(ui, repo, opts) self.ui.write('[') self.needcomma = False def write(self, annotatedresult, lines=None, existinglines=None): if annotatedresult: self._writecomma() pieces = [(name, map(f, annotatedresult)) for f, sep, name, enc in self.funcmap] if lines is not None: pieces.append(('line', lines)) pieces.sort() seps = [','] * len(pieces[:-1]) + [''] result = '' lasti = len(annotatedresult) - 1 for i in pycompat.xrange(len(annotatedresult)): result += '\n {\n' for j, p in enumerate(pieces): k, vs = p result += (' "%s": %s%s\n' % (k, templatefilters.json(vs[i], paranoid=False), seps[j])) result += ' }%s' % ('' if i == lasti else ',') if lasti >= 0: self.needcomma = True self.ui.write(result) def _writecomma(self): if self.needcomma: self.ui.write(',') self.needcomma = False @util.propertycache def _hexfunc(self): return node.hex def end(self): self.ui.write('\n]\n')