This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4163

shortest: don't include nullid in disambigution revset
ClosedPublic

Authored by martinvonz on Aug 9 2018, 3:27 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4c4825db29e1: shortest: don't include nullid in disambigution revset
Summary

As noted by Yuya in the review of D4118, the fact that the nodetree
always contains the nullid is not what we want for the disambiguation
case. It's not what the pure version of the code does.

Note that the updated test also passes before this patch, but it
wouldn't have passed in native-code mode once we start using the
nodetree for disambiguating nodeid prefixes.

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 (9 lines)
Mtests/test-revisions.t (6 lines)

Diff 10336

mercurial/cext/revlog.c

self->depth = 0; self->depth = 0;
self->splits = 0; self->splits = 0;
self->nodes = calloc(self->capacity, sizeof(nodetreenode)); self->nodes = calloc(self->capacity, sizeof(nodetreenode));
if (self->nodes == NULL) { if (self->nodes == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
return -1; return -1;
} }
self->length = 1; self->length = 1;
if (nt_insert(self, nullid, -1) == -1) {
free(self->nodes);
return -1;
}
return 0; return 0;
} }
static int nt_partialmatch(nodetree *self, const char *node, static int nt_partialmatch(nodetree *self, const char *node,
Py_ssize_t nodelen) Py_ssize_t nodelen)
{ {
return nt_find(self, node, nodelen, 1); return nt_find(self, node, nodelen, 1);
} }
return -1; return -1;
} }
unsigned capacity = (self->raw_length < 4 ? 4 : (int)self->raw_length / 2); unsigned capacity = (self->raw_length < 4 ? 4 : (int)self->raw_length / 2);
if (nt_init(self->nt, self, capacity) == -1) { if (nt_init(self->nt, self, capacity) == -1) {
PyMem_Free(self->nt); PyMem_Free(self->nt);
self->nt = NULL; self->nt = NULL;
return -1; return -1;
} }
if (nt_insert(self->nt, nullid, -1) == -1) {
PyMem_Free(self->nt);
self->nt = NULL;
return -1;
}
self->ntrev = (int)index_length(self); self->ntrev = (int)index_length(self);
self->ntlookups = 1; self->ntlookups = 1;
self->ntmisses = 0; self->ntmisses = 0;
} }
return 0; return 0;
} }
/* /*

tests/test-revisions.t

$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo 0 > a $ echo 0 > a
$ hg ci -qAm 0 $ hg ci -qAm 0
$ for i in 5 8 14 43; do $ for i in 5 8 14 43 167; do
> hg up -q 0 > hg up -q 0
> echo $i > a > echo $i > a
> hg ci -qm $i > hg ci -qm $i
> done > done
$ cat <<EOF >> .hg/hgrc $ cat <<EOF >> .hg/hgrc
> [alias] > [alias]
> l = log -T '{rev}:{shortest(node,1)}\n' > l = log -T '{rev}:{shortest(node,1)}\n'
> EOF > EOF
$ hg l $ hg l
5:00f
4:7ba5d 4:7ba5d
3:7ba57 3:7ba57
2:72 2:72
1:9 1:9
0:b 0:b
$ cat <<EOF >> .hg/hgrc $ cat <<EOF >> .hg/hgrc
> [experimental] > [experimental]
> revisions.disambiguatewithin=:3 > revisions.disambiguatewithin=not 4
> EOF > EOF
$ hg l $ hg l
5:0
4:7ba5d 4:7ba5d
3:7b 3:7b
2:72 2:72
1:9 1:9
0:b 0:b
9 was unambiguous and still is 9 was unambiguous and still is
$ hg l -r 9 $ hg l -r 9
1:9 1:9