This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5300

py3: replace str() with pycompat.bytestr() or ('%d' % int)
ClosedPublic

Authored by pulkit on Nov 23 2018, 2:35 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG001f27970b60: py3: replace str() with pycompat.bytestr() or ('%d' % int)
Summary

After this patch, test-fastannotate-diffopts.t is about to pass. There are some
extra newlines in the output.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Nov 23 2018, 2:35 PM
yuja added a subscriber: yuja.Nov 23 2018, 10:20 PM
  • revenc = lambda x: wrev if x is None else str(x) + wrevpad
  • csetenc = lambda x: wnode if x is None else str(x) + ' '

+ revenc = lambda x: wrev if x is None else ('%d' % x) + wrevpad
+ csetenc = lambda x: wnode if x is None else pycompat.bytestr(x) + ' '

check-code complains that the line is too long. Maybe rewrite as a function?

pulkit added a comment.Nov 26 2018, 6:46 AM
In D5300#78881, @yuja wrote:
  • revenc = lambda x: wrev if x is None else str(x) + wrevpad
  • csetenc = lambda x: wnode if x is None else str(x) + ' '

+ revenc = lambda x: wrev if x is None else ('%d' % x) + wrevpad
+ csetenc = lambda x: wnode if x is None else pycompat.bytestr(x) + ' '

check-code complains that the line is too long. Maybe rewrite as a function?

Ah, looks like I forgot to run tests. Sorry about that.

pulkit updated this revision to Diff 12594.Nov 26 2018, 6:46 AM
Closed by commit rHG001f27970b60: py3: replace str() with pycompat.bytestr() or ('%d' % int) (authored by pulkit). · Explain WhyNov 26 2018, 6:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fastannotate/formatter.py (15 lines)

Diff 12594

hgext/fastannotate/formatter.py

getctx = util.cachefunc(lambda x: repo[x[0]]) getctx = util.cachefunc(lambda x: repo[x[0]])
hexfunc = self._hexfunc hexfunc = self._hexfunc
# special handling working copy "changeset" and "rev" functions # special handling working copy "changeset" and "rev" functions
if self.opts.get('rev') == 'wdir()': if self.opts.get('rev') == 'wdir()':
orig = hexfunc orig = hexfunc
hexfunc = lambda x: None if x is None else orig(x) hexfunc = lambda x: None if x is None else orig(x)
wnode = hexfunc(repo[None].p1().node()) + '+' wnode = hexfunc(repo[None].p1().node()) + '+'
wrev = str(repo[None].p1().rev()) wrev = '%d' % repo[None].p1().rev()
wrevpad = '' wrevpad = ''
if not opts.get('changeset'): # only show + if changeset is hidden if not opts.get('changeset'): # only show + if changeset is hidden
wrev += '+' wrev += '+'
wrevpad = ' ' wrevpad = ' '
revenc = lambda x: wrev if x is None else str(x) + wrevpad revenc = lambda x: wrev if x is None else ('%d' % x) + wrevpad
csetenc = lambda x: wnode if x is None else str(x) + ' ' def csetenc(x):
if x is None:
return wnode
return pycompat.bytestr(x) + ' '
else: else:
revenc = csetenc = str revenc = csetenc = pycompat.bytestr
# opt name, separator, raw value (for json/plain), encoder (for plain) # opt name, separator, raw value (for json/plain), encoder (for plain)
opmap = [('user', ' ', lambda x: getctx(x).user(), ui.shortuser), opmap = [('user', ' ', lambda x: getctx(x).user(), ui.shortuser),
('number', ' ', lambda x: getctx(x).rev(), revenc), ('number', ' ', lambda x: getctx(x).rev(), revenc),
('changeset', ' ', lambda x: hexfunc(x[0]), csetenc), ('changeset', ' ', lambda x: hexfunc(x[0]), csetenc),
('date', ' ', lambda x: getctx(x).date(), datefunc), ('date', ' ', lambda x: getctx(x).date(), datefunc),
('file', ' ', lambda x: x[2], str), ('file', ' ', lambda x: x[2], pycompat.bytestr),
('line_number', ':', lambda x: x[1] + 1, str)] ('line_number', ':', lambda x: x[1] + 1, pycompat.bytestr)]
fieldnamemap = {'number': 'rev', 'changeset': 'node'} fieldnamemap = {'number': 'rev', 'changeset': 'node'}
funcmap = [(get, sep, fieldnamemap.get(op, op), enc) funcmap = [(get, sep, fieldnamemap.get(op, op), enc)
for op, sep, get, enc in opmap for op, sep, get, enc in opmap
if opts.get(op)] if opts.get(op)]
# no separator for first column # no separator for first column
funcmap[0] = list(funcmap[0]) funcmap[0] = list(funcmap[0])
funcmap[0][1] = '' funcmap[0][1] = ''
self.funcmap = funcmap self.funcmap = funcmap