D973: py3: use '%d' for integers instead of '%s'
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Fri Oct 6 00:20:21 UTC 2017
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D973
AFFECTED FILES
mercurial/filemerge.py
mercurial/mdiff.py
CHANGE DETAILS
diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py
--- a/mercurial/mdiff.py
+++ b/mercurial/mdiff.py
@@ -457,7 +457,7 @@
# TODO: deltas
ret = []
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)):
ret.append(fmtline(l))
ret.append('\n')
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -515,7 +515,7 @@
(tool, fcd.path()))
repo.ui.debug('launching merge tool: %s\n' % cmd)
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
finally:
util.unlink(b)
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list