facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Differential Revision: https://phab.mercurial-scm.org/D973
This commit is contained in:
Pulkit Goyal 2017-10-02 04:48:06 +05:30
parent 8cf2ab1237
commit fbd5da487b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/filemerge.py
View File

@ -515,7 +515,7 @@ def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
(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)

2
mercurial/mdiff.py
View File

@ -457,7 +457,7 @@ def b85diff(to, tn):
# 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')