changeset 33031:f66be4caeaab

py3: use "%d" % val for int rather than pycompat.bytestr Earlier I used pycompat.bytestr() to convert integers to bytes, but we can do b"%d" % val to convert that int to bytes. b'' is already added by the transformer. Thanks to Yuya for suggesting this.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 22 Jun 2017 01:29:07 +0530
parents 80a5d237a4ae
children 4e6dc34b5d7a
files mercurial/commands.py mercurial/templatekw.py
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Jun 23 10:59:05 2017 -0700
+++ b/mercurial/commands.py	Thu Jun 22 01:29:07 2017 +0530
@@ -2774,8 +2774,7 @@
                   ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
             if num:
                 output.append("%s%s" %
-                  ('+'.join([pycompat.bytestr(p.rev()) for p in parents]),
-                                                                    changed))
+                  ('+'.join(["%d" % p.rev() for p in parents]), changed))
         else:
             if default or id:
                 output = [hexfunc(ctx.node())]
--- a/mercurial/templatekw.py	Fri Jun 23 10:59:05 2017 -0700
+++ b/mercurial/templatekw.py	Thu Jun 22 01:29:07 2017 +0530
@@ -623,7 +623,7 @@
     ctx = args['ctx']
     pctxs = scmutil.meaningfulparents(repo, ctx)
     # ifcontains() needs a list of str
-    prevs = [pycompat.bytestr(p.rev()) for p in pctxs]
+    prevs = ["%d" % p.rev() for p in pctxs]
     parents = [[('rev', p.rev()),
                 ('node', p.hex()),
                 ('phase', p.phasestr())]
@@ -653,7 +653,7 @@
     args = pycompat.byteskwargs(args)
     repo = args['ctx'].repo()
     # ifcontains() needs a list of str
-    revs = [pycompat.bytestr(r) for r in revs]
+    revs = ["%d" % r for r in revs]
     f = _showlist(name, revs, args)
     return _hybrid(f, revs,
                    lambda x: {name: x, 'ctx': repo[int(x)], 'revcache': {}},