This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4115

index: rename "nt_*(indexObject *self,...)" functions to "index_*"
ClosedPublic

Authored by martinvonz on Aug 5 2018, 3:58 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3e74c01102af: index: rename "nt_*(indexObject *self,...)" functions to "index_*"
Summary

These functions do something with the nodetree, but they're less
generic and won't make sense as methods on the nodetree when it
becomes a Python type.

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, 3:58 AM
martinvonz updated this revision to Diff 9980.Aug 6 2018, 9:24 AM
martinvonz updated this revision to Diff 10039.Aug 7 2018, 2:27 AM
Closed by commit rHG3e74c01102af: index: rename "nt_*(indexObject *self,...)" functions to "index_*" (authored by martinvonz). · Explain WhyAug 7 2018, 9:12 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 10053

mercurial/cext/revlog.c

if (rev == -2) if (rev == -2)
raise_revlog_error(); raise_revlog_error();
return NULL; return NULL;
} }
/* /*
* Fully populate the radix tree. * Fully populate the radix tree.
*/ */
static int nt_populate(indexObject *self) { static int index_populate_nt(indexObject *self) {
int rev; int rev;
if (self->ntrev > 0) { if (self->ntrev > 0) {
for (rev = self->ntrev - 1; rev >= 0; rev--) { for (rev = self->ntrev - 1; rev >= 0; rev--) {
const char *n = index_node_existing(self, rev); const char *n = index_node_existing(self, rev);
if (n == NULL) if (n == NULL)
return -1; return -1;
if (nt_insert(self->nt, n, rev) == -1) if (nt_insert(self->nt, n, rev) == -1)
return -1; return -1;
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
/* input contains non-hex characters */ /* input contains non-hex characters */
PyErr_Clear(); PyErr_Clear();
Py_RETURN_NONE; Py_RETURN_NONE;
} }
if (index_init_nt(self) == -1) if (index_init_nt(self) == -1)
return NULL; return NULL;
if (nt_populate(self) == -1) if (index_populate_nt(self) == -1)
return NULL; return NULL;
rev = nt_partialmatch(self->nt, node, nodelen); rev = nt_partialmatch(self->nt, node, nodelen);
switch (rev) { switch (rev) {
case -4: case -4:
raise_revlog_error(); raise_revlog_error();
return NULL; return NULL;
case -2: case -2:
if (!PyArg_ParseTuple(args, "O", &val)) if (!PyArg_ParseTuple(args, "O", &val))
return NULL; return NULL;
if (node_check(val, &node) == -1) if (node_check(val, &node) == -1)
return NULL; return NULL;
self->ntlookups++; self->ntlookups++;
if (index_init_nt(self) == -1) if (index_init_nt(self) == -1)
return NULL; return NULL;
if (nt_populate(self) == -1) if (index_populate_nt(self) == -1)
return NULL; return NULL;
length = nt_shortest(self->nt, node); length = nt_shortest(self->nt, node);
if (length == -3) if (length == -3)
return NULL; return NULL;
if (length == -2) { if (length == -2) {
raise_revlog_error(); raise_revlog_error();
return NULL; return NULL;
} }
ret = find_deepest(self, gca); ret = find_deepest(self, gca);
Py_DECREF(gca); Py_DECREF(gca);
return ret; return ret;
} }
/* /*
* Invalidate any trie entries introduced by added revs. * Invalidate any trie entries introduced by added revs.
*/ */
static void nt_invalidate_added(indexObject *self, Py_ssize_t start) static void index_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_delete_node(self->nt, PyBytes_AS_STRING(node)); nt_delete_node(self->nt, PyBytes_AS_STRING(node));
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_delete_node(self->nt, node); nt_delete_node(self->nt, node);
} }
if (self->added) if (self->added)
nt_invalidate_added(self, 0); index_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 (self->cache) { if (self->cache) {
Py_ssize_t i; Py_ssize_t i;
for (i = start; i < self->raw_length; i++) for (i = start; i < self->raw_length; i++)
Py_CLEAR(self->cache[i]); Py_CLEAR(self->cache[i]);
} }
self->raw_length = start; self->raw_length = start;
} }
goto done; goto done;
} }
if (self->nt) { if (self->nt) {
nt_invalidate_added(self, start - self->length + 1); index_invalidate_added(self, start - self->length + 1);
if (self->ntrev > start) if (self->ntrev > start)
self->ntrev = (int)start; self->ntrev = (int)start;
} }
if (self->added) if (self->added)
ret = PyList_SetSlice(self->added, start - self->length + 1, ret = PyList_SetSlice(self->added, start - self->length + 1,
PyList_GET_SIZE(self->added), NULL); PyList_GET_SIZE(self->added), NULL);
done: done:
Py_CLEAR(self->headrevs); Py_CLEAR(self->headrevs);