# HG changeset patch # User Martin von Zweigbergk # Date 2018-07-20 21:36:42 # Node ID a3dacabd476b6bed04932b08962d7aa2fd2fad41 # Parent 781b2720d2ac005e2806b46d8cb91abacfe4b901 index: don't allow index[len(index)] to mean nullid Now everything else has been cleaned up and we can drop support for getting the nullid from the end of the index (from *past* the end actually, since we reduced the length in the previous patch). Differential Revision: https://phab.mercurial-scm.org/D4023 diff --git a/mercurial/cext/revlog.c b/mercurial/cext/revlog.c --- a/mercurial/cext/revlog.c +++ b/mercurial/cext/revlog.c @@ -158,12 +158,12 @@ static PyObject *index_get(indexObject * Py_ssize_t length = index_length(self) + 1; PyObject *entry; - if (pos == -1 || pos == length - 1) { + if (pos == -1) { Py_INCREF(nullentry); return nullentry; } - if (pos < 0 || pos >= length) { + if (pos < 0 || pos >= length - 1) { PyErr_SetString(PyExc_IndexError, "revlog index out of range"); return NULL; } diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -792,7 +792,7 @@ indexformatv0_unpack = indexformatv0.unp class revlogoldindex(list): def __getitem__(self, i): - if i == -1 or i == len(self): + if i == -1: return (0, 0, 0, -1, -1, -1, -1, nullid) return list.__getitem__(self, i) diff --git a/tests/test-parseindex2.py b/tests/test-parseindex2.py --- a/tests/test-parseindex2.py +++ b/tests/test-parseindex2.py @@ -61,9 +61,6 @@ def py_parseindex(data, inline) : e[0] = offset_type(0, type) index[0] = tuple(e) - # add the magic null revision at -1 - index.append((0, 0, 0, -1, -1, -1, -1, nullid)) - return index, cache data_inlined = (