Read about our upcoming Code of Conduct on this issue

Commit 1eee5938 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

py3: use "%d" for formatting integers

parent c01c9b9d3713
......@@ -783,7 +783,7 @@ def fold(ui, repo, *revs, **opts):
commitopts['edit'] = False
else:
msgs = ["HG: This is a fold of %d changesets." % len(allctx)]
msgs += ["HG: Commit message of changeset %s.\n\n%s\n" %
msgs += ["HG: Commit message of changeset %d.\n\n%s\n" %
(c.rev(), c.description()) for c in allctx]
commitopts['message'] = "\n".join(msgs)
commitopts['edit'] = True
......@@ -904,7 +904,7 @@ def metaedit(ui, repo, *revs, **opts):
else:
if opts['fold']:
msgs = ["HG: This is a fold of %d changesets." % len(allctx)]
msgs += ["HG: Commit message of changeset %s.\n\n%s\n" %
msgs += ["HG: Commit message of changeset %d.\n\n%s\n" %
(c.rev(), c.description()) for c in allctx]
else:
msgs = [head.description()]
......
......@@ -186,7 +186,7 @@ class dualsourcecache(object):
obsmarkers = list(obsmarkers)
self._updatefrom(repo, revs, obsmarkers)
duration = util.timer() - starttime
repo.ui.log('evoext-cache', 'updated %s in %.4f seconds (%sr, %so)\n',
repo.ui.log('evoext-cache', 'updated %s in %.4f seconds (%dr, %do)\n',
self._cachename, duration, len(revs), len(obsmarkers))
# update the key from the new data
......
......@@ -120,7 +120,7 @@ def _phaseshash(repo, maxrev):
if revs:
s = hashlib.sha1()
for rev in revs:
s.update('%s;' % rev)
s.update('%d;' % rev)
key = s.digest()
return key
......
......@@ -80,7 +80,7 @@ def _phaseshash(repo, maxrev):
if revs:
s = hashlib.sha1()
for rev in revs:
s.update('%s;' % rev)
s.update('%d;' % rev)
key = s.digest()
return key
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment