This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3614

py3: check for None before comparing with integers
ClosedPublic

Authored by pulkit on May 19 2018, 10:41 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa4942675de6b: py3: check for None before comparing with integers
Summary

Comparing None and integers on Python 3 is not allowed and raise error.

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.May 19 2018, 10:41 AM
Closed by commit rHGa4942675de6b: py3: check for None before comparing with integers (authored by pulkit). · Explain WhyMay 19 2018, 3:40 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.May 21 2018, 9:11 AM
  • a/mercurial/revlog.py

+++ b/mercurial/revlog.py
@@ -846,7 +846,7 @@

def rawsize(self, rev):
    """return the length of the uncompressed text for a given revision"""
    l = self.index[rev][2]
  • if l >= 0:

+ if l is not None and l >= 0:

Ugh, rawsize could be None? It smells like a bug.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (2 lines)

Diff 8819

mercurial/revlog.py

return self.index[rev][0] & 0xFFFF return self.index[rev][0] & 0xFFFF
def length(self, rev): def length(self, rev):
return self.index[rev][1] return self.index[rev][1]
def rawsize(self, rev): def rawsize(self, rev):
"""return the length of the uncompressed text for a given revision""" """return the length of the uncompressed text for a given revision"""
l = self.index[rev][2] l = self.index[rev][2]
if l >= 0: if l is not None and l >= 0:
return l return l
t = self.revision(rev, raw=True) t = self.revision(rev, raw=True)
return len(t) return len(t)
def size(self, rev): def size(self, rev):
"""length of non-raw text (processed by a "read" flag processor)""" """length of non-raw text (processed by a "read" flag processor)"""
# fast path: if no "read" flag processor could change the content, # fast path: if no "read" flag processor could change the content,