This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4241

pure: don't allow index[len(index)] to mean nullid
AbandonedPublic

Authored by durin42 on Aug 9 2018, 11:50 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Summary

This should have been part of a3dacabd476b (index: don't allow
index[len(index)] to mean nullid, 2018-07-20). Thanks to Augie for
making me run the pure version of test-parseindex2.py. Interestingly,
I think I ran that test on the parent commit (and that's why I updated
the pure version in that commit), but then I seem to quickly have
forgotten about the pure code :(

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 9 2018, 11:50 PM
durin42 added a reviewer: martinvonz.Aug 15 2018, 11:03 PM
durin42 commandeered this revision.
durin42 abandoned this revision.

My identical patch was landed from D4183.

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/parsers.py (2 lines)

Diff 10271

mercurial/pure/parsers.py

def _fix_index(self, i): def _fix_index(self, i):
if not isinstance(i, int): if not isinstance(i, int):
raise TypeError("expecting int indexes") raise TypeError("expecting int indexes")
if i < 0 or i >= len(self) + 1: if i < 0 or i >= len(self) + 1:
raise IndexError raise IndexError
return i return i
def __getitem__(self, i): def __getitem__(self, i):
if i == -1 or i == len(self): if i == -1:
return (0, 0, 0, -1, -1, -1, -1, nullid) return (0, 0, 0, -1, -1, -1, -1, nullid)
i = self._fix_index(i) i = self._fix_index(i)
if i >= self._lgt: if i >= self._lgt:
return self._extra[i - self._lgt] return self._extra[i - self._lgt]
index = self._calculate_index(i) index = self._calculate_index(i)
r = struct.unpack(indexformatng, self._data[index:index + indexsize]) r = struct.unpack(indexformatng, self._data[index:index + indexsize])
if i == 0: if i == 0:
e = list(r) e = list(r)