Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use '%d' for integers instead of '%s'
authorPulkit Goyal <7895pulkit@gmail.com>
Mon, 02 Oct 2017 04:48:06 +0530
changeset 34506 1d804c22c671
parent 34505 91250ff7d48a
child 34507 30ae924a9e00
py3: use '%d' for integers instead of '%s' Differential Revision: https://phab.mercurial-scm.org/D973
mercurial/filemerge.py file | annotate | diff | comparison | revisions
mercurial/mdiff.py file | annotate | diff | comparison | revisions 
--- 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')
Mercurial