# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2018-07-20 16:53:54
# Node ID f3d394ea17db5986a402b1ee1bbe36e62b43da5d
# Parent  f738c502e43b8009421d1b003693eeb237f5ad18

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

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.

Differential Revision: https://phab.mercurial-scm.org/D4018

diff --git a/mercurial/cext/revlog.c b/mercurial/cext/revlog.c
--- a/mercurial/cext/revlog.c
+++ b/mercurial/cext/revlog.c
@@ -158,6 +158,11 @@ static PyObject *index_get(indexObject *
 	Py_ssize_t length = index_length(self);
 	PyObject *entry;
 
+	if (pos == -1 || pos == length - 1) {
+		Py_INCREF(nullentry);
+		return nullentry;
+	}
+
 	if (pos < 0)
 		pos += length;
 
@@ -166,11 +171,6 @@ static PyObject *index_get(indexObject *
 		return NULL;
 	}
 
-	if (pos == length - 1) {
-		Py_INCREF(nullentry);
-		return nullentry;
-	}
-
 	if (pos >= self->length - 1) {
 		PyObject *obj;
 		obj = PyList_GET_ITEM(self->added, pos - self->length + 1);
diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py
+++ b/mercurial/pure/parsers.py
@@ -55,9 +55,9 @@ class BaseIndexObject(object):
         return i
 
     def __getitem__(self, i):
+        if i == -1 or i == len(self) - 1:
+            return (0, 0, 0, -1, -1, -1, -1, nullid)
         i = self._fix_index(i)
-        if i == len(self) - 1:
-            return (0, 0, 0, -1, -1, -1, -1, nullid)
         if i >= self._lgt:
             return self._extra[i - self._lgt]
         index = self._calculate_index(i)