D4004: index: create function for deleting node from nodetree
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Aug 1 16:44:02 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION 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).
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D4004
AFFECTED FILES
mercurial/cext/revlog.c
CHANGE DETAILS
diff --git a/mercurial/cext/revlog.c b/mercurial/cext/revlog.c
--- a/mercurial/cext/revlog.c
+++ b/mercurial/cext/revlog.c
@@ -1095,6 +1095,12 @@
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)
{
if (self->nt == NULL) {
@@ -1795,7 +1801,7 @@
PyObject *tuple = PyList_GET_ITEM(self->added, i);
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)
@@ -1854,7 +1860,7 @@
if (node == NULL)
return -1;
- nt_insert(self, node, -1);
+ nt_delete_node(self, node);
}
if (self->added)
nt_invalidate_added(self, 0);
@@ -1907,7 +1913,7 @@
return -1;
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);
if (rev > INT_MAX || rev < 0) {
if (!PyErr_Occurred())
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list