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

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2664

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

Authored by pulkit on Mar 4 2018, 2:40 PM.

Details

Reviewers
indygreg
yuja
Group Reviewers
hg-reviewers
Commits
rHG981f328d6d16: py3: use b"%d" instead of str() to convert integers to bytes
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Mar 4 2018, 2:40 PM
pulkit updated this revision to Diff 6601.Mar 4 2018, 2:47 PM
yuja accepted this revision.Mar 4 2018, 3:16 PM
This revision is now accepted and ready to land.Mar 4 2018, 3:16 PM
Closed by commit rHG981f328d6d16: py3: use b"%d" instead of str() to convert integers to bytes (authored by pulkit). · Explain WhyMar 4 2018, 3:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (2 lines)
Mmercurial/revlog.py (2 lines)

Diff 6605

mercurial/context.py

self._repo = repo self._repo = repo
try: try:
if isinstance(changeid, int): if isinstance(changeid, int):
self._node = repo.changelog.node(changeid) self._node = repo.changelog.node(changeid)
self._rev = changeid self._rev = changeid
return return
if not pycompat.ispy3 and isinstance(changeid, long): if not pycompat.ispy3 and isinstance(changeid, long):
changeid = str(changeid) changeid = "%d" % changeid
if changeid == 'null': if changeid == 'null':
self._node = nullid self._node = nullid
self._rev = nullrev self._rev = nullrev
return return
if changeid == 'tip': if changeid == 'tip':
self._node = repo.changelog.tip() self._node = repo.changelog.tip()
self._rev = repo.changelog.rev(self._node) self._rev = repo.changelog.rev(self._node)
return return

mercurial/revlog.py

node = id node = id
self.rev(node) # quick search the index self.rev(node) # quick search the index
return node return node
except LookupError: except LookupError:
pass # may be partial hex id pass # may be partial hex id
try: try:
# str(rev) # str(rev)
rev = int(id) rev = int(id)
if str(rev) != id: if "%d" % rev != id:
raise ValueError raise ValueError
if rev < 0: if rev < 0:
rev = len(self) + rev rev = len(self) + rev
if rev < 0 or rev >= len(self): if rev < 0 or rev >= len(self):
raise ValueError raise ValueError
return self.node(rev) return self.node(rev)
except (ValueError, OverflowError): except (ValueError, OverflowError):
pass pass