Mercurial > hg
changeset 34506:1d804c22c671
py3: use '%d' for integers instead of '%s'
Differential Revision: https://phab.mercurial-scm.org/D973
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 02 Oct 2017 04:48:06 +0530 |
| parents | 91250ff7d48a |
| children | 30ae924a9e00 |
| files | mercurial/filemerge.py mercurial/mdiff.py |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Mon Oct 02 04:46:17 2017 +0530 +++ b/mercurial/filemerge.py Mon Oct 02 04:48:06 2017 +0530 @@ -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)
--- a/mercurial/mdiff.py Mon Oct 02 04:46:17 2017 +0530 +++ b/mercurial/mdiff.py Mon Oct 02 04:48:06 2017 +0530 @@ -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')