This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4107

index: make "nt_*" functions work on an initialized nodetree
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2aa4f06c1e91: index: make "nt_*" functions work on an initialized nodetree
Summary

I want to be able to reuse these functions with another nodetree
instance later (for disambiguating node prefix within a revset). That
other nodetree instance won't want to be fully populated from the
index, so this commit moves that part to the callers.

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
Closed by commit rHG2aa4f06c1e91: index: make "nt_*" functions work on an initialized nodetree (authored by martinvonz). · Explain WhyAug 6 2018, 9:13 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 9971

mercurial/cext/revlog.c

self->ntrev = -1; self->ntrev = -1;
} }
return 0; return 0;
} }
static int nt_partialmatch(indexObject *self, const char *node, static int nt_partialmatch(indexObject *self, const char *node,
Py_ssize_t nodelen) Py_ssize_t nodelen)
{ {
if (nt_init(self) == -1)
return -3;
if (nt_populate(self) == -1)
return -3;
return nt_find(self, node, nodelen, 1); return nt_find(self, node, nodelen, 1);
} }
/* /*
* Find the length of the shortest unique prefix of node. * Find the length of the shortest unique prefix of node.
* *
* Return values: * Return values:
* *
* -3: error (exception set) * -3: error (exception set)
* -2: not found (no exception set) * -2: not found (no exception set)
* rest: length of shortest prefix * rest: length of shortest prefix
*/ */
static int nt_shortest(indexObject *self, const char *node) static int nt_shortest(indexObject *self, const char *node)
{ {
int level, off; int level, off;
if (nt_init(self) == -1)
return -3;
if (nt_populate(self) == -1)
return -3;
for (level = off = 0; level < 40; level++) { for (level = off = 0; level < 40; level++) {
int k, v; int k, v;
nodetree *n = &self->nt[off]; nodetree *n = &self->nt[off];
k = nt_level(node, level); k = nt_level(node, level);
v = n->children[k]; v = n->children[k];
if (v < 0) { if (v < 0) {
const char *n; const char *n;
v = -(v + 2); v = -(v + 2);
for (i = 0; i < nodelen; i++) for (i = 0; i < nodelen; i++)
hexdigit(node, i); hexdigit(node, i);
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 (nt_init(self) == -1)
return NULL;
if (nt_populate(self) == -1)
return NULL;
rev = nt_partialmatch(self, node, nodelen); rev = nt_partialmatch(self, node, nodelen);
switch (rev) { switch (rev) {
case -4: case -4:
raise_revlog_error(); raise_revlog_error();
case -3:
return NULL; return NULL;
case -2: case -2:
Py_RETURN_NONE; Py_RETURN_NONE;
case -1: case -1:
return PyBytes_FromStringAndSize(nullid, 20); return PyBytes_FromStringAndSize(nullid, 20);
} }
fullnode = index_node_existing(self, rev); fullnode = index_node_existing(self, rev);
int length; int length;
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 (nt_init(self) == -1)
return NULL;
if (nt_populate(self) == -1)
return NULL;
length = nt_shortest(self, node); length = nt_shortest(self, 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;
} }
return PyInt_FromLong(length); return PyInt_FromLong(length);