This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4018

index: handle index[-1] as nullid more explicitly
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf3d394ea17db: index: handle index[-1] as nullid more explicitly
Summary

I find it more intuitive to check if "pos == -1" than to first add the
index length (which includes one extra item for the nullid) and
compare that to "length - 1". However, because test-parseindex2.py
compares the whole index (up to len(index)-1), we need to also
preserve that other check for a little while more. I'll remove it
soon.

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 9777.Aug 2 2018, 12:40 AM
Closed by commit rHGf3d394ea17db: index: handle index[-1] as nullid more explicitly (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 (10 lines)
Mmercurial/pure/parsers.py (4 lines)

Diff 9718

mercurial/cext/revlog.c

{ {
uint64_t offset_flags; uint64_t offset_flags;
int comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2; int comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2;
const char *c_node_id; const char *c_node_id;
const char *data; const char *data;
Py_ssize_t length = index_length(self); Py_ssize_t length = index_length(self);
PyObject *entry; PyObject *entry;
if (pos == -1 || pos == length - 1) {
Py_INCREF(nullentry);
return nullentry;
}
if (pos < 0) if (pos < 0)
pos += length; 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 == length - 1) {
Py_INCREF(nullentry);
return nullentry;
}
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);
Py_INCREF(obj); Py_INCREF(obj);
return obj; return obj;
} }
if (self->cache) { if (self->cache) {

mercurial/pure/parsers.py

raise TypeError("expecting int indexes") raise TypeError("expecting int indexes")
if i < 0: if i < 0:
i = len(self) + i 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):
i = self._fix_index(i) if i == -1 or i == len(self) - 1:
if 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)
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)
type = gettype(e[0]) type = gettype(e[0])
e[0] = offset_type(0, type) e[0] = offset_type(0, type)