( )⚙ D973 py3: use '%d' for integers instead of '%s'

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D973

py3: use '%d' for integers instead of '%s'
ClosedPublic

Authored by pulkit on Oct 5 2017, 8:20 PM.

Details

Reviewers
lothiraldan
Group Reviewers
hg-reviewers
Commits
rHG1d804c22c671: py3: use '%d' for integers instead of '%s'
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Oct 5 2017, 8:20 PM
lothiraldan accepted this revision.Oct 6 2017, 2:21 AM
Closed by commit rHG1d804c22c671: py3: use '%d' for integers instead of '%s' (authored by pulkit). · Explain WhyOct 7 2017, 9:20 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (2 lines)
Mmercurial/mdiff.py (2 lines)

Diff 2496

mercurial/filemerge.py

args = util.interpolate(r'\$', replace, args, args = util.interpolate(r'\$', replace, args,
lambda s: util.shellquote(util.localpath(s))) lambda s: util.shellquote(util.localpath(s)))
cmd = toolpath + ' ' + args cmd = toolpath + ' ' + args
if _toolbool(ui, tool, "gui"): if _toolbool(ui, tool, "gui"):
repo.ui.status(_('running merge tool %s for file %s\n') % repo.ui.status(_('running merge tool %s for file %s\n') %
(tool, fcd.path())) (tool, fcd.path()))
repo.ui.debug('launching merge tool: %s\n' % cmd) repo.ui.debug('launching merge tool: %s\n' % cmd)
r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool') r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool')
repo.ui.debug('merge tool returned: %s\n' % r) repo.ui.debug('merge tool returned: %d\n' % r)
return True, r, False return True, r, False
finally: finally:
util.unlink(b) util.unlink(b)
util.unlink(c) util.unlink(c)
def _formatconflictmarker(repo, ctx, template, label, pad): def _formatconflictmarker(repo, ctx, template, label, pad):
"""Applies the given template to the ctx, prefixed by the label. """Applies the given template to the ctx, prefixed by the label.

mercurial/mdiff.py

tn = '' tn = ''
if to == tn: if to == tn:
return '' return ''
# TODO: deltas # TODO: deltas
ret = [] ret = []
ret.append('GIT binary patch\n') ret.append('GIT binary patch\n')
ret.append('literal %s\n' % len(tn)) ret.append('literal %d\n' % len(tn))
for l in chunk(zlib.compress(tn)): for l in chunk(zlib.compress(tn)):
ret.append(fmtline(l)) ret.append(fmtline(l))
ret.append('\n') ret.append('\n')
return ''.join(ret) return ''.join(ret)
def patchtext(bin): def patchtext(bin):
pos = 0 pos = 0