This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2658

webutil: some %d instead of %s love on ints
ClosedPublic

Authored by durin42 on Mar 4 2018, 1:12 PM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa2fa51415ddc: webutil: some %d instead of %s love on ints
Summary

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.Mar 4 2018, 1:12 PM
pulkit accepted this revision.Mar 4 2018, 1:22 PM
indygreg accepted this revision.Mar 4 2018, 2:12 PM
This revision is now accepted and ready to land.Mar 4 2018, 2:12 PM
Closed by commit rHGa2fa51415ddc: webutil: some %d instead of %s love on ints (authored by durin42). · Explain WhyMar 4 2018, 2:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/webutil.py (10 lines)

Diff 6586

mercurial/hgweb/webutil.py

if lines: if lines:
yield tmpl('diffblock', parity=next(parity), blockno=blockno, yield tmpl('diffblock', parity=next(parity), blockno=blockno,
lines=prettyprintlines(lines, blockno)) lines=prettyprintlines(lines, blockno))
def compare(tmpl, context, leftlines, rightlines): def compare(tmpl, context, leftlines, rightlines):
'''Generator function that provides side-by-side comparison data.''' '''Generator function that provides side-by-side comparison data.'''
def compline(type, leftlineno, leftline, rightlineno, rightline): def compline(type, leftlineno, leftline, rightlineno, rightline):
lineid = leftlineno and ("l%s" % leftlineno) or '' lineid = leftlineno and ("l%d" % leftlineno) or ''
lineid += rightlineno and ("r%s" % rightlineno) or '' lineid += rightlineno and ("r%d" % rightlineno) or ''
llno = '%d' % leftlineno if leftlineno else ''
rlno = '%d' % rightlineno if rightlineno else ''
return tmpl('comparisonline', return tmpl('comparisonline',
type=type, type=type,
lineid=lineid, lineid=lineid,
leftlineno=leftlineno, leftlineno=leftlineno,
leftlinenumber="% 6s" % (leftlineno or ''), leftlinenumber="% 6s" % llno,
leftline=leftline or '', leftline=leftline or '',
rightlineno=rightlineno, rightlineno=rightlineno,
rightlinenumber="% 6s" % (rightlineno or ''), rightlinenumber="% 6s" % rlno,
rightline=rightline or '') rightline=rightline or '')
def getblock(opcodes): def getblock(opcodes):
for type, llo, lhi, rlo, rhi in opcodes: for type, llo, lhi, rlo, rhi in opcodes:
len1 = lhi - llo len1 = lhi - llo
len2 = rhi - rlo len2 = rhi - rlo
count = min(len1, len2) count = min(len1, len2)
for i in xrange(count): for i in xrange(count):