( )⚙ D4111 index: pass only nodetree to nt_new()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4111

index: pass only nodetree to nt_new()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGfff675dfb80b: index: pass only nodetree to nt_new()
Summary

The function now only depends on the nodetree, not the index.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 5 2018, 3:58 AM
yuja added a subscriber: yuja.Aug 6 2018, 9:10 AM

Queued up to this, thanks. Can you rebase D4113:?

Closed by commit rHGfff675dfb80b: index: pass only nodetree to nt_new() (authored by martinvonz). · Explain WhyAug 6 2018, 9:13 AM
This revision was automatically updated to reflect the committed changes.
martinvonz added a comment.Aug 6 2018, 9:25 AM
In D4111#63861, @yuja wrote:

Queued up to this, thanks. Can you rebase D4113:?

Done.

Revision Contents
Changeset List

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

Diff 9914

mercurial/cext/revlog.c

if (v == 0) if (v == 0)
return -2; return -2;
off = v; off = v;
} }
/* multiple matches against an ambiguous prefix */ /* multiple matches against an ambiguous prefix */
return -4; return -4;
} }
static int nt_new(indexObject *self) static int nt_new(nodetree *self)
{ {
nodetree *nt = self->nt; if (self->length == self->capacity) {
if (nt->length == nt->capacity) { if (self->capacity >= INT_MAX / (sizeof(nodetreenode) * 2)) {
if (nt->capacity >= INT_MAX / (sizeof(nodetreenode) * 2)) {
PyErr_SetString(PyExc_MemoryError, PyErr_SetString(PyExc_MemoryError,
"overflow in nt_new"); "overflow in nt_new");
return -1; return -1;
} }
nt->capacity *= 2; self->capacity *= 2;
nt->nodes = realloc(nt->nodes, self->nodes = realloc(self->nodes,
nt->capacity * sizeof(nodetreenode)); self->capacity * sizeof(nodetreenode));
if (nt->nodes == NULL) { if (self->nodes == NULL) {
PyErr_SetString(PyExc_MemoryError, "out of memory"); PyErr_SetString(PyExc_MemoryError, "out of memory");
return -1; return -1;
} }
memset(&nt->nodes[nt->length], 0, memset(&self->nodes[self->length], 0,
sizeof(nodetreenode) * (nt->capacity - nt->length)); sizeof(nodetreenode) * (self->capacity - self->length));
} }
return nt->length++; return self->length++;
} }
static int nt_insert(indexObject *self, const char *node, int rev) static int nt_insert(indexObject *self, const char *node, int rev)
{ {
int level = 0; int level = 0;
int off = 0; int off = 0;
while (level < 40) { while (level < 40) {
int noff; int noff;
if (oldnode == NULL) if (oldnode == NULL)
return -1; return -1;
if (!memcmp(oldnode, node, 20)) { if (!memcmp(oldnode, node, 20)) {
n->children[k] = -rev - 2; n->children[k] = -rev - 2;
return 0; return 0;
} }
noff = nt_new(self); noff = nt_new(self->nt);
if (noff == -1) if (noff == -1)
return -1; return -1;
/* self->nt->nodes may have been changed by realloc */ /* self->nt->nodes may have been changed by realloc */
self->nt->nodes[off].children[k] = noff; self->nt->nodes[off].children[k] = noff;
off = noff; off = noff;
n = &self->nt->nodes[off]; n = &self->nt->nodes[off];
n->children[nt_level(oldnode, ++level)] = v; n->children[nt_level(oldnode, ++level)] = v;
if (level > self->nt->depth) if (level > self->nt->depth)