This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4106

index: don't add 1 to length variables
ClosedPublic

Authored by martinvonz on Aug 5 2018, 2:33 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG0db50770f388: index: don't add 1 to length variables
Summary

A lot of "+ 1" and "-1" were mechanically added to ease the transition
in 781b2720d2ac (index: don't include nullid in len(),
2018-07-20). Let's clean it up now.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Aug 5 2018, 2:33 AM
Closed by commit rHG0db50770f388: index: don't add 1 to length variables (authored by martinvonz). · Explain WhyAug 5 2018, 9:04 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/revlog.c (18 lines)

Diff 9930

mercurial/cext/revlog.c

* 32 bytes: nodeid (only 20 bytes used) * 32 bytes: nodeid (only 20 bytes used)
*/ */
static PyObject *index_get(indexObject *self, Py_ssize_t pos) static PyObject *index_get(indexObject *self, Py_ssize_t pos)
{ {
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) + 1; Py_ssize_t length = index_length(self);
PyObject *entry; PyObject *entry;
if (pos == -1) { if (pos == -1) {
Py_INCREF(nullentry); Py_INCREF(nullentry);
return nullentry; return nullentry;
} }
if (pos < 0 || pos >= length - 1) { 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);
Py_INCREF(obj); Py_INCREF(obj);
return entry; return entry;
} }
/* /*
* Return the 20-byte SHA of the node corresponding to the given rev. * Return the 20-byte SHA of the node corresponding to the given rev.
*/ */
static const char *index_node(indexObject *self, Py_ssize_t pos) static const char *index_node(indexObject *self, Py_ssize_t pos)
{ {
Py_ssize_t length = index_length(self) + 1; Py_ssize_t length = index_length(self);
const char *data; const char *data;
if (pos == -1) if (pos == -1)
return nullid; return nullid;
if (pos >= length - 1) if (pos >= length)
return NULL; return NULL;
if (pos >= self->length - 1) { if (pos >= self->length - 1) {
PyObject *tuple, *str; PyObject *tuple, *str;
tuple = PyList_GET_ITEM(self->added, pos - self->length + 1); tuple = PyList_GET_ITEM(self->added, pos - self->length + 1);
str = PyTuple_GetItem(tuple, 7); str = PyTuple_GetItem(tuple, 7);
return str ? PyBytes_AS_STRING(str) : NULL; return str ? PyBytes_AS_STRING(str) : NULL;
} }
if (!PyTuple_Check(obj) || PyTuple_GET_SIZE(obj) != 8) { if (!PyTuple_Check(obj) || PyTuple_GET_SIZE(obj) != 8) {
PyErr_SetString(PyExc_TypeError, "8-tuple required"); PyErr_SetString(PyExc_TypeError, "8-tuple required");
return NULL; return NULL;
} }
if (node_check(PyTuple_GET_ITEM(obj, 7), &node) == -1) if (node_check(PyTuple_GET_ITEM(obj, 7), &node) == -1)
return NULL; return NULL;
len = index_length(self) + 1; len = index_length(self);
if (self->added == NULL) { if (self->added == NULL) {
self->added = PyList_New(0); self->added = PyList_New(0);
if (self->added == NULL) if (self->added == NULL)
return NULL; return NULL;
} }
if (PyList_Append(self->added, obj) == -1) if (PyList_Append(self->added, obj) == -1)
return NULL; return NULL;
if (self->nt) if (self->nt)
nt_insert(self, node, len - 1); nt_insert(self, node, len);
Py_CLEAR(self->headrevs); Py_CLEAR(self->headrevs);
Py_RETURN_NONE; Py_RETURN_NONE;
} }
static void _index_clearcaches(indexObject *self) static void _index_clearcaches(indexObject *self)
{ {
if (self->cache) { if (self->cache) {
static PyObject *index_deltachain(indexObject *self, PyObject *args) static PyObject *index_deltachain(indexObject *self, PyObject *args)
{ {
int rev, generaldelta; int rev, generaldelta;
PyObject *stoparg; PyObject *stoparg;
int stoprev, iterrev, baserev = -1; int stoprev, iterrev, baserev = -1;
int stopped; int stopped;
PyObject *chain = NULL, *result = NULL; PyObject *chain = NULL, *result = NULL;
const Py_ssize_t length = index_length(self) + 1; const Py_ssize_t length = index_length(self);
if (!PyArg_ParseTuple(args, "iOi", &rev, &stoparg, &generaldelta)) { if (!PyArg_ParseTuple(args, "iOi", &rev, &stoparg, &generaldelta)) {
return NULL; return NULL;
} }
if (PyInt_Check(stoparg)) { if (PyInt_Check(stoparg)) {
stoprev = (int)PyInt_AsLong(stoparg); stoprev = (int)PyInt_AsLong(stoparg);
if (stoprev == -1 && PyErr_Occurred()) { if (stoprev == -1 && PyErr_Occurred()) {
return NULL; return NULL;
} }
} }
else if (stoparg == Py_None) { else if (stoparg == Py_None) {
stoprev = -2; stoprev = -2;
} }
else { else {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"stoprev must be integer or None"); "stoprev must be integer or None");
return NULL; return NULL;
} }
if (rev < 0 || rev >= length - 1) { if (rev < 0 || rev >= length) {
PyErr_SetString(PyExc_ValueError, "revlog index out of range"); PyErr_SetString(PyExc_ValueError, "revlog index out of range");
return NULL; return NULL;
} }
chain = PyList_New(0); chain = PyList_New(0);
if (chain == NULL) { if (chain == NULL) {
return NULL; return NULL;
} }
else { else {
iterrev--; iterrev--;
} }
if (iterrev < 0) { if (iterrev < 0) {
break; break;
} }
if (iterrev >= length - 1) { if (iterrev >= length) {
PyErr_SetString(PyExc_IndexError, "revision outside index"); PyErr_SetString(PyExc_IndexError, "revision outside index");
return NULL; return NULL;
} }
baserev = index_baserev(self, iterrev); baserev = index_baserev(self, iterrev);
/* This should never happen. */ /* This should never happen. */
if (baserev <= -2) { if (baserev <= -2) {