changeset 4758:f0ecf2137824

py3: use "%d" for formatting integers
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 11 Jul 2019 16:00:25 -0700
parents c01c9b9d3713
children f30c1fab7155
files hgext3rd/evolve/cmdrewrite.py hgext3rd/evolve/obscache.py hgext3rd/serverminitopic.py hgext3rd/topic/topicmap.py
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py	Fri Jul 12 08:17:25 2019 -0700
+++ b/hgext3rd/evolve/cmdrewrite.py	Thu Jul 11 16:00:25 2019 -0700
@@ -783,7 +783,7 @@
                 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 @@
             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()]
--- a/hgext3rd/evolve/obscache.py	Fri Jul 12 08:17:25 2019 -0700
+++ b/hgext3rd/evolve/obscache.py	Thu Jul 11 16:00:25 2019 -0700
@@ -186,7 +186,7 @@
         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
--- a/hgext3rd/serverminitopic.py	Fri Jul 12 08:17:25 2019 -0700
+++ b/hgext3rd/serverminitopic.py	Thu Jul 11 16:00:25 2019 -0700
@@ -120,7 +120,7 @@
     if revs:
         s = hashlib.sha1()
         for rev in revs:
-            s.update('%s;' % rev)
+            s.update('%d;' % rev)
         key = s.digest()
     return key
 
--- a/hgext3rd/topic/topicmap.py	Fri Jul 12 08:17:25 2019 -0700
+++ b/hgext3rd/topic/topicmap.py	Thu Jul 11 16:00:25 2019 -0700
@@ -80,7 +80,7 @@
     if revs:
         s = hashlib.sha1()
         for rev in revs:
-            s.update('%s;' % rev)
+            s.update('%d;' % rev)
         key = s.digest()
     return key