mercurial-scm/hg-stable: mercurial/parsers.c annotate

annotate mercurial/parsers.c @ 21807:a96a3d1261c6

parsers: remove no longer used dirstate_unset

author	Siddharth Agarwal <sid0@fb.com>
date	Tue, 27 May 2014 15:22:23 -0700
parents	05bd2667df4d
children	e250b8300e6e

rev	line source
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1 /*
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2 parsers.c - efficient content parsing
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	3
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	4 Copyright 2008 Matt Mackall <mpm@selenic.com> and others
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	5
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	6 This software may be used and distributed according to the terms of
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	7 the GNU General Public License, incorporated herein by reference.
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	8 */
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	9
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	10 #include <Python.h>
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	11 #include <ctype.h>
17356 511dfb34b412 parsers: fix an integer size warning issued by clang Bryan O'Sullivan <bryano@fb.com> parents: 17353 diff changeset	12 #include <stddef.h>
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	13 #include <string.h>
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	14
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	15 #include "util.h"
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	16
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	17 static char *versionerrortext = "Python minor version mismatch";
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	18
19718 d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	19 static int8_t hextable[256] = {
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	20 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	21 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	22 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	23 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 0-9 */
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	24 -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* A-F */
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	25 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	26 -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* a-f */
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	27 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	28 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	29 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	30 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	31 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	32 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	33 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	34 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	35 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	36 };
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	37
16617 4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	38 static inline int hexdigit(const char *p, Py_ssize_t off)
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	39 {
19718 d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	40 int8_t val = hextable[(unsigned char)p[off]];
16617 4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	41
19718 d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	42 if (val >= 0) {
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	43 return val;
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	44 }
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	45
7092 fb3fc27617a2 parsers: speed up hex decoding for manifests Matt Mackall <mpm@selenic.com> parents: 7091 diff changeset	46 PyErr_SetString(PyExc_ValueError, "input contains non-hex character");
fb3fc27617a2 parsers: speed up hex decoding for manifests Matt Mackall <mpm@selenic.com> parents: 7091 diff changeset	47 return 0;
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	48 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	49
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	50 /*
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	51 * Turn a hex-encoded string into binary.
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	52 */
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	53 static PyObject unhexlify(const char str, int len)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	54 {
7092 fb3fc27617a2 parsers: speed up hex decoding for manifests Matt Mackall <mpm@selenic.com> parents: 7091 diff changeset	55 PyObject *ret;
6395 3f0294536b24 fix const annotation warning Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6389 diff changeset	56 char *d;
16617 4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	57 int i;
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	58
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	59 ret = PyBytes_FromStringAndSize(NULL, len / 2);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	60
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	61 if (!ret)
7092 fb3fc27617a2 parsers: speed up hex decoding for manifests Matt Mackall <mpm@selenic.com> parents: 7091 diff changeset	62 return NULL;
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	63
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	64 d = PyBytes_AsString(ret);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	65
16617 4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	66 for (i = 0; i < len;) {
4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	67 int hi = hexdigit(str, i++);
4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	68 int lo = hexdigit(str, i++);
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	69 *d++ = (hi << 4) \| lo;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	70 }
7091 12b35ae03365 parsers: clean up whitespace Matt Mackall <mpm@selenic.com> parents: 6395 diff changeset	71
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	72 return ret;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	73 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	74
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	75 /*
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	76 * This code assumes that a manifest is stitched together with newline
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	77 * ('\n') characters.
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	78 */
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	79 static PyObject parse_manifest(PyObject self, PyObject *args)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	80 {
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	81 PyObject mfdict, fdict;
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	82 char str, start, *end;
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	83 int len;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	84
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	85 if (!PyArg_ParseTuple(args, "O!O!s#:parse_manifest",
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	86 &PyDict_Type, &mfdict,
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	87 &PyDict_Type, &fdict,
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	88 &str, &len))
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	89 goto quit;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	90
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	91 start = str;
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	92 end = str + len;
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	93 while (start < end) {
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	94 PyObject file = NULL, node = NULL;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	95 PyObject *flags = NULL;
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	96 char zero = NULL, newline = NULL;
17356 511dfb34b412 parsers: fix an integer size warning issued by clang Bryan O'Sullivan <bryano@fb.com> parents: 17353 diff changeset	97 ptrdiff_t nlen;
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	98
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	99 zero = memchr(start, '\0', end - start);
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	100 if (!zero) {
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	101 PyErr_SetString(PyExc_ValueError,
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	102 "manifest entry has no separator");
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	103 goto quit;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	104 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	105
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	106 newline = memchr(zero + 1, '\n', end - (zero + 1));
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	107 if (!newline) {
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	108 PyErr_SetString(PyExc_ValueError,
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	109 "manifest contains trailing garbage");
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	110 goto quit;
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	111 }
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	112
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	113 file = PyBytes_FromStringAndSize(start, zero - start);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	114
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	115 if (!file)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	116 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	117
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	118 nlen = newline - zero - 1;
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	119
17356 511dfb34b412 parsers: fix an integer size warning issued by clang Bryan O'Sullivan <bryano@fb.com> parents: 17353 diff changeset	120 node = unhexlify(zero + 1, nlen > 40 ? 40 : (int)nlen);
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	121 if (!node)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	122 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	123
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	124 if (nlen > 40) {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	125 flags = PyBytes_FromStringAndSize(zero + 41,
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	126 nlen - 40);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	127 if (!flags)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	128 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	129
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	130 if (PyDict_SetItem(fdict, file, flags) == -1)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	131 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	132 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	133
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	134 if (PyDict_SetItem(mfdict, file, node) == -1)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	135 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	136
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	137 start = newline + 1;
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	138
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	139 Py_XDECREF(flags);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	140 Py_XDECREF(node);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	141 Py_XDECREF(file);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	142 continue;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	143 bail:
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	144 Py_XDECREF(flags);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	145 Py_XDECREF(node);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	146 Py_XDECREF(file);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	147 goto quit;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	148 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	149
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	150 Py_INCREF(Py_None);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	151 return Py_None;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	152 quit:
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	153 return NULL;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	154 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	155
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	156 static PyObject parse_dirstate(PyObject self, PyObject *args)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	157 {
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	158 PyObject dmap, cmap, parents = NULL, ret = NULL;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	159 PyObject fname = NULL, cname = NULL, *entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	160 char state, cur, str, *cpos;
19725 5e25d71a58cc parsers: state is a char, not an int Bryan O'Sullivan <bryano@fb.com> parents: 19718 diff changeset	161 int mode, size, mtime;
7174 4da87407b845 parsers.c: fix integer overflows Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7168 diff changeset	162 unsigned int flen;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	163 int len, pos = 40;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	164
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	165 if (!PyArg_ParseTuple(args, "O!O!s#:parse_dirstate",
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	166 &PyDict_Type, &dmap,
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	167 &PyDict_Type, &cmap,
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	168 &str, &len))
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	169 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	170
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	171 /* read parents */
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	172 if (len < 40)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	173 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	174
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	175 parents = Py_BuildValue("s#s#", str, 20, str + 20, 20);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	176 if (!parents)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	177 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	178
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	179 /* read filenames */
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	180 while (pos >= 40 && pos < len) {
09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	181 cur = str + pos;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	182 /* unpack header */
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	183 state = *cur;
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	184 mode = getbe32(cur + 1);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	185 size = getbe32(cur + 5);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	186 mtime = getbe32(cur + 9);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	187 flen = getbe32(cur + 13);
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	188 pos += 17;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	189 cur += 17;
20316 40f08c31844c parsers: fix 'unsigned expression is always true' warning (issue4142) David Soria Parra <davidsp@fb.com> parents: 20169 diff changeset	190 if (flen > len - pos) {
7174 4da87407b845 parsers.c: fix integer overflows Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7168 diff changeset	191 PyErr_SetString(PyExc_ValueError, "overflow in dirstate");
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	192 goto quit;
7174 4da87407b845 parsers.c: fix integer overflows Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7168 diff changeset	193 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	194
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	195 entry = Py_BuildValue("ciii", state, mode, size, mtime);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	196 if (!entry)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	197 goto quit;
7175 5d8626b2c1db parsers.c: do not try to untrack after a failure Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7174 diff changeset	198 PyObject_GC_UnTrack(entry); /* don't waste time with this */
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	199
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	200 cpos = memchr(cur, 0, flen);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	201 if (cpos) {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	202 fname = PyBytes_FromStringAndSize(cur, cpos - cur);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	203 cname = PyBytes_FromStringAndSize(cpos + 1,
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	204 flen - (cpos - cur) - 1);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	205 if (!fname \|\| !cname \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	206 PyDict_SetItem(cmap, fname, cname) == -1 \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	207 PyDict_SetItem(dmap, fname, entry) == -1)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	208 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	209 Py_DECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	210 } else {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	211 fname = PyBytes_FromStringAndSize(cur, flen);
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	212 if (!fname \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	213 PyDict_SetItem(dmap, fname, entry) == -1)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	214 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	215 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	216 Py_DECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	217 Py_DECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	218 fname = cname = entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	219 pos += flen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	220 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	221
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	222 ret = parents;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	223 Py_INCREF(ret);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	224 quit:
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	225 Py_XDECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	226 Py_XDECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	227 Py_XDECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	228 Py_XDECREF(parents);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	229 return ret;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	230 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	231
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	232 static inline int getintat(PyObject tuple, int off, uint32_t v)
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	233 {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	234 PyObject *o = PyTuple_GET_ITEM(tuple, off);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	235 long val;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	236
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	237 if (PyInt_Check(o))
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	238 val = PyInt_AS_LONG(o);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	239 else if (PyLong_Check(o)) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	240 val = PyLong_AsLong(o);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	241 if (val == -1 && PyErr_Occurred())
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	242 return -1;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	243 } else {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	244 PyErr_SetString(PyExc_TypeError, "expected an int or long");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	245 return -1;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	246 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	247 if (LONG_MAX > INT_MAX && (val > INT_MAX \|\| val < INT_MIN)) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	248 PyErr_SetString(PyExc_OverflowError,
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	249 "Python value to large to convert to uint32_t");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	250 return -1;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	251 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	252 *v = (uint32_t)val;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	253 return 0;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	254 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	255
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	256 /*
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	257 * Efficiently pack a dirstate object into its on-disk format.
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	258 */
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	259 static PyObject pack_dirstate(PyObject self, PyObject *args)
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	260 {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	261 PyObject *packobj = NULL;
21806 05bd2667df4d pack_dirstate: in C version, for invalidation set dict to what we write to disk Siddharth Agarwal <sid0@fb.com> parents: 21730 diff changeset	262 PyObject map, copymap, pl, mtime_unset = NULL;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	263 Py_ssize_t nbytes, pos, l;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	264 PyObject k, v, *pn;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	265 char p, s;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	266 double now;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	267
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	268 if (!PyArg_ParseTuple(args, "O!O!Od:pack_dirstate",
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	269 &PyDict_Type, &map, &PyDict_Type, &copymap,
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	270 &pl, &now))
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	271 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	272
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	273 if (!PySequence_Check(pl) \|\| PySequence_Size(pl) != 2) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	274 PyErr_SetString(PyExc_TypeError, "expected 2-element sequence");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	275 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	276 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	277
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	278 /* Figure out how much we need to allocate. */
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	279 for (nbytes = 40, pos = 0; PyDict_Next(map, &pos, &k, &v);) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	280 PyObject *c;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	281 if (!PyString_Check(k)) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	282 PyErr_SetString(PyExc_TypeError, "expected string key");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	283 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	284 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	285 nbytes += PyString_GET_SIZE(k) + 17;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	286 c = PyDict_GetItem(copymap, k);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	287 if (c) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	288 if (!PyString_Check(c)) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	289 PyErr_SetString(PyExc_TypeError,
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	290 "expected string key");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	291 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	292 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	293 nbytes += PyString_GET_SIZE(c) + 1;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	294 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	295 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	296
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	297 packobj = PyString_FromStringAndSize(NULL, nbytes);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	298 if (packobj == NULL)
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	299 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	300
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	301 p = PyString_AS_STRING(packobj);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	302
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	303 pn = PySequence_ITEM(pl, 0);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	304 if (PyString_AsStringAndSize(pn, &s, &l) == -1 \|\| l != 20) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	305 PyErr_SetString(PyExc_TypeError, "expected a 20-byte hash");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	306 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	307 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	308 memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	309 p += 20;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	310 pn = PySequence_ITEM(pl, 1);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	311 if (PyString_AsStringAndSize(pn, &s, &l) == -1 \|\| l != 20) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	312 PyErr_SetString(PyExc_TypeError, "expected a 20-byte hash");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	313 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	314 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	315 memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	316 p += 20;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	317
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	318 for (pos = 0; PyDict_Next(map, &pos, &k, &v); ) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	319 uint32_t mode, size, mtime;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	320 Py_ssize_t len, l;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	321 PyObject *o;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	322 char s, t;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	323
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	324 if (!PyTuple_Check(v) \|\| PyTuple_GET_SIZE(v) != 4) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	325 PyErr_SetString(PyExc_TypeError, "expected a 4-tuple");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	326 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	327 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	328 o = PyTuple_GET_ITEM(v, 0);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	329 if (PyString_AsStringAndSize(o, &s, &l) == -1 \|\| l != 1) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	330 PyErr_SetString(PyExc_TypeError, "expected one byte");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	331 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	332 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	333 p++ = s;
17165 249cc4ec4327 parsers.c: remove warning: 'size' may be used uninitialized in this function Mads Kiilerich <mads@kiilerich.com> parents: 16955 diff changeset	334 if (getintat(v, 1, &mode) == -1)
249cc4ec4327 parsers.c: remove warning: 'size' may be used uninitialized in this function Mads Kiilerich <mads@kiilerich.com> parents: 16955 diff changeset	335 goto bail;
249cc4ec4327 parsers.c: remove warning: 'size' may be used uninitialized in this function Mads Kiilerich <mads@kiilerich.com> parents: 16955 diff changeset	336 if (getintat(v, 2, &size) == -1)
249cc4ec4327 parsers.c: remove warning: 'size' may be used uninitialized in this function Mads Kiilerich <mads@kiilerich.com> parents: 16955 diff changeset	337 goto bail;
249cc4ec4327 parsers.c: remove warning: 'size' may be used uninitialized in this function Mads Kiilerich <mads@kiilerich.com> parents: 16955 diff changeset	338 if (getintat(v, 3, &mtime) == -1)
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	339 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	340 if (*s == 'n' && mtime == (uint32_t)now) {
18567 194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 18504 diff changeset	341 /* See pure/parsers.py:pack_dirstate for why we do
194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 18504 diff changeset	342 * this. */
21806 05bd2667df4d pack_dirstate: in C version, for invalidation set dict to what we write to disk Siddharth Agarwal <sid0@fb.com> parents: 21730 diff changeset	343 mtime = -1;
05bd2667df4d pack_dirstate: in C version, for invalidation set dict to what we write to disk Siddharth Agarwal <sid0@fb.com> parents: 21730 diff changeset	344 mtime_unset = Py_BuildValue(
05bd2667df4d pack_dirstate: in C version, for invalidation set dict to what we write to disk Siddharth Agarwal <sid0@fb.com> parents: 21730 diff changeset	345 "ciii", *s, mode, size, mtime);
05bd2667df4d pack_dirstate: in C version, for invalidation set dict to what we write to disk Siddharth Agarwal <sid0@fb.com> parents: 21730 diff changeset	346 if (!mtime_unset)
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	347 goto bail;
21806 05bd2667df4d pack_dirstate: in C version, for invalidation set dict to what we write to disk Siddharth Agarwal <sid0@fb.com> parents: 21730 diff changeset	348 if (PyDict_SetItem(map, k, mtime_unset) == -1)
05bd2667df4d pack_dirstate: in C version, for invalidation set dict to what we write to disk Siddharth Agarwal <sid0@fb.com> parents: 21730 diff changeset	349 goto bail;
05bd2667df4d pack_dirstate: in C version, for invalidation set dict to what we write to disk Siddharth Agarwal <sid0@fb.com> parents: 21730 diff changeset	350 Py_DECREF(mtime_unset);
05bd2667df4d pack_dirstate: in C version, for invalidation set dict to what we write to disk Siddharth Agarwal <sid0@fb.com> parents: 21730 diff changeset	351 mtime_unset = NULL;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	352 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	353 putbe32(mode, p);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	354 putbe32(size, p + 4);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	355 putbe32(mtime, p + 8);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	356 t = p + 12;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	357 p += 16;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	358 len = PyString_GET_SIZE(k);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	359 memcpy(p, PyString_AS_STRING(k), len);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	360 p += len;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	361 o = PyDict_GetItem(copymap, k);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	362 if (o) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	363 *p++ = '\0';
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	364 l = PyString_GET_SIZE(o);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	365 memcpy(p, PyString_AS_STRING(o), l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	366 p += l;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	367 len += l + 1;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	368 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	369 putbe32((uint32_t)len, t);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	370 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	371
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	372 pos = p - PyString_AS_STRING(packobj);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	373 if (pos != nbytes) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	374 PyErr_Format(PyExc_SystemError, "bad dirstate size: %ld != %ld",
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	375 (long)pos, (long)nbytes);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	376 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	377 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	378
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	379 return packobj;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	380 bail:
21806 05bd2667df4d pack_dirstate: in C version, for invalidation set dict to what we write to disk Siddharth Agarwal <sid0@fb.com> parents: 21730 diff changeset	381 Py_XDECREF(mtime_unset);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	382 Py_XDECREF(packobj);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	383 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	384 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	385
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	386 /*
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	387 * A base-16 trie for fast node->rev mapping.
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	388 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	389 * Positive value is index of the next node in the trie
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	390 * Negative value is a leaf: -(rev + 1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	391 * Zero is empty
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	392 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	393 typedef struct {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	394 int children[16];
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	395 } nodetree;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	396
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	397 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	398 * This class has two behaviours.
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	399 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	400 * When used in a list-like way (with integer keys), we decode an
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	401 * entry in a RevlogNG index file on demand. Our last entry is a
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	402 * sentinel, always a nullid. We have limited support for
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	403 * integer-keyed insert and delete, only at elements right before the
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	404 * sentinel.
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	405 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	406 * With string keys, we lazily perform a reverse mapping from node to
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	407 * rev, using a base-16 trie.
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	408 */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	409 typedef struct {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	410 PyObject_HEAD
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	411 /* Type-specific fields go here. */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	412 PyObject data; / raw bytes of index */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	413 PyObject *cache; / cached tuples */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	414 const char *offsets; / populated on demand */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	415 Py_ssize_t raw_length; /* original number of elements */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	416 Py_ssize_t length; /* current number of elements */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	417 PyObject added; / populated on demand */
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	418 PyObject headrevs; / cache, invalidated on changes */
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	419 nodetree nt; / base-16 trie */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	420 int ntlength; /* # nodes in use */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	421 int ntcapacity; /* # nodes allocated */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	422 int ntdepth; /* maximum depth of tree */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	423 int ntsplits; /* # splits performed */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	424 int ntrev; /* last rev scanned */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	425 int ntlookups; /* # lookups */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	426 int ntmisses; /* # lookups that miss the cache */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	427 int inlined;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	428 } indexObject;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	429
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	430 static Py_ssize_t index_length(const indexObject *self)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	431 {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	432 if (self->added == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	433 return self->length;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	434 return self->length + PyList_GET_SIZE(self->added);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	435 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	436
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	437 static PyObject *nullentry;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	438 static const char nullid[20];
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	439
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	440 static long inline_scan(indexObject self, const char *offsets);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	441
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	442 #if LONG_MAX == 0x7fffffffL
16393 ee163a9cf37c util.h: more Python 2.4 fixes Matt Mackall <mpm@selenic.com> parents: 16385 diff changeset	443 static char *tuple_format = "Kiiiiiis#";
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	444 #else
16393 ee163a9cf37c util.h: more Python 2.4 fixes Matt Mackall <mpm@selenic.com> parents: 16385 diff changeset	445 static char *tuple_format = "kiiiiiis#";
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	446 #endif
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	447
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	448 /* A RevlogNG v1 index entry is 64 bytes long. */
bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	449 static const long v1_hdrsize = 64;
bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	450
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	451 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	452 * Return a pointer to the beginning of a RevlogNG record.
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	453 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	454 static const char index_deref(indexObject self, Py_ssize_t pos)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	455 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	456 if (self->inlined && pos > 0) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	457 if (self->offsets == NULL) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	458 self->offsets = malloc(self->raw_length *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	459 sizeof(*self->offsets));
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	460 if (self->offsets == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	461 return (const char *)PyErr_NoMemory();
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	462 inline_scan(self, self->offsets);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	463 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	464 return self->offsets[pos];
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	465 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	466
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	467 return PyString_AS_STRING(self->data) + pos * v1_hdrsize;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	468 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	469
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	470 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	471 * RevlogNG format (all in big endian, data may be inlined):
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	472 * 6 bytes: offset
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	473 * 2 bytes: flags
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	474 * 4 bytes: compressed length
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	475 * 4 bytes: uncompressed length
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	476 * 4 bytes: base revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	477 * 4 bytes: link revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	478 * 4 bytes: parent 1 revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	479 * 4 bytes: parent 2 revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	480 * 32 bytes: nodeid (only 20 bytes used)
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	481 */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	482 static PyObject index_get(indexObject self, Py_ssize_t pos)
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	483 {
7154 7fdf7a0a41b7 index parser: fix refcounting in case of errors, refactor Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7135 diff changeset	484 uint64_t offset_flags;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	485 int comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2;
7154 7fdf7a0a41b7 index parser: fix refcounting in case of errors, refactor Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7135 diff changeset	486 const char *c_node_id;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	487 const char *data;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	488 Py_ssize_t length = index_length(self);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	489 PyObject *entry;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	490
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	491 if (pos < 0)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	492 pos += length;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	493
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	494 if (pos < 0 \|\| pos >= length) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	495 PyErr_SetString(PyExc_IndexError, "revlog index out of range");
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	496 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	497 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	498
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	499 if (pos == length - 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	500 Py_INCREF(nullentry);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	501 return nullentry;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	502 }
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	503
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	504 if (pos >= self->length - 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	505 PyObject *obj;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	506 obj = PyList_GET_ITEM(self->added, pos - self->length + 1);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	507 Py_INCREF(obj);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	508 return obj;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	509 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	510
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	511 if (self->cache) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	512 if (self->cache[pos]) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	513 Py_INCREF(self->cache[pos]);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	514 return self->cache[pos];
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	515 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	516 } else {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	517 self->cache = calloc(self->raw_length, sizeof(PyObject *));
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	518 if (self->cache == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	519 return PyErr_NoMemory();
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	520 }
7190 aecea6934fdd Some additional space/tab cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 7186 diff changeset	521
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	522 data = index_deref(self, pos);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	523 if (data == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	524 return NULL;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	525
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	526 offset_flags = getbe32(data + 4);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	527 if (pos == 0) /* mask out version number for the first entry */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	528 offset_flags &= 0xFFFF;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	529 else {
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	530 uint32_t offset_high = getbe32(data);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	531 offset_flags \|= ((uint64_t)offset_high) << 32;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	532 }
7154 7fdf7a0a41b7 index parser: fix refcounting in case of errors, refactor Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7135 diff changeset	533
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	534 comp_len = getbe32(data + 8);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	535 uncomp_len = getbe32(data + 12);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	536 base_rev = getbe32(data + 16);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	537 link_rev = getbe32(data + 20);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	538 parent_1 = getbe32(data + 24);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	539 parent_2 = getbe32(data + 28);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	540 c_node_id = data + 32;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	541
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	542 entry = Py_BuildValue(tuple_format, offset_flags, comp_len,
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	543 uncomp_len, base_rev, link_rev,
5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	544 parent_1, parent_2, c_node_id, 20);
5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	545
19726 b3c8c6f2b5c1 parsers: use Py_INCREF safely Bryan O'Sullivan <bryano@fb.com> parents: 19725 diff changeset	546 if (entry) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	547 PyObject_GC_UnTrack(entry);
19726 b3c8c6f2b5c1 parsers: use Py_INCREF safely Bryan O'Sullivan <bryano@fb.com> parents: 19725 diff changeset	548 Py_INCREF(entry);
b3c8c6f2b5c1 parsers: use Py_INCREF safely Bryan O'Sullivan <bryano@fb.com> parents: 19725 diff changeset	549 }
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	550
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	551 self->cache[pos] = entry;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	552
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	553 return entry;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	554 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	555
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	556 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	557 * Return the 20-byte SHA of the node corresponding to the given rev.
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	558 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	559 static const char index_node(indexObject self, Py_ssize_t pos)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	560 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	561 Py_ssize_t length = index_length(self);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	562 const char *data;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	563
16664 5bc6edf71b39 parsers: ensure that nullid is always present in the radix tree Bryan O'Sullivan <bryano@fb.com> parents: 16663 diff changeset	564 if (pos == length - 1 \|\| pos == INT_MAX)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	565 return nullid;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	566
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	567 if (pos >= length)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	568 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	569
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	570 if (pos >= self->length - 1) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	571 PyObject tuple, str;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	572 tuple = PyList_GET_ITEM(self->added, pos - self->length + 1);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	573 str = PyTuple_GetItem(tuple, 7);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	574 return str ? PyString_AS_STRING(str) : NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	575 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	576
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	577 data = index_deref(self, pos);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	578 return data ? data + 32 : NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	579 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	580
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	581 static int nt_insert(indexObject self, const char node, int rev);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	582
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	583 static int node_check(PyObject obj, char node, Py_ssize_t nodelen)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	584 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	585 if (PyString_AsStringAndSize(obj, node, nodelen) == -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	586 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	587 if (*nodelen == 20)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	588 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	589 PyErr_SetString(PyExc_ValueError, "20-byte hash required");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	590 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	591 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	592
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	593 static PyObject index_insert(indexObject self, PyObject *args)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	594 {
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	595 PyObject *obj;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	596 char *node;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	597 long offset;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	598 Py_ssize_t len, nodelen;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	599
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	600 if (!PyArg_ParseTuple(args, "lO", &offset, &obj))
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	601 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	602
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	603 if (!PyTuple_Check(obj) \|\| PyTuple_GET_SIZE(obj) != 8) {
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	604 PyErr_SetString(PyExc_TypeError, "8-tuple required");
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	605 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	606 }
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	607
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	608 if (node_check(PyTuple_GET_ITEM(obj, 7), &node, &nodelen) == -1)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	609 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	610
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	611 len = index_length(self);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	612
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	613 if (offset < 0)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	614 offset += len;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	615
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	616 if (offset != len - 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	617 PyErr_SetString(PyExc_IndexError,
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	618 "insert only supported at index -1");
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	619 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	620 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	621
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	622 if (offset > INT_MAX) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	623 PyErr_SetString(PyExc_ValueError,
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	624 "currently only 2**31 revs supported");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	625 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	626 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	627
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	628 if (self->added == NULL) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	629 self->added = PyList_New(0);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	630 if (self->added == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	631 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	632 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	633
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	634 if (PyList_Append(self->added, obj) == -1)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	635 return NULL;
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	636
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	637 if (self->nt)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	638 nt_insert(self, node, (int)offset);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	639
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	640 Py_CLEAR(self->headrevs);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	641 Py_RETURN_NONE;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	642 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	643
16370 28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	644 static void _index_clearcaches(indexObject *self)
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	645 {
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	646 if (self->cache) {
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	647 Py_ssize_t i;
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	648
16732 277e2acb7e5c parsers: use Py_CLEAR where appropriate Bryan O'Sullivan <bryano@fb.com> parents: 16699 diff changeset	649 for (i = 0; i < self->raw_length; i++)
277e2acb7e5c parsers: use Py_CLEAR where appropriate Bryan O'Sullivan <bryano@fb.com> parents: 16699 diff changeset	650 Py_CLEAR(self->cache[i]);
16370 28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	651 free(self->cache);
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	652 self->cache = NULL;
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	653 }
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	654 if (self->offsets) {
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	655 free(self->offsets);
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	656 self->offsets = NULL;
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	657 }
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	658 if (self->nt) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	659 free(self->nt);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	660 self->nt = NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	661 }
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	662 Py_CLEAR(self->headrevs);
16370 28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	663 }
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	664
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	665 static PyObject index_clearcaches(indexObject self)
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	666 {
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	667 _index_clearcaches(self);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	668 self->ntlength = self->ntcapacity = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	669 self->ntdepth = self->ntsplits = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	670 self->ntrev = -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	671 self->ntlookups = self->ntmisses = 0;
16370 28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	672 Py_RETURN_NONE;
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	673 }
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	674
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	675 static PyObject index_stats(indexObject self)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	676 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	677 PyObject *obj = PyDict_New();
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	678
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	679 if (obj == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	680 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	681
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	682 #define istat(__n, __d) \
16629 1435866c1937 parser: use PyInt_FromSsize_t in index_stats Adrian Buehlmann <adrian@cadifra.com> parents: 16621 diff changeset	683 if (PyDict_SetItemString(obj, __d, PyInt_FromSsize_t(self->__n)) == -1) \
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	684 goto bail;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	685
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	686 if (self->added) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	687 Py_ssize_t len = PyList_GET_SIZE(self->added);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	688 if (PyDict_SetItemString(obj, "index entries added",
16629 1435866c1937 parser: use PyInt_FromSsize_t in index_stats Adrian Buehlmann <adrian@cadifra.com> parents: 16621 diff changeset	689 PyInt_FromSsize_t(len)) == -1)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	690 goto bail;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	691 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	692
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	693 if (self->raw_length != self->length - 1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	694 istat(raw_length, "revs on disk");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	695 istat(length, "revs in memory");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	696 istat(ntcapacity, "node trie capacity");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	697 istat(ntdepth, "node trie depth");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	698 istat(ntlength, "node trie count");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	699 istat(ntlookups, "node trie lookups");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	700 istat(ntmisses, "node trie misses");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	701 istat(ntrev, "node trie last rev scanned");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	702 istat(ntsplits, "node trie splits");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	703
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	704 #undef istat
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	705
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	706 return obj;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	707
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	708 bail:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	709 Py_XDECREF(obj);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	710 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	711 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	712
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	713 /*
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	714 * When we cache a list, we want to be sure the caller can't mutate
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	715 * the cached copy.
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	716 */
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	717 static PyObject list_copy(PyObject list)
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	718 {
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	719 Py_ssize_t len = PyList_GET_SIZE(list);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	720 PyObject *newlist = PyList_New(len);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	721 Py_ssize_t i;
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	722
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	723 if (newlist == NULL)
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	724 return NULL;
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	725
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	726 for (i = 0; i < len; i++) {
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	727 PyObject *obj = PyList_GET_ITEM(list, i);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	728 Py_INCREF(obj);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	729 PyList_SET_ITEM(newlist, i, obj);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	730 }
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	731
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	732 return newlist;
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	733 }
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	734
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	735 static PyObject index_headrevs(indexObject self)
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	736 {
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	737 Py_ssize_t i, len, addlen;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	738 char *nothead = NULL;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	739 PyObject *heads;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	740
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	741 if (self->headrevs)
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	742 return list_copy(self->headrevs);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	743
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	744 len = index_length(self) - 1;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	745 heads = PyList_New(0);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	746 if (heads == NULL)
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	747 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	748 if (len == 0) {
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	749 PyObject *nullid = PyInt_FromLong(-1);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	750 if (nullid == NULL \|\| PyList_Append(heads, nullid) == -1) {
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	751 Py_XDECREF(nullid);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	752 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	753 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	754 goto done;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	755 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	756
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	757 nothead = calloc(len, 1);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	758 if (nothead == NULL)
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	759 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	760
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	761 for (i = 0; i < self->raw_length; i++) {
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	762 const char *data = index_deref(self, i);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	763 int parent_1 = getbe32(data + 24);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	764 int parent_2 = getbe32(data + 28);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	765 if (parent_1 >= 0)
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	766 nothead[parent_1] = 1;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	767 if (parent_2 >= 0)
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	768 nothead[parent_2] = 1;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	769 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	770
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	771 addlen = self->added ? PyList_GET_SIZE(self->added) : 0;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	772
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	773 for (i = 0; i < addlen; i++) {
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	774 PyObject *rev = PyList_GET_ITEM(self->added, i);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	775 PyObject *p1 = PyTuple_GET_ITEM(rev, 5);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	776 PyObject *p2 = PyTuple_GET_ITEM(rev, 6);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	777 long parent_1, parent_2;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	778
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	779 if (!PyInt_Check(p1) \|\| !PyInt_Check(p2)) {
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	780 PyErr_SetString(PyExc_TypeError,
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	781 "revlog parents are invalid");
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	782 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	783 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	784 parent_1 = PyInt_AS_LONG(p1);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	785 parent_2 = PyInt_AS_LONG(p2);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	786 if (parent_1 >= 0)
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	787 nothead[parent_1] = 1;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	788 if (parent_2 >= 0)
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	789 nothead[parent_2] = 1;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	790 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	791
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	792 for (i = 0; i < len; i++) {
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	793 PyObject *head;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	794
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	795 if (nothead[i])
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	796 continue;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	797 head = PyInt_FromLong(i);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	798 if (head == NULL \|\| PyList_Append(heads, head) == -1) {
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	799 Py_XDECREF(head);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	800 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	801 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	802 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	803
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	804 done:
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	805 self->headrevs = heads;
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	806 free(nothead);
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	807 return list_copy(self->headrevs);
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	808 bail:
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	809 Py_XDECREF(heads);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	810 free(nothead);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	811 return NULL;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	812 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	813
16618 6bae941b58ad parsers: change the type of nt_level Bryan O'Sullivan <bryano@fb.com> parents: 16617 diff changeset	814 static inline int nt_level(const char *node, Py_ssize_t level)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	815 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	816 int v = node[level>>1];
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	817 if (!(level & 1))
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	818 v >>= 4;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	819 return v & 0xf;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	820 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	821
16616 8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	822 /*
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	823 * Return values:
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	824 *
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	825 * -4: match is ambiguous (multiple candidates)
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	826 * -2: not found
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	827 * rest: valid rev
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	828 */
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	829 static int nt_find(indexObject self, const char node, Py_ssize_t nodelen,
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	830 int hex)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	831 {
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	832 int (getnybble)(const char , Py_ssize_t) = hex ? hexdigit : nt_level;
16641 e6dfbc5df76f parsers: use the correct maximum radix tree depth Bryan O'Sullivan <bryano@fb.com> parents: 16604 diff changeset	833 int level, maxlevel, off;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	834
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	835 if (nodelen == 20 && node[0] == '\0' && memcmp(node, nullid, 20) == 0)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	836 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	837
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	838 if (self->nt == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	839 return -2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	840
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	841 if (hex)
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	842 maxlevel = nodelen > 40 ? 40 : (int)nodelen;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	843 else
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	844 maxlevel = nodelen > 20 ? 40 : ((int)nodelen * 2);
16641 e6dfbc5df76f parsers: use the correct maximum radix tree depth Bryan O'Sullivan <bryano@fb.com> parents: 16604 diff changeset	845
e6dfbc5df76f parsers: use the correct maximum radix tree depth Bryan O'Sullivan <bryano@fb.com> parents: 16604 diff changeset	846 for (level = off = 0; level < maxlevel; level++) {
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	847 int k = getnybble(node, level);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	848 nodetree *n = &self->nt[off];
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	849 int v = n->children[k];
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	850
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	851 if (v < 0) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	852 const char *n;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	853 Py_ssize_t i;
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	854
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	855 v = -v - 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	856 n = index_node(self, v);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	857 if (n == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	858 return -2;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	859 for (i = level; i < maxlevel; i++)
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	860 if (getnybble(node, i) != nt_level(n, i))
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	861 return -2;
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	862 return v;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	863 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	864 if (v == 0)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	865 return -2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	866 off = v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	867 }
16616 8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	868 /* multiple matches against an ambiguous prefix */
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	869 return -4;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	870 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	871
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	872 static int nt_new(indexObject *self)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	873 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	874 if (self->ntlength == self->ntcapacity) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	875 self->ntcapacity *= 2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	876 self->nt = realloc(self->nt,
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	877 self->ntcapacity * sizeof(nodetree));
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	878 if (self->nt == NULL) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	879 PyErr_SetString(PyExc_MemoryError, "out of memory");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	880 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	881 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	882 memset(&self->nt[self->ntlength], 0,
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	883 sizeof(nodetree) * (self->ntcapacity - self->ntlength));
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	884 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	885 return self->ntlength++;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	886 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	887
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	888 static int nt_insert(indexObject self, const char node, int rev)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	889 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	890 int level = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	891 int off = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	892
16641 e6dfbc5df76f parsers: use the correct maximum radix tree depth Bryan O'Sullivan <bryano@fb.com> parents: 16604 diff changeset	893 while (level < 40) {
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	894 int k = nt_level(node, level);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	895 nodetree *n;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	896 int v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	897
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	898 n = &self->nt[off];
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	899 v = n->children[k];
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	900
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	901 if (v == 0) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	902 n->children[k] = -rev - 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	903 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	904 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	905 if (v < 0) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	906 const char *oldnode = index_node(self, -v - 1);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	907 int noff;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	908
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	909 if (!oldnode \|\| !memcmp(oldnode, node, 20)) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	910 n->children[k] = -rev - 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	911 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	912 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	913 noff = nt_new(self);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	914 if (noff == -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	915 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	916 /* self->nt may have been changed by realloc */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	917 self->nt[off].children[k] = noff;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	918 off = noff;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	919 n = &self->nt[off];
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	920 n->children[nt_level(oldnode, ++level)] = v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	921 if (level > self->ntdepth)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	922 self->ntdepth = level;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	923 self->ntsplits += 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	924 } else {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	925 level += 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	926 off = v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	927 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	928 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	929
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	930 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	931 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	932
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	933 static int nt_init(indexObject *self)
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	934 {
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	935 if (self->nt == NULL) {
20110 40b7c6e4b993 mercurial/parsers.c: fix compiler warning Abhay Kadam <abhaykadam88@gmail.com> parents: 19728 diff changeset	936 if (self->raw_length > INT_MAX) {
40b7c6e4b993 mercurial/parsers.c: fix compiler warning Abhay Kadam <abhaykadam88@gmail.com> parents: 19728 diff changeset	937 PyErr_SetString(PyExc_ValueError, "overflow in nt_init");
40b7c6e4b993 mercurial/parsers.c: fix compiler warning Abhay Kadam <abhaykadam88@gmail.com> parents: 19728 diff changeset	938 return -1;
40b7c6e4b993 mercurial/parsers.c: fix compiler warning Abhay Kadam <abhaykadam88@gmail.com> parents: 19728 diff changeset	939 }
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	940 self->ntcapacity = self->raw_length < 4
20110 40b7c6e4b993 mercurial/parsers.c: fix compiler warning Abhay Kadam <abhaykadam88@gmail.com> parents: 19728 diff changeset	941 ? 4 : (int)self->raw_length / 2;
40b7c6e4b993 mercurial/parsers.c: fix compiler warning Abhay Kadam <abhaykadam88@gmail.com> parents: 19728 diff changeset	942
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	943 self->nt = calloc(self->ntcapacity, sizeof(nodetree));
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	944 if (self->nt == NULL) {
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	945 PyErr_NoMemory();
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	946 return -1;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	947 }
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	948 self->ntlength = 1;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	949 self->ntrev = (int)index_length(self) - 1;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	950 self->ntlookups = 1;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	951 self->ntmisses = 0;
16664 5bc6edf71b39 parsers: ensure that nullid is always present in the radix tree Bryan O'Sullivan <bryano@fb.com> parents: 16663 diff changeset	952 if (nt_insert(self, nullid, INT_MAX) == -1)
5bc6edf71b39 parsers: ensure that nullid is always present in the radix tree Bryan O'Sullivan <bryano@fb.com> parents: 16663 diff changeset	953 return -1;
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	954 }
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	955 return 0;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	956 }
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	957
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	958 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	959 * Return values:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	960 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	961 * -3: error (exception set)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	962 * -2: not found (no exception set)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	963 * rest: valid rev
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	964 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	965 static int index_find_node(indexObject *self,
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	966 const char *node, Py_ssize_t nodelen)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	967 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	968 int rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	969
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	970 self->ntlookups++;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	971 rev = nt_find(self, node, nodelen, 0);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	972 if (rev >= -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	973 return rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	974
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	975 if (nt_init(self) == -1)
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	976 return -3;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	977
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	978 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	979 * For the first handful of lookups, we scan the entire index,
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	980 * and cache only the matching nodes. This optimizes for cases
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	981 * like "hg tip", where only a few nodes are accessed.
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	982 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	983 * After that, we cache every node we visit, using a single
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	984 * scan amortized over multiple lookups. This gives the best
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	985 * bulk performance, e.g. for "hg log".
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	986 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	987 if (self->ntmisses++ < 4) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	988 for (rev = self->ntrev - 1; rev >= 0; rev--) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	989 const char *n = index_node(self, rev);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	990 if (n == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	991 return -2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	992 if (memcmp(node, n, nodelen > 20 ? 20 : nodelen) == 0) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	993 if (nt_insert(self, n, rev) == -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	994 return -3;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	995 break;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	996 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	997 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	998 } else {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	999 for (rev = self->ntrev - 1; rev >= 0; rev--) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1000 const char *n = index_node(self, rev);
16614 1d800eb9ba52 parsers: update ntrev when we stop scanning Bryan O'Sullivan <bryano@fb.com> parents: 16597 diff changeset	1001 if (n == NULL) {
1d800eb9ba52 parsers: update ntrev when we stop scanning Bryan O'Sullivan <bryano@fb.com> parents: 16597 diff changeset	1002 self->ntrev = rev + 1;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1003 return -2;
16614 1d800eb9ba52 parsers: update ntrev when we stop scanning Bryan O'Sullivan <bryano@fb.com> parents: 16597 diff changeset	1004 }
1d800eb9ba52 parsers: update ntrev when we stop scanning Bryan O'Sullivan <bryano@fb.com> parents: 16597 diff changeset	1005 if (nt_insert(self, n, rev) == -1) {
1d800eb9ba52 parsers: update ntrev when we stop scanning Bryan O'Sullivan <bryano@fb.com> parents: 16597 diff changeset	1006 self->ntrev = rev + 1;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1007 return -3;
16614 1d800eb9ba52 parsers: update ntrev when we stop scanning Bryan O'Sullivan <bryano@fb.com> parents: 16597 diff changeset	1008 }
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1009 if (memcmp(node, n, nodelen > 20 ? 20 : nodelen) == 0) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1010 break;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1011 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1012 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1013 self->ntrev = rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1014 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1015
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1016 if (rev >= 0)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1017 return rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1018 return -2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1019 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1020
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1021 static PyObject *raise_revlog_error(void)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1022 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1023 static PyObject *errclass;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1024 PyObject mod = NULL, errobj;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1025
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1026 if (errclass == NULL) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1027 PyObject *dict;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1028
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1029 mod = PyImport_ImportModule("mercurial.error");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1030 if (mod == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1031 goto classfail;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1032
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1033 dict = PyModule_GetDict(mod);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1034 if (dict == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1035 goto classfail;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1036
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1037 errclass = PyDict_GetItemString(dict, "RevlogError");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1038 if (errclass == NULL) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1039 PyErr_SetString(PyExc_SystemError,
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1040 "could not find RevlogError");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1041 goto classfail;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1042 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1043 Py_INCREF(errclass);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1044 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1045
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1046 errobj = PyObject_CallFunction(errclass, NULL);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1047 if (errobj == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1048 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1049 PyErr_SetObject(errclass, errobj);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1050 return errobj;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1051
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1052 classfail:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1053 Py_XDECREF(mod);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1054 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1055 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1056
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1057 static PyObject index_getitem(indexObject self, PyObject *value)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1058 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1059 char *node;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1060 Py_ssize_t nodelen;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1061 int rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1062
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1063 if (PyInt_Check(value))
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1064 return index_get(self, PyInt_AS_LONG(value));
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1065
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1066 if (node_check(value, &node, &nodelen) == -1)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1067 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1068 rev = index_find_node(self, node, nodelen);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1069 if (rev >= -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1070 return PyInt_FromLong(rev);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1071 if (rev == -2)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1072 raise_revlog_error();
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1073 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1074 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1075
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1076 static int nt_partialmatch(indexObject self, const char node,
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1077 Py_ssize_t nodelen)
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1078 {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1079 int rev;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1080
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1081 if (nt_init(self) == -1)
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1082 return -3;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1083
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1084 if (self->ntrev > 0) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1085 /* ensure that the radix tree is fully populated */
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1086 for (rev = self->ntrev - 1; rev >= 0; rev--) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1087 const char *n = index_node(self, rev);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1088 if (n == NULL)
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1089 return -2;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1090 if (nt_insert(self, n, rev) == -1)
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1091 return -3;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1092 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1093 self->ntrev = rev;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1094 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1095
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1096 return nt_find(self, node, nodelen, 1);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1097 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1098
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1099 static PyObject index_partialmatch(indexObject self, PyObject *args)
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1100 {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1101 const char *fullnode;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1102 int nodelen;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1103 char *node;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1104 int rev, i;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1105
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1106 if (!PyArg_ParseTuple(args, "s#", &node, &nodelen))
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1107 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1108
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1109 if (nodelen < 4) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1110 PyErr_SetString(PyExc_ValueError, "key too short");
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1111 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1112 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1113
17353 bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	1114 if (nodelen > 40) {
bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	1115 PyErr_SetString(PyExc_ValueError, "key too long");
bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	1116 return NULL;
bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	1117 }
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1118
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1119 for (i = 0; i < nodelen; i++)
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1120 hexdigit(node, i);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1121 if (PyErr_Occurred()) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1122 /* input contains non-hex characters */
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1123 PyErr_Clear();
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1124 Py_RETURN_NONE;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1125 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1126
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1127 rev = nt_partialmatch(self, node, nodelen);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1128
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1129 switch (rev) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1130 case -4:
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1131 raise_revlog_error();
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1132 case -3:
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1133 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1134 case -2:
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1135 Py_RETURN_NONE;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1136 case -1:
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1137 return PyString_FromStringAndSize(nullid, 20);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1138 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1139
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1140 fullnode = index_node(self, rev);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1141 if (fullnode == NULL) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1142 PyErr_Format(PyExc_IndexError,
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1143 "could not access rev %d", rev);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1144 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1145 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1146 return PyString_FromStringAndSize(fullnode, 20);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1147 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1148
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1149 static PyObject index_m_get(indexObject self, PyObject *args)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1150 {
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1151 Py_ssize_t nodelen;
2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1152 PyObject *val;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1153 char *node;
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1154 int rev;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1155
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1156 if (!PyArg_ParseTuple(args, "O", &val))
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1157 return NULL;
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1158 if (node_check(val, &node, &nodelen) == -1)
2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1159 return NULL;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1160 rev = index_find_node(self, node, nodelen);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1161 if (rev == -3)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1162 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1163 if (rev == -2)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1164 Py_RETURN_NONE;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1165 return PyInt_FromLong(rev);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1166 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1167
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1168 static int index_contains(indexObject self, PyObject value)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1169 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1170 char *node;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1171 Py_ssize_t nodelen;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1172
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1173 if (PyInt_Check(value)) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1174 long rev = PyInt_AS_LONG(value);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1175 return rev >= -1 && rev < index_length(self);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1176 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1177
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1178 if (node_check(value, &node, &nodelen) == -1)
2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1179 return -1;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1180
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1181 switch (index_find_node(self, node, nodelen)) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1182 case -3:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1183 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1184 case -2:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1185 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1186 default:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1187 return 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1188 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1189 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1190
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1191 static inline void index_get_parents(indexObject self, int rev, int ps)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1192 {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1193 if (rev >= self->length - 1) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1194 PyObject *tuple = PyList_GET_ITEM(self->added,
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1195 rev - self->length + 1);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1196 ps[0] = (int)PyInt_AS_LONG(PyTuple_GET_ITEM(tuple, 5));
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1197 ps[1] = (int)PyInt_AS_LONG(PyTuple_GET_ITEM(tuple, 6));
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1198 } else {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1199 const char *data = index_deref(self, rev);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1200 ps[0] = getbe32(data + 24);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1201 ps[1] = getbe32(data + 28);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1202 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1203 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1204
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1205 typedef uint64_t bitmask;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1206
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1207 /*
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1208 * Given a disjoint set of revs, return all candidates for the
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1209 * greatest common ancestor. In revset notation, this is the set
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1210 * "heads(::a and ::b and ...)"
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1211 */
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1212 static PyObject find_gca_candidates(indexObject self, const int *revs,
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1213 int revcount)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1214 {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1215 const bitmask allseen = (1ull << revcount) - 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1216 const bitmask poison = 1ull << revcount;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1217 PyObject *gca = PyList_New(0);
20555 4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	1218 int i, v, interesting;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1219 int maxrev = -1;
19030 48d6f436363e parsers: fix variable declaration position issue Matt Mackall <mpm@selenic.com> parents: 18988 diff changeset	1220 long sp;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1221 bitmask *seen;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1222
19727 3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1223 if (gca == NULL)
3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1224 return PyErr_NoMemory();
3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1225
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1226 for (i = 0; i < revcount; i++) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1227 if (revs[i] > maxrev)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1228 maxrev = revs[i];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1229 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1230
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1231 seen = calloc(sizeof(*seen), maxrev + 1);
19727 3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1232 if (seen == NULL) {
3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1233 Py_DECREF(gca);
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1234 return PyErr_NoMemory();
19727 3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1235 }
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1236
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1237 for (i = 0; i < revcount; i++)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1238 seen[revs[i]] = 1ull << i;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1239
20555 4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	1240 interesting = revcount;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1241
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1242 for (v = maxrev; v >= 0 && interesting; v--) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1243 long sv = seen[v];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1244 int parents[2];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1245
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1246 if (!sv)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1247 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1248
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1249 if (sv < poison) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1250 interesting -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1251 if (sv == allseen) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1252 PyObject *obj = PyInt_FromLong(v);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1253 if (obj == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1254 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1255 if (PyList_Append(gca, obj) == -1) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1256 Py_DECREF(obj);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1257 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1258 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1259 sv \|= poison;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1260 for (i = 0; i < revcount; i++) {
20555 4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	1261 if (revs[i] == v)
4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	1262 goto done;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1263 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1264 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1265 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1266 index_get_parents(self, v, parents);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1267
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1268 for (i = 0; i < 2; i++) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1269 int p = parents[i];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1270 if (p == -1)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1271 continue;
19030 48d6f436363e parsers: fix variable declaration position issue Matt Mackall <mpm@selenic.com> parents: 18988 diff changeset	1272 sp = seen[p];
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1273 if (sv < poison) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1274 if (sp == 0) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1275 seen[p] = sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1276 interesting++;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1277 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1278 else if (sp != sv)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1279 seen[p] \|= sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1280 } else {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1281 if (sp && sp < poison)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1282 interesting--;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1283 seen[p] = sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1284 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1285 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1286 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1287
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1288 done:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1289 free(seen);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1290 return gca;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1291 bail:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1292 free(seen);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1293 Py_XDECREF(gca);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1294 return NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1295 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1296
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1297 /*
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1298 * Given a disjoint set of revs, return the subset with the longest
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1299 * path to the root.
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1300 */
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1301 static PyObject find_deepest(indexObject self, PyObject *revs)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1302 {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1303 const Py_ssize_t revcount = PyList_GET_SIZE(revs);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1304 static const Py_ssize_t capacity = 24;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1305 int depth, interesting = NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1306 int i, j, v, ninteresting;
21730 8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1307 PyObject dict = NULL, keys = NULL;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1308 long *seen = NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1309 int maxrev = -1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1310 long final;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1311
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1312 if (revcount > capacity) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1313 PyErr_Format(PyExc_OverflowError,
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1314 "bitset size (%ld) > capacity (%ld)",
19062 365b0de17c1c parsers: remove warning: format ?%ld? expects argument of type ?long int? Andr? Sintzoff <andre.sintzoff@gmail.com> parents: 19030 diff changeset	1315 (long)revcount, (long)capacity);
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1316 return NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1317 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1318
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1319 for (i = 0; i < revcount; i++) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1320 int n = (int)PyInt_AsLong(PyList_GET_ITEM(revs, i));
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1321 if (n > maxrev)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1322 maxrev = n;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1323 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1324
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1325 depth = calloc(sizeof(*depth), maxrev + 1);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1326 if (depth == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1327 return PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1328
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1329 seen = calloc(sizeof(*seen), maxrev + 1);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1330 if (seen == NULL) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1331 PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1332 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1333 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1334
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1335 interesting = calloc(sizeof(*interesting), 2 << revcount);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1336 if (interesting == NULL) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1337 PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1338 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1339 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1340
19502 8704477ad3b6 ancestor.deepest: sort revs in C version Siddharth Agarwal <sid0@fb.com> parents: 19062 diff changeset	1341 if (PyList_Sort(revs) == -1)
8704477ad3b6 ancestor.deepest: sort revs in C version Siddharth Agarwal <sid0@fb.com> parents: 19062 diff changeset	1342 goto bail;
8704477ad3b6 ancestor.deepest: sort revs in C version Siddharth Agarwal <sid0@fb.com> parents: 19062 diff changeset	1343
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1344 for (i = 0; i < revcount; i++) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1345 int n = (int)PyInt_AsLong(PyList_GET_ITEM(revs, i));
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1346 long b = 1l << i;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1347 depth[n] = 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1348 seen[n] = b;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1349 interesting[b] = 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1350 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1351
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1352 ninteresting = (int)revcount;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1353
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1354 for (v = maxrev; v >= 0 && ninteresting > 1; v--) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1355 int dv = depth[v];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1356 int parents[2];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1357 long sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1358
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1359 if (dv == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1360 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1361
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1362 sv = seen[v];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1363 index_get_parents(self, v, parents);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1364
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1365 for (i = 0; i < 2; i++) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1366 int p = parents[i];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1367 long nsp, sp;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1368 int dp;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1369
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1370 if (p == -1)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1371 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1372
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1373 dp = depth[p];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1374 nsp = sp = seen[p];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1375 if (dp <= dv) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1376 depth[p] = dv + 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1377 if (sp != sv) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1378 interesting[sv] += 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1379 nsp = seen[p] = sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1380 if (sp) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1381 interesting[sp] -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1382 if (interesting[sp] == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1383 ninteresting -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1384 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1385 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1386 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1387 else if (dv == dp - 1) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1388 nsp = sp \| sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1389 if (nsp == sp)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1390 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1391 seen[p] = nsp;
19503 f2dfda6ac152 ancestor.deepest: decrement ninteresting correctly (issue3984) Wei, Elson <elson.wei@gmail.com> parents: 19502 diff changeset	1392 interesting[sp] -= 1;
f2dfda6ac152 ancestor.deepest: decrement ninteresting correctly (issue3984) Wei, Elson <elson.wei@gmail.com> parents: 19502 diff changeset	1393 if (interesting[sp] == 0 && interesting[nsp] > 0)
f2dfda6ac152 ancestor.deepest: decrement ninteresting correctly (issue3984) Wei, Elson <elson.wei@gmail.com> parents: 19502 diff changeset	1394 ninteresting -= 1;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1395 interesting[nsp] += 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1396 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1397 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1398 interesting[sv] -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1399 if (interesting[sv] == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1400 ninteresting -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1401 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1402
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1403 final = 0;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1404 j = ninteresting;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1405 for (i = 0; i < (int)(2 << revcount) && j > 0; i++) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1406 if (interesting[i] == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1407 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1408 final \|= i;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1409 j -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1410 }
21730 8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1411 if (final == 0) {
8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1412 keys = PyList_New(0);
8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1413 goto bail;
8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1414 }
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1415
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1416 dict = PyDict_New();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1417 if (dict == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1418 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1419
19504 2fa303619b4d ancestor.deepest: ignore ninteresting while building result (issue3984) Siddharth Agarwal <sid0@fb.com> parents: 19503 diff changeset	1420 for (i = 0; i < revcount; i++) {
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1421 PyObject *key;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1422
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1423 if ((final & (1 << i)) == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1424 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1425
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1426 key = PyList_GET_ITEM(revs, i);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1427 Py_INCREF(key);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1428 Py_INCREF(Py_None);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1429 if (PyDict_SetItem(dict, key, Py_None) == -1) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1430 Py_DECREF(key);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1431 Py_DECREF(Py_None);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1432 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1433 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1434 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1435
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1436 keys = PyDict_Keys(dict);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1437
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1438 bail:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1439 free(depth);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1440 free(seen);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1441 free(interesting);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1442 Py_XDECREF(dict);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1443
21730 8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1444 return keys;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1445 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1446
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1447 /*
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1448 * Given a (possibly overlapping) set of revs, return the greatest
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1449 * common ancestors: those with the longest path to the root.
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1450 */
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1451 static PyObject index_ancestors(indexObject self, PyObject *args)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1452 {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1453 PyObject ret = NULL, gca = NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1454 Py_ssize_t argcount, i, len;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1455 bitmask repeat = 0;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1456 int revcount = 0;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1457 int *revs;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1458
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1459 argcount = PySequence_Length(args);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1460 revs = malloc(argcount * sizeof(*revs));
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1461 if (argcount > 0 && revs == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1462 return PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1463 len = index_length(self) - 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1464
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1465 for (i = 0; i < argcount; i++) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1466 static const int capacity = 24;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1467 PyObject *obj = PySequence_GetItem(args, i);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1468 bitmask x;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1469 long val;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1470
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1471 if (!PyInt_Check(obj)) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1472 PyErr_SetString(PyExc_TypeError,
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1473 "arguments must all be ints");
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1474 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1475 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1476 val = PyInt_AsLong(obj);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1477 if (val == -1) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1478 ret = PyList_New(0);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1479 goto done;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1480 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1481 if (val < 0 \|\| val >= len) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1482 PyErr_SetString(PyExc_IndexError,
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1483 "index out of range");
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1484 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1485 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1486 /* this cheesy bloom filter lets us avoid some more
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1487 * expensive duplicate checks in the common set-is-disjoint
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1488 * case */
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1489 x = 1ull << (val & 0x3f);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1490 if (repeat & x) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1491 int k;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1492 for (k = 0; k < revcount; k++) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1493 if (val == revs[k])
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1494 goto duplicate;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1495 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1496 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1497 else repeat \|= x;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1498 if (revcount >= capacity) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1499 PyErr_Format(PyExc_OverflowError,
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1500 "bitset size (%d) > capacity (%d)",
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1501 revcount, capacity);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1502 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1503 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1504 revs[revcount++] = (int)val;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1505 duplicate:;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1506 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1507
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1508 if (revcount == 0) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1509 ret = PyList_New(0);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1510 goto done;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1511 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1512 if (revcount == 1) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1513 PyObject *obj;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1514 ret = PyList_New(1);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1515 if (ret == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1516 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1517 obj = PyInt_FromLong(revs[0]);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1518 if (obj == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1519 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1520 PyList_SET_ITEM(ret, 0, obj);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1521 goto done;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1522 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1523
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1524 gca = find_gca_candidates(self, revs, revcount);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1525 if (gca == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1526 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1527
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1528 if (PyList_GET_SIZE(gca) <= 1) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1529 ret = gca;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1530 Py_INCREF(gca);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1531 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1532 else ret = find_deepest(self, gca);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1533
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1534 done:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1535 free(revs);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1536 Py_XDECREF(gca);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1537
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1538 return ret;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1539
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1540 bail:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1541 free(revs);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1542 Py_XDECREF(gca);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1543 Py_XDECREF(ret);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1544 return NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1545 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1546
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1547 /*
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1548 * Given a (possibly overlapping) set of revs, return all the
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1549 * common ancestors heads: heads(::args[0] and ::a[1] and ...)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1550 */
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1551 static PyObject index_commonancestorsheads(indexObject self, PyObject *args)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1552 {
21103 628c16489d1c parsers: remove unnecessary gca variable in index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 21102 diff changeset	1553 PyObject *ret = NULL;
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1554 Py_ssize_t argcount, i, len;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1555 bitmask repeat = 0;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1556 int revcount = 0;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1557 int *revs;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1558
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1559 argcount = PySequence_Length(args);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1560 revs = malloc(argcount * sizeof(*revs));
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1561 if (argcount > 0 && revs == NULL)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1562 return PyErr_NoMemory();
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1563 len = index_length(self) - 1;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1564
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1565 for (i = 0; i < argcount; i++) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1566 static const int capacity = 24;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1567 PyObject *obj = PySequence_GetItem(args, i);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1568 bitmask x;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1569 long val;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1570
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1571 if (!PyInt_Check(obj)) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1572 PyErr_SetString(PyExc_TypeError,
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1573 "arguments must all be ints");
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1574 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1575 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1576 val = PyInt_AsLong(obj);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1577 if (val == -1) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1578 ret = PyList_New(0);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1579 goto done;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1580 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1581 if (val < 0 \|\| val >= len) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1582 PyErr_SetString(PyExc_IndexError,
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1583 "index out of range");
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1584 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1585 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1586 /* this cheesy bloom filter lets us avoid some more
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1587 * expensive duplicate checks in the common set-is-disjoint
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1588 * case */
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1589 x = 1ull << (val & 0x3f);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1590 if (repeat & x) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1591 int k;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1592 for (k = 0; k < revcount; k++) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1593 if (val == revs[k])
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1594 goto duplicate;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1595 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1596 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1597 else repeat \|= x;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1598 if (revcount >= capacity) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1599 PyErr_Format(PyExc_OverflowError,
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1600 "bitset size (%d) > capacity (%d)",
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1601 revcount, capacity);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1602 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1603 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1604 revs[revcount++] = (int)val;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1605 duplicate:;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1606 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1607
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1608 if (revcount == 0) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1609 ret = PyList_New(0);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1610 goto done;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1611 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1612 if (revcount == 1) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1613 PyObject *obj;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1614 ret = PyList_New(1);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1615 if (ret == NULL)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1616 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1617 obj = PyInt_FromLong(revs[0]);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1618 if (obj == NULL)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1619 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1620 PyList_SET_ITEM(ret, 0, obj);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1621 goto done;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1622 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1623
21103 628c16489d1c parsers: remove unnecessary gca variable in index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 21102 diff changeset	1624 ret = find_gca_candidates(self, revs, revcount);
628c16489d1c parsers: remove unnecessary gca variable in index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 21102 diff changeset	1625 if (ret == NULL)
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1626 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1627
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1628 done:
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1629 free(revs);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1630 return ret;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1631
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1632 bail:
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1633 free(revs);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1634 Py_XDECREF(ret);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1635 return NULL;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1636 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1637
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1638 /*
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1639 * Invalidate any trie entries introduced by added revs.
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1640 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1641 static void nt_invalidate_added(indexObject *self, Py_ssize_t start)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1642 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1643 Py_ssize_t i, len = PyList_GET_SIZE(self->added);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1644
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1645 for (i = start; i < len; i++) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1646 PyObject *tuple = PyList_GET_ITEM(self->added, i);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1647 PyObject *node = PyTuple_GET_ITEM(tuple, 7);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1648
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1649 nt_insert(self, PyString_AS_STRING(node), -1);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1650 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1651
16732 277e2acb7e5c parsers: use Py_CLEAR where appropriate Bryan O'Sullivan <bryano@fb.com> parents: 16699 diff changeset	1652 if (start == 0)
277e2acb7e5c parsers: use Py_CLEAR where appropriate Bryan O'Sullivan <bryano@fb.com> parents: 16699 diff changeset	1653 Py_CLEAR(self->added);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1654 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1655
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1656 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1657 * Delete a numeric range of revs, which must be at the end of the
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1658 * range, but exclude the sentinel nullid entry.
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1659 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1660 static int index_slice_del(indexObject self, PyObject item)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1661 {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1662 Py_ssize_t start, stop, step, slicelength;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1663 Py_ssize_t length = index_length(self);
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	1664 int ret = 0;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1665
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1666 if (PySlice_GetIndicesEx((PySliceObject*)item, length,
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1667 &start, &stop, &step, &slicelength) < 0)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1668 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1669
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1670 if (slicelength <= 0)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1671 return 0;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1672
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1673 if ((step < 0 && start < stop) \|\| (step > 0 && start > stop))
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1674 stop = start;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1675
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1676 if (step < 0) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1677 stop = start + 1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1678 start = stop + step*(slicelength - 1) - 1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1679 step = -step;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1680 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1681
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1682 if (step != 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1683 PyErr_SetString(PyExc_ValueError,
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1684 "revlog index delete requires step size of 1");
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1685 return -1;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1686 }
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1687
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1688 if (stop != length - 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1689 PyErr_SetString(PyExc_IndexError,
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1690 "revlog index deletion indices are invalid");
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1691 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1692 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1693
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1694 if (start < self->length - 1) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1695 if (self->nt) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1696 Py_ssize_t i;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1697
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1698 for (i = start + 1; i < self->length - 1; i++) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1699 const char *node = index_node(self, i);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1700
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1701 if (node)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1702 nt_insert(self, node, -1);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1703 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1704 if (self->added)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1705 nt_invalidate_added(self, 0);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1706 if (self->ntrev > start)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1707 self->ntrev = (int)start;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1708 }
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1709 self->length = start + 1;
18504 d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	1710 if (start < self->raw_length) {
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	1711 if (self->cache) {
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	1712 Py_ssize_t i;
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	1713 for (i = start; i < self->raw_length; i++)
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	1714 Py_CLEAR(self->cache[i]);
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	1715 }
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	1716 self->raw_length = start;
18504 d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	1717 }
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	1718 goto done;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1719 }
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1720
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1721 if (self->nt) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1722 nt_invalidate_added(self, start - self->length + 1);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1723 if (self->ntrev > start)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1724 self->ntrev = (int)start;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1725 }
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	1726 if (self->added)
12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	1727 ret = PyList_SetSlice(self->added, start - self->length + 1,
12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	1728 PyList_GET_SIZE(self->added), NULL);
12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	1729 done:
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1730 Py_CLEAR(self->headrevs);
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	1731 return ret;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1732 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1733
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1734 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1735 * Supported ops:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1736 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1737 * slice deletion
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1738 * string assignment (extend node->rev mapping)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1739 * string deletion (shrink node->rev mapping)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1740 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1741 static int index_assign_subscript(indexObject self, PyObject item,
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1742 PyObject *value)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1743 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1744 char *node;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1745 Py_ssize_t nodelen;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1746 long rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1747
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1748 if (PySlice_Check(item) && value == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1749 return index_slice_del(self, item);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1750
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1751 if (node_check(item, &node, &nodelen) == -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1752 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1753
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1754 if (value == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1755 return self->nt ? nt_insert(self, node, -1) : 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1756 rev = PyInt_AsLong(value);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1757 if (rev > INT_MAX \|\| rev < 0) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1758 if (!PyErr_Occurred())
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1759 PyErr_SetString(PyExc_ValueError, "rev out of range");
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1760 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1761 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1762 return nt_insert(self, node, (int)rev);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1763 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1764
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1765 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1766 * Find all RevlogNG entries in an index that has inline data. Update
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1767 * the optional "offsets" table with those entries.
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1768 */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1769 static long inline_scan(indexObject self, const char *offsets)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1770 {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1771 const char *data = PyString_AS_STRING(self->data);
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	1772 Py_ssize_t pos = 0;
09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	1773 Py_ssize_t end = PyString_GET_SIZE(self->data);
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	1774 long incr = v1_hdrsize;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1775 Py_ssize_t len = 0;
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	1776
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	1777 while (pos + v1_hdrsize <= end && pos >= 0) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1778 uint32_t comp_len;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1779 /* 3rd element of header is length of compressed inline data */
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	1780 comp_len = getbe32(data + pos + 8);
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	1781 incr = v1_hdrsize + comp_len;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1782 if (offsets)
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	1783 offsets[len] = data + pos;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1784 len++;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	1785 pos += incr;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1786 }
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	1787
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	1788 if (pos != end) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1789 if (!PyErr_Occurred())
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1790 PyErr_SetString(PyExc_ValueError, "corrupt index file");
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1791 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1792 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1793
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1794 return len;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1795 }
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	1796
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1797 static int index_init(indexObject self, PyObject args)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1798 {
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1799 PyObject data_obj, inlined_obj;
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1800 Py_ssize_t size;
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1801
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	1802 /* Initialize before argument-checking to avoid index_dealloc() crash. */
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	1803 self->raw_length = 0;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	1804 self->added = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	1805 self->cache = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	1806 self->data = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	1807 self->headrevs = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	1808 self->nt = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	1809 self->offsets = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	1810
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1811 if (!PyArg_ParseTuple(args, "OO", &data_obj, &inlined_obj))
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1812 return -1;
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1813 if (!PyString_Check(data_obj)) {
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1814 PyErr_SetString(PyExc_TypeError, "data is not a string");
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1815 return -1;
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1816 }
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1817 size = PyString_GET_SIZE(data_obj);
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1818
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1819 self->inlined = inlined_obj && PyObject_IsTrue(inlined_obj);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1820 self->data = data_obj;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1821
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1822 self->ntlength = self->ntcapacity = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1823 self->ntdepth = self->ntsplits = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1824 self->ntlookups = self->ntmisses = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1825 self->ntrev = -1;
16597 b767382a8675 parsers: fix refcount bug on corrupt index Matt Mackall <mpm@selenic.com> parents: 16572 diff changeset	1826 Py_INCREF(self->data);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1827
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1828 if (self->inlined) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1829 long len = inline_scan(self, NULL);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1830 if (len == -1)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1831 goto bail;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1832 self->raw_length = len;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1833 self->length = len + 1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1834 } else {
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	1835 if (size % v1_hdrsize) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1836 PyErr_SetString(PyExc_ValueError, "corrupt index file");
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1837 goto bail;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1838 }
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	1839 self->raw_length = size / v1_hdrsize;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1840 self->length = self->raw_length + 1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1841 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1842
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1843 return 0;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1844 bail:
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1845 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1846 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1847
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1848 static PyObject index_nodemap(indexObject self)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1849 {
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1850 Py_INCREF(self);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1851 return (PyObject *)self;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1852 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1853
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1854 static void index_dealloc(indexObject *self)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1855 {
16370 28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	1856 _index_clearcaches(self);
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	1857 Py_XDECREF(self->data);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1858 Py_XDECREF(self->added);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1859 PyObject_Del(self);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1860 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1861
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1862 static PySequenceMethods index_sequence_methods = {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1863 (lenfunc)index_length, /* sq_length */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1864 0, /* sq_concat */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1865 0, /* sq_repeat */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1866 (ssizeargfunc)index_get, /* sq_item */
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1867 0, /* sq_slice */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1868 0, /* sq_ass_item */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1869 0, /* sq_ass_slice */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1870 (objobjproc)index_contains, /* sq_contains */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1871 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1872
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1873 static PyMappingMethods index_mapping_methods = {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1874 (lenfunc)index_length, /* mp_length */
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1875 (binaryfunc)index_getitem, /* mp_subscript */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1876 (objobjargproc)index_assign_subscript, /* mp_ass_subscript */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1877 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1878
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1879 static PyMethodDef index_methods[] = {
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1880 {"ancestors", (PyCFunction)index_ancestors, METH_VARARGS,
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1881 "return the gca set of the given revs"},
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1882 {"commonancestorsheads", (PyCFunction)index_commonancestorsheads,
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1883 METH_VARARGS,
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1884 "return the heads of the common ancestors of the given revs"},
16370 28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	1885 {"clearcaches", (PyCFunction)index_clearcaches, METH_NOARGS,
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	1886 "clear the index caches"},
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1887 {"get", (PyCFunction)index_m_get, METH_VARARGS,
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1888 "get an index entry"},
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1889 {"headrevs", (PyCFunction)index_headrevs, METH_NOARGS,
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1890 "get head revisions"},
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1891 {"insert", (PyCFunction)index_insert, METH_VARARGS,
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1892 "insert an index entry"},
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1893 {"partialmatch", (PyCFunction)index_partialmatch, METH_VARARGS,
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1894 "match a potentially ambiguous node ID"},
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1895 {"stats", (PyCFunction)index_stats, METH_NOARGS,
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1896 "stats for the index"},
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1897 {NULL} /* Sentinel */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1898 };
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1899
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1900 static PyGetSetDef index_getset[] = {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1901 {"nodemap", (getter)index_nodemap, NULL, "nodemap", NULL},
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1902 {NULL} /* Sentinel */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1903 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1904
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1905 static PyTypeObject indexType = {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1906 PyObject_HEAD_INIT(NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1907 0, /* ob_size */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1908 "parsers.index", /* tp_name */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1909 sizeof(indexObject), /* tp_basicsize */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1910 0, /* tp_itemsize */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1911 (destructor)index_dealloc, /* tp_dealloc */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1912 0, /* tp_print */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1913 0, /* tp_getattr */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1914 0, /* tp_setattr */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1915 0, /* tp_compare */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1916 0, /* tp_repr */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1917 0, /* tp_as_number */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1918 &index_sequence_methods, /* tp_as_sequence */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1919 &index_mapping_methods, /* tp_as_mapping */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1920 0, /* tp_hash */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1921 0, /* tp_call */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1922 0, /* tp_str */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1923 0, /* tp_getattro */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1924 0, /* tp_setattro */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1925 0, /* tp_as_buffer */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1926 Py_TPFLAGS_DEFAULT, /* tp_flags */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1927 "revlog index", /* tp_doc */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1928 0, /* tp_traverse */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1929 0, /* tp_clear */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1930 0, /* tp_richcompare */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1931 0, /* tp_weaklistoffset */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1932 0, /* tp_iter */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1933 0, /* tp_iternext */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1934 index_methods, /* tp_methods */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1935 0, /* tp_members */
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1936 index_getset, /* tp_getset */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1937 0, /* tp_base */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1938 0, /* tp_dict */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1939 0, /* tp_descr_get */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1940 0, /* tp_descr_set */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1941 0, /* tp_dictoffset */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1942 (initproc)index_init, /* tp_init */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1943 0, /* tp_alloc */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1944 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1945
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1946 /*
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1947 * returns a tuple of the form (index, index, cache) with elements as
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1948 * follows:
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1949 *
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1950 * index: an index object that lazily parses RevlogNG records
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1951 * cache: if data is inlined, a tuple (index_file_content, 0), else None
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1952 *
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1953 * added complications are for backwards compatibility
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1954 */
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	1955 static PyObject parse_index2(PyObject self, PyObject *args)
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1956 {
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1957 PyObject tuple = NULL, cache = NULL;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1958 indexObject *idx;
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1959 int ret;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1960
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1961 idx = PyObject_New(indexObject, &indexType);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1962 if (idx == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1963 goto bail;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1964
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1965 ret = index_init(idx, args);
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	1966 if (ret == -1)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1967 goto bail;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1968
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1969 if (idx->inlined) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1970 cache = Py_BuildValue("iO", 0, idx->data);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1971 if (cache == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1972 goto bail;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1973 } else {
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1974 cache = Py_None;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1975 Py_INCREF(cache);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1976 }
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1977
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1978 tuple = Py_BuildValue("NN", idx, cache);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1979 if (!tuple)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1980 goto bail;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1981 return tuple;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1982
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1983 bail:
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1984 Py_XDECREF(idx);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1985 Py_XDECREF(cache);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1986 Py_XDECREF(tuple);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1987 return NULL;
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1988 }
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	1989
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1990 static char parsers_doc[] = "Efficient content parsing.";
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1991
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	1992 PyObject encodedir(PyObject self, PyObject *args);
17616 9535a0dc41f2 store: implement fncache basic path encoding in C Bryan O'Sullivan <bryano@fb.com> parents: 17606 diff changeset	1993 PyObject pathencode(PyObject self, PyObject *args);
18430 0459c6555f69 store: implement lowerencode in C Bryan O'Sullivan <bryano@fb.com> parents: 17616 diff changeset	1994 PyObject lowerencode(PyObject self, PyObject *args);
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	1995
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1996 static PyMethodDef methods[] = {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	1997 {"pack_dirstate", pack_dirstate, METH_VARARGS, "pack a dirstate\n"},
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1998 {"parse_manifest", parse_manifest, METH_VARARGS, "parse a manifest\n"},
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	1999 {"parse_dirstate", parse_dirstate, METH_VARARGS, "parse a dirstate\n"},
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	2000 {"parse_index2", parse_index2, METH_VARARGS, "parse a revlog index\n"},
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	2001 {"encodedir", encodedir, METH_VARARGS, "encodedir a path\n"},
17616 9535a0dc41f2 store: implement fncache basic path encoding in C Bryan O'Sullivan <bryano@fb.com> parents: 17606 diff changeset	2002 {"pathencode", pathencode, METH_VARARGS, "fncache-encode a path\n"},
18430 0459c6555f69 store: implement lowerencode in C Bryan O'Sullivan <bryano@fb.com> parents: 17616 diff changeset	2003 {"lowerencode", lowerencode, METH_VARARGS, "lower-encode a path\n"},
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2004 {NULL, NULL}
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2005 };
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2006
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	2007 void dirs_module_init(PyObject *mod);
02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	2008
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2009 static void module_init(PyObject *mod)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2010 {
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2011 /* This module constant has two purposes. First, it lets us unit test
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2012 * the ImportError raised without hard-coding any error text. This
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2013 * means we can change the text in the future without breaking tests,
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2014 * even across changesets without a recompile. Second, its presence
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2015 * can be used to determine whether the version-checking logic is
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2016 * present, which also helps in testing across changesets without a
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2017 * recompile. Note that this means the pure-Python version of parsers
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2018 * should not have this module constant. */
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2019 PyModule_AddStringConstant(mod, "versionerrortext", versionerrortext);
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2020
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	2021 dirs_module_init(mod);
02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	2022
16604 48e42f984074 parsers: statically initializing tp_new to PyType_GenericNew is not portable Adrian Buehlmann <adrian@cadifra.com> parents: 16597 diff changeset	2023 indexType.tp_new = PyType_GenericNew;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2024 if (PyType_Ready(&indexType) < 0)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2025 return;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2026 Py_INCREF(&indexType);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2027
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2028 PyModule_AddObject(mod, "index", (PyObject *)&indexType);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2029
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2030 nullentry = Py_BuildValue("iiiiiiis#", 0, 0, 0,
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2031 -1, -1, -1, -1, nullid, 20);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2032 if (nullentry)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2033 PyObject_GC_UnTrack(nullentry);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2034 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2035
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2036 static int check_python_version(void)
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2037 {
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2038 PyObject *sys = PyImport_ImportModule("sys");
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2039 long hexversion = PyInt_AsLong(PyObject_GetAttrString(sys, "hexversion"));
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2040 /* sys.hexversion is a 32-bit number by default, so the -1 case
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2041 * should only occur in unusual circumstances (e.g. if sys.hexversion
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2042 * is manually set to an invalid value). */
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2043 if ((hexversion == -1) \|\| (hexversion >> 16 != PY_VERSION_HEX >> 16)) {
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2044 PyErr_Format(PyExc_ImportError, "%s: The Mercurial extension "
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2045 "modules were compiled with Python " PY_VERSION ", but "
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2046 "Mercurial is currently using Python with sys.hexversion=%ld: "
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2047 "Python %s\n at: %s", versionerrortext, hexversion,
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2048 Py_GetVersion(), Py_GetProgramFullPath());
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2049 return -1;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2050 }
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2051 return 0;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2052 }
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2053
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2054 #ifdef IS_PY3K
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2055 static struct PyModuleDef parsers_module = {
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2056 PyModuleDef_HEAD_INIT,
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2057 "parsers",
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2058 parsers_doc,
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2059 -1,
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2060 methods
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2061 };
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2062
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2063 PyMODINIT_FUNC PyInit_parsers(void)
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2064 {
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	2065 PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	2066
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2067 if (check_python_version() == -1)
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2068 return;
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	2069 mod = PyModule_Create(&parsers_module);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2070 module_init(mod);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2071 return mod;
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2072 }
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2073 #else
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2074 PyMODINIT_FUNC initparsers(void)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2075 {
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	2076 PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	2077
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2078 if (check_python_version() == -1)
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2079 return;
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	2080 mod = Py_InitModule3("parsers", methods, parsers_doc);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2081 module_init(mod);
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2082 }
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2083 #endif

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/parsers.c @ 21807:a96a3d1261c6