This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4004

index: create function for deleting node from nodetree
ClosedPublic

Authored by martinvonz on Aug 1 2018, 12:43 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf9fc59ea3135: index: create function for deleting node from nodetree
Summary

A node is marked deleted by nt_insert(self, node, -1), but "-1" could
mean so many things (notably nullrev), so let's hide it in a
function. The function could possibly also remove nodes from the tree
in the future (it currently only marks them deleted).

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.

Revision Contents
Changeset List

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

Diff 9879

mercurial/cext/revlog.c

level += 1; level += 1;
off = v; off = v;
} }
} }
return -1; return -1;
} }
static int nt_delete_node(indexObject *self, const char *node)
{
/* rev==-1 happens to get encoded as 0, which is interpreted as not set */
return nt_insert(self, node, -1);
}
static int nt_init(indexObject *self) static int nt_init(indexObject *self)
{ {
if (self->nt == NULL) { if (self->nt == NULL) {
if ((size_t)self->raw_length > INT_MAX / sizeof(nodetree)) { if ((size_t)self->raw_length > INT_MAX / sizeof(nodetree)) {
PyErr_SetString(PyExc_ValueError, "overflow in nt_init"); PyErr_SetString(PyExc_ValueError, "overflow in nt_init");
return -1; return -1;
} }
self->ntcapacity = self->raw_length < 4 self->ntcapacity = self->raw_length < 4
static void nt_invalidate_added(indexObject *self, Py_ssize_t start) static void nt_invalidate_added(indexObject *self, Py_ssize_t start)
{ {
Py_ssize_t i, len = PyList_GET_SIZE(self->added); Py_ssize_t i, len = PyList_GET_SIZE(self->added);
for (i = start; i < len; i++) { for (i = start; i < len; i++) {
PyObject *tuple = PyList_GET_ITEM(self->added, i); PyObject *tuple = PyList_GET_ITEM(self->added, i);
PyObject *node = PyTuple_GET_ITEM(tuple, 7); PyObject *node = PyTuple_GET_ITEM(tuple, 7);
nt_insert(self, PyBytes_AS_STRING(node), -1); nt_delete_node(self, PyBytes_AS_STRING(node));
} }
if (start == 0) if (start == 0)
Py_CLEAR(self->added); Py_CLEAR(self->added);
} }
/* /*
* Delete a numeric range of revs, which must be at the end of the * Delete a numeric range of revs, which must be at the end of the
if (self->nt) { if (self->nt) {
Py_ssize_t i; Py_ssize_t i;
for (i = start + 1; i < self->length - 1; i++) { for (i = start + 1; i < self->length - 1; i++) {
const char *node = index_node_existing(self, i); const char *node = index_node_existing(self, i);
if (node == NULL) if (node == NULL)
return -1; return -1;
nt_insert(self, node, -1); nt_delete_node(self, node);
} }
if (self->added) if (self->added)
nt_invalidate_added(self, 0); nt_invalidate_added(self, 0);
if (self->ntrev > start) if (self->ntrev > start)
self->ntrev = (int)start; self->ntrev = (int)start;
} }
self->length = start + 1; self->length = start + 1;
if (start < self->raw_length) { if (start < self->raw_length) {
if (PySlice_Check(item) && value == NULL) if (PySlice_Check(item) && value == NULL)
return index_slice_del(self, item); return index_slice_del(self, item);
if (node_check(item, &node) == -1) if (node_check(item, &node) == -1)
return -1; return -1;
if (value == NULL) if (value == NULL)
return self->nt ? nt_insert(self, node, -1) : 0; return self->nt ? nt_delete_node(self, node) : 0;
rev = PyInt_AsLong(value); rev = PyInt_AsLong(value);
if (rev > INT_MAX || rev < 0) { if (rev > INT_MAX || rev < 0) {
if (!PyErr_Occurred()) if (!PyErr_Occurred())
PyErr_SetString(PyExc_ValueError, "rev out of range"); PyErr_SetString(PyExc_ValueError, "rev out of range");
return -1; return -1;
} }
if (nt_init(self) == -1) if (nt_init(self) == -1)