Patchwork D2664: py3: use b"%d" instead of str() to convert integers to bytes

login
register
mail settings
Submitter phabricator
Date March 4, 2018, 8:19 p.m.
Message ID <f461af3478bb02e4153b47791c5b4b0b@localhost.localdomain>
Download mbox | patch
Permalink /patch/28985/
State Not Applicable
Headers show

Comments

phabricator - March 4, 2018, 8:19 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG981f328d6d16: py3: use b&quot;%d&quot; instead of str() to convert integers to bytes (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2664?vs=6601&id=6605

REVISION DETAIL
  https://phab.mercurial-scm.org/D2664

AFFECTED FILES
  mercurial/context.py
  mercurial/revlog.py

CHANGE DETAILS




To: pulkit, #hg-reviewers, indygreg, yuja
Cc: mercurial-devel

Patch

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -1367,7 +1367,7 @@ 
         try:
             # str(rev)
             rev = int(id)
-            if str(rev) != id:
+            if "%d" % rev != id:
                 raise ValueError
             if rev < 0:
                 rev = len(self) + rev
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -433,7 +433,7 @@ 
                 self._rev = changeid
                 return
             if not pycompat.ispy3 and isinstance(changeid, long):
-                changeid = str(changeid)
+                changeid = "%d" % changeid
             if changeid == 'null':
                 self._node = nullid
                 self._rev = nullrev