This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4019

index: drop support for negative indexes into the index
ClosedPublic

Authored by martinvonz on Aug 1 2018, 2:47 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc0d411ea6639: index: drop support for negative indexes into the index
Summary

I want index[i] to work for any valid revnum including -1 (as it
already does), and I also want len(index) to be the number of
revisions in the index (not counting the null revision), so it cannot
also support negative revision numbers other than -1 for nullid.

I didn't bother removing support for it from revlog v0.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 1 2018, 2:47 PM
martinvonz updated this revision to Diff 9778.Aug 2 2018, 12:40 AM
Closed by commit rHGc0d411ea6639: index: drop support for negative indexes into the index (authored by martinvonz). · Explain WhyAug 4 2018, 12:06 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/revlog.c (3 lines)
Mmercurial/pure/parsers.py (2 lines)

Diff 9719

mercurial/cext/revlog.c

Py_ssize_t length = index_length(self); Py_ssize_t length = index_length(self);
PyObject *entry; PyObject *entry;
if (pos == -1 || pos == length - 1) { if (pos == -1 || pos == length - 1) {
Py_INCREF(nullentry); Py_INCREF(nullentry);
return nullentry; return nullentry;
} }
if (pos < 0)
pos += length;
if (pos < 0 || pos >= length) { if (pos < 0 || pos >= length) {
PyErr_SetString(PyExc_IndexError, "revlog index out of range"); PyErr_SetString(PyExc_IndexError, "revlog index out of range");
return NULL; return NULL;
} }
if (pos >= self->length - 1) { if (pos >= self->length - 1) {
PyObject *obj; PyObject *obj;
obj = PyList_GET_ITEM(self->added, pos - self->length + 1); obj = PyList_GET_ITEM(self->added, pos - self->length + 1);

mercurial/pure/parsers.py

def insert(self, i, tup): def insert(self, i, tup):
assert i == -1 assert i == -1
self._extra.append(tup) self._extra.append(tup)
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:
i = len(self) + i
if i < 0 or i >= len(self): if i < 0 or i >= len(self):
raise IndexError raise IndexError
return i return i
def __getitem__(self, i): def __getitem__(self, i):
if i == -1 or i == len(self) - 1: if i == -1 or i == len(self) - 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)