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

annotate mercurial/parsers.c @ 25810:82d6a35cf432

parsers: fix buffer overflow by invalid parent revision read from revlog If revlog file is corrupted, it can have parent pointing to invalid revision. So we should validate it before updating nothead[], phases[], seen[], etc. Otherwise it would cause segfault at best. We could use "rev" instead of "maxrev" as upper bound, but I think the explicit "maxrev" can clarify that we just want to avoid possible buffer overflow vulnerability.

author	Yuya Nishihara <yuya@tcha.org>
date	Thu, 16 Jul 2015 23:36:08 +0900
parents	72b2711f12ea
children	895f04955a49

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
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	38 static char lowertable[128] = {
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	39 '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	40 '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	41 '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	42 '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	43 '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	44 '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	45 '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	46 '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	47 '\x40',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	48 '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67', /* A-G */
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	49 '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f', /* H-O */
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	50 '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77', /* P-W */
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	51 '\x78', '\x79', '\x7a', /* X-Z */
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	52 '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	53 '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	54 '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	55 '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	56 '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f'
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	57 };
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	58
24577 bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	59 static char uppertable[128] = {
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	60 '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	61 '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	62 '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	63 '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	64 '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	65 '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	66 '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	67 '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	68 '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	69 '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	70 '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	71 '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	72 '\x60',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	73 '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47', /* a-g */
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	74 '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f', /* h-o */
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	75 '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57', /* p-w */
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	76 '\x58', '\x59', '\x5a', /* x-z */
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	77 '\x7b', '\x7c', '\x7d', '\x7e', '\x7f'
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	78 };
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	79
16617 4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	80 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	81 {
19718 d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	82 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	83
19718 d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	84 if (val >= 0) {
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	85 return val;
d69e06724b96 parsers: use a lookup table to convert hex to binary Siddharth Agarwal <sid0@fb.com> parents: 19652 diff changeset	86 }
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	87
7092 fb3fc27617a2 parsers: speed up hex decoding for manifests Matt Mackall <mpm@selenic.com> parents: 7091 diff changeset	88 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	89 return 0;
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	90 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	91
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	92 /*
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	93 * 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	94 */
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: 24032 diff changeset	95 PyObject unhexlify(const char str, int len)
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	96 {
7092 fb3fc27617a2 parsers: speed up hex decoding for manifests Matt Mackall <mpm@selenic.com> parents: 7091 diff changeset	97 PyObject *ret;
6395 3f0294536b24 fix const annotation warning Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6389 diff changeset	98 char *d;
16617 4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	99 int i;
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	100
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	101 ret = PyBytes_FromStringAndSize(NULL, len / 2);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	102
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	103 if (!ret)
7092 fb3fc27617a2 parsers: speed up hex decoding for manifests Matt Mackall <mpm@selenic.com> parents: 7091 diff changeset	104 return NULL;
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	105
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	106 d = PyBytes_AsString(ret);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	107
16617 4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	108 for (i = 0; i < len;) {
4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	109 int hi = hexdigit(str, i++);
4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	110 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	111 *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	112 }
7091 12b35ae03365 parsers: clean up whitespace Matt Mackall <mpm@selenic.com> parents: 6395 diff changeset	113
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	114 return ret;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	115 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	116
24576 fe173106e7fe parsers: make _asciilower a generic _asciitransform function Siddharth Agarwal <sid0@fb.com> parents: 24575 diff changeset	117 static inline PyObject _asciitransform(PyObject str_obj,
24606 e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	118 const char table[128],
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	119 PyObject *fallback_fn)
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	120 {
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	121 char str, newstr;
24574 e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	122 Py_ssize_t i, len;
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	123 PyObject *newobj = NULL;
24575 a62e957413f7 parsers._asciilower: use an explicit return object Siddharth Agarwal <sid0@fb.com> parents: 24574 diff changeset	124 PyObject *ret = NULL;
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	125
24574 e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	126 str = PyBytes_AS_STRING(str_obj);
e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	127 len = PyBytes_GET_SIZE(str_obj);
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	128
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	129 newobj = PyBytes_FromStringAndSize(NULL, len);
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	130 if (!newobj)
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	131 goto quit;
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	132
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	133 newstr = PyBytes_AS_STRING(newobj);
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	134
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	135 for (i = 0; i < len; i++) {
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	136 char c = str[i];
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	137 if (c & 0x80) {
24606 e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	138 if (fallback_fn != NULL) {
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	139 ret = PyObject_CallFunctionObjArgs(fallback_fn,
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	140 str_obj, NULL);
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	141 } else {
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	142 PyObject *err = PyUnicodeDecodeError_Create(
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	143 "ascii", str, len, i, (i + 1),
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	144 "unexpected code byte");
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	145 PyErr_SetObject(PyExc_UnicodeDecodeError, err);
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	146 Py_XDECREF(err);
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	147 }
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	148 goto quit;
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	149 }
24576 fe173106e7fe parsers: make _asciilower a generic _asciitransform function Siddharth Agarwal <sid0@fb.com> parents: 24575 diff changeset	150 newstr[i] = table[(unsigned char)c];
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	151 }
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	152
24575 a62e957413f7 parsers._asciilower: use an explicit return object Siddharth Agarwal <sid0@fb.com> parents: 24574 diff changeset	153 ret = newobj;
a62e957413f7 parsers._asciilower: use an explicit return object Siddharth Agarwal <sid0@fb.com> parents: 24574 diff changeset	154 Py_INCREF(ret);
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	155 quit:
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	156 Py_XDECREF(newobj);
24575 a62e957413f7 parsers._asciilower: use an explicit return object Siddharth Agarwal <sid0@fb.com> parents: 24574 diff changeset	157 return ret;
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	158 }
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	159
24574 e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	160 static PyObject asciilower(PyObject self, PyObject *args)
e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	161 {
e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	162 PyObject *str_obj;
e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	163 if (!PyArg_ParseTuple(args, "O!:asciilower", &PyBytes_Type, &str_obj))
e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	164 return NULL;
24606 e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	165 return _asciitransform(str_obj, lowertable, NULL);
24574 e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	166 }
e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	167
24577 bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	168 static PyObject asciiupper(PyObject self, PyObject *args)
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	169 {
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	170 PyObject *str_obj;
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	171 if (!PyArg_ParseTuple(args, "O!:asciiupper", &PyBytes_Type, &str_obj))
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	172 return NULL;
24606 e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	173 return _asciitransform(str_obj, uppertable, NULL);
24577 bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	174 }
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	175
25583 ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	176 static inline PyObject *_dict_new_presized(Py_ssize_t expected_size)
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	177 {
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	178 /* _PyDict_NewPresized expects a minused parameter, but it actually
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	179 creates a dictionary that's the nearest power of two bigger than the
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	180 parameter. For example, with the initial minused = 1000, the
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	181 dictionary created has size 1024. Of course in a lot of cases that
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	182 can be greater than the maximum load factor Python's dict object
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	183 expects (= 2/3), so as soon as we cross the threshold we'll resize
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	184 anyway. So create a dictionary that's at least 3/2 the size. */
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	185 return _PyDict_NewPresized(((1 + expected_size) / 2) * 3);
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	186 }
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	187
25584 72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	188 static PyObject dict_new_presized(PyObject self, PyObject *args)
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	189 {
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	190 Py_ssize_t expected_size;
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	191
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	192 if (!PyArg_ParseTuple(args, "n:make_presized_dict", &expected_size))
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	193 return NULL;
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	194
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	195 return _dict_new_presized(expected_size);
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	196 }
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	197
24609 670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	198 static PyObject make_file_foldmap(PyObject self, PyObject *args)
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	199 {
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	200 PyObject dmap, spec_obj, *normcase_fallback;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	201 PyObject *file_foldmap = NULL;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	202 enum normcase_spec spec;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	203 PyObject k, v;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	204 dirstateTupleObject *tuple;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	205 Py_ssize_t pos = 0;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	206 const char *table;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	207
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	208 if (!PyArg_ParseTuple(args, "O!O!O!:make_file_foldmap",
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	209 &PyDict_Type, &dmap,
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	210 &PyInt_Type, &spec_obj,
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	211 &PyFunction_Type, &normcase_fallback))
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	212 goto quit;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	213
24622 1e05f11619bb parsers.c: avoid implicit conversion loses integer precision warning Andr? Sintzoff <andre.sintzoff@gmail.com> parents: 24609 diff changeset	214 spec = (int)PyInt_AS_LONG(spec_obj);
24609 670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	215 switch (spec) {
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	216 case NORMCASE_LOWER:
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	217 table = lowertable;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	218 break;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	219 case NORMCASE_UPPER:
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	220 table = uppertable;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	221 break;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	222 case NORMCASE_OTHER:
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	223 table = NULL;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	224 break;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	225 default:
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	226 PyErr_SetString(PyExc_TypeError, "invalid normcasespec");
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	227 goto quit;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	228 }
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	229
25583 ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	230 /* Add some more entries to deal with additions outside this
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	231 function. */
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	232 file_foldmap = _dict_new_presized((PyDict_Size(dmap) / 10) * 11);
24609 670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	233 if (file_foldmap == NULL)
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	234 goto quit;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	235
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	236 while (PyDict_Next(dmap, &pos, &k, &v)) {
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	237 if (!dirstate_tuple_check(v)) {
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	238 PyErr_SetString(PyExc_TypeError,
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	239 "expected a dirstate tuple");
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	240 goto quit;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	241 }
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	242
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	243 tuple = (dirstateTupleObject *)v;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	244 if (tuple->state != 'r') {
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	245 PyObject *normed;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	246 if (table != NULL) {
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	247 normed = _asciitransform(k, table,
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	248 normcase_fallback);
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	249 } else {
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	250 normed = PyObject_CallFunctionObjArgs(
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	251 normcase_fallback, k, NULL);
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	252 }
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	253
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	254 if (normed == NULL)
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	255 goto quit;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	256 if (PyDict_SetItem(file_foldmap, normed, k) == -1)
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	257 goto quit;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	258 }
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	259 }
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	260 return file_foldmap;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	261 quit:
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	262 Py_XDECREF(file_foldmap);
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	263 return NULL;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	264 }
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	265
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	266 /*
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	267 * 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	268 * ('\n') characters.
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	269 */
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	270 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	271 {
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	272 PyObject mfdict, fdict;
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	273 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	274 int len;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	275
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	276 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	277 &PyDict_Type, &mfdict,
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	278 &PyDict_Type, &fdict,
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	279 &str, &len))
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	280 goto quit;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	281
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	282 start = str;
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	283 end = str + len;
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	284 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	285 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	286 PyObject *flags = NULL;
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	287 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	288 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	289
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	290 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	291 if (!zero) {
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	292 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	293 "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	294 goto quit;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	295 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	296
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	297 newline = memchr(zero + 1, '\n', end - (zero + 1));
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	298 if (!newline) {
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	299 PyErr_SetString(PyExc_ValueError,
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	300 "manifest contains trailing garbage");
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	301 goto quit;
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	302 }
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	303
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	304 file = PyBytes_FromStringAndSize(start, zero - start);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	305
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	306 if (!file)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	307 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	308
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	309 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	310
17356 511dfb34b412 parsers: fix an integer size warning issued by clang Bryan O'Sullivan <bryano@fb.com> parents: 17353 diff changeset	311 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	312 if (!node)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	313 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	314
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	315 if (nlen > 40) {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	316 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	317 nlen - 40);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	318 if (!flags)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	319 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	320
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	321 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	322 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	323 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	324
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	325 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	326 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	327
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	328 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	329
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	330 Py_XDECREF(flags);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	331 Py_XDECREF(node);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	332 Py_XDECREF(file);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	333 continue;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	334 bail:
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	335 Py_XDECREF(flags);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	336 Py_XDECREF(node);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	337 Py_XDECREF(file);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	338 goto quit;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	339 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	340
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	341 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	342 return Py_None;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	343 quit:
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	344 return NULL;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	345 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	346
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	347 static inline dirstateTupleObject *make_dirstate_tuple(char state, int mode,
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	348 int size, int mtime)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	349 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	350 dirstateTupleObject *t = PyObject_New(dirstateTupleObject,
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	351 &dirstateTupleType);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	352 if (!t)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	353 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	354 t->state = state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	355 t->mode = mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	356 t->size = size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	357 t->mtime = mtime;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	358 return t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	359 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	360
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	361 static PyObject dirstate_tuple_new(PyTypeObject subtype, PyObject *args,
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	362 PyObject *kwds)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	363 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	364 /* We do all the initialization here and not a tp_init function because
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	365 * dirstate_tuple is immutable. */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	366 dirstateTupleObject *t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	367 char state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	368 int size, mode, mtime;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	369 if (!PyArg_ParseTuple(args, "ciii", &state, &mode, &size, &mtime))
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	370 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	371
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	372 t = (dirstateTupleObject *)subtype->tp_alloc(subtype, 1);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	373 if (!t)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	374 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	375 t->state = state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	376 t->mode = mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	377 t->size = size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	378 t->mtime = mtime;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	379
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	380 return (PyObject *)t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	381 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	382
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	383 static void dirstate_tuple_dealloc(PyObject *o)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	384 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	385 PyObject_Del(o);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	386 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	387
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	388 static Py_ssize_t dirstate_tuple_length(PyObject *o)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	389 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	390 return 4;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	391 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	392
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	393 static PyObject dirstate_tuple_item(PyObject o, Py_ssize_t i)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	394 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	395 dirstateTupleObject t = (dirstateTupleObject )o;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	396 switch (i) {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	397 case 0:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	398 return PyBytes_FromStringAndSize(&t->state, 1);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	399 case 1:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	400 return PyInt_FromLong(t->mode);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	401 case 2:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	402 return PyInt_FromLong(t->size);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	403 case 3:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	404 return PyInt_FromLong(t->mtime);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	405 default:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	406 PyErr_SetString(PyExc_IndexError, "index out of range");
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	407 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	408 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	409 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	410
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	411 static PySequenceMethods dirstate_tuple_sq = {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	412 dirstate_tuple_length, /* sq_length */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	413 0, /* sq_concat */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	414 0, /* sq_repeat */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	415 dirstate_tuple_item, /* sq_item */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	416 0, /* sq_ass_item */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	417 0, /* sq_contains */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	418 0, /* sq_inplace_concat */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	419 0 /* sq_inplace_repeat */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	420 };
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	421
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	422 PyTypeObject dirstateTupleType = {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	423 PyVarObject_HEAD_INIT(NULL, 0)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	424 "dirstate_tuple", /* tp_name */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	425 sizeof(dirstateTupleObject),/* tp_basicsize */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	426 0, /* tp_itemsize */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	427 (destructor)dirstate_tuple_dealloc, /* tp_dealloc */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	428 0, /* tp_print */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	429 0, /* tp_getattr */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	430 0, /* tp_setattr */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	431 0, /* tp_compare */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	432 0, /* tp_repr */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	433 0, /* tp_as_number */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	434 &dirstate_tuple_sq, /* tp_as_sequence */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	435 0, /* tp_as_mapping */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	436 0, /* tp_hash */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	437 0, /* tp_call */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	438 0, /* tp_str */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	439 0, /* tp_getattro */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	440 0, /* tp_setattro */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	441 0, /* tp_as_buffer */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	442 Py_TPFLAGS_DEFAULT, /* tp_flags */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	443 "dirstate tuple", /* tp_doc */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	444 0, /* tp_traverse */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	445 0, /* tp_clear */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	446 0, /* tp_richcompare */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	447 0, /* tp_weaklistoffset */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	448 0, /* tp_iter */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	449 0, /* tp_iternext */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	450 0, /* tp_methods */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	451 0, /* tp_members */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	452 0, /* tp_getset */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	453 0, /* tp_base */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	454 0, /* tp_dict */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	455 0, /* tp_descr_get */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	456 0, /* tp_descr_set */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	457 0, /* tp_dictoffset */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	458 0, /* tp_init */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	459 0, /* tp_alloc */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	460 dirstate_tuple_new, /* tp_new */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	461 };
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	462
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	463 static PyObject parse_dirstate(PyObject self, PyObject *args)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	464 {
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	465 PyObject dmap, cmap, parents = NULL, ret = NULL;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	466 PyObject fname = NULL, cname = NULL, *entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	467 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	468 int mode, size, mtime;
22403 41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	469 unsigned int flen, len, pos = 40;
41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	470 int readlen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	471
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	472 if (!PyArg_ParseTuple(args, "O!O!s#:parse_dirstate",
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	473 &PyDict_Type, &dmap,
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	474 &PyDict_Type, &cmap,
22403 41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	475 &str, &readlen))
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	476 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	477
22403 41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	478 if (readlen < 0)
41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	479 goto quit;
41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	480
41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	481 len = readlen;
41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	482
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	483 /* read parents */
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	484 if (len < 40)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	485 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	486
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	487 parents = Py_BuildValue("s#s#", str, 20, str + 20, 20);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	488 if (!parents)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	489 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	490
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	491 /* read filenames */
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	492 while (pos >= 40 && pos < len) {
09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	493 cur = str + pos;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	494 /* unpack header */
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	495 state = *cur;
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	496 mode = getbe32(cur + 1);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	497 size = getbe32(cur + 5);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	498 mtime = getbe32(cur + 9);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	499 flen = getbe32(cur + 13);
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	500 pos += 17;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	501 cur += 17;
20316 40f08c31844c parsers: fix 'unsigned expression is always true' warning (issue4142) David Soria Parra <davidsp@fb.com> parents: 20169 diff changeset	502 if (flen > len - pos) {
7174 4da87407b845 parsers.c: fix integer overflows Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7168 diff changeset	503 PyErr_SetString(PyExc_ValueError, "overflow in dirstate");
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	504 goto quit;
7174 4da87407b845 parsers.c: fix integer overflows Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7168 diff changeset	505 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	506
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	507 entry = (PyObject *)make_dirstate_tuple(state, mode, size,
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	508 mtime);
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	509 cpos = memchr(cur, 0, flen);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	510 if (cpos) {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	511 fname = PyBytes_FromStringAndSize(cur, cpos - cur);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	512 cname = PyBytes_FromStringAndSize(cpos + 1,
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	513 flen - (cpos - cur) - 1);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	514 if (!fname \|\| !cname \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	515 PyDict_SetItem(cmap, fname, cname) == -1 \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	516 PyDict_SetItem(dmap, fname, entry) == -1)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	517 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	518 Py_DECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	519 } else {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	520 fname = PyBytes_FromStringAndSize(cur, flen);
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	521 if (!fname \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	522 PyDict_SetItem(dmap, fname, entry) == -1)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	523 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	524 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	525 Py_DECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	526 Py_DECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	527 fname = cname = entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	528 pos += flen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	529 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	530
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	531 ret = parents;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	532 Py_INCREF(ret);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	533 quit:
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	534 Py_XDECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	535 Py_XDECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	536 Py_XDECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	537 Py_XDECREF(parents);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	538 return ret;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	539 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	540
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	541 /*
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	542 * 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	543 */
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	544 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	545 {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	546 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	547 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	548 Py_ssize_t nbytes, pos, l;
23946 f3e94aa6e182 parsers: don't leak a tuple in pack_dirstate Augie Fackler <augie@google.com> parents: 23945 diff changeset	549 PyObject k, v = NULL, *pn;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	550 char p, s;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	551 double now;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	552
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	553 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	554 &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	555 &pl, &now))
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	556 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	557
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	558 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	559 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	560 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	561 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	562
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	563 /* 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	564 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	565 PyObject *c;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	566 if (!PyString_Check(k)) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	567 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	568 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	569 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	570 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	571 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	572 if (c) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	573 if (!PyString_Check(c)) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	574 PyErr_SetString(PyExc_TypeError,
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	575 "expected string key");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	576 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	577 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	578 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	579 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	580 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	581
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	582 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	583 if (packobj == NULL)
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	584 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	585
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	586 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	587
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	588 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	589 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	590 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	591 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	592 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	593 memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	594 p += 20;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	595 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	596 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	597 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	598 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	599 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	600 memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	601 p += 20;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	602
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	603 for (pos = 0; PyDict_Next(map, &pos, &k, &v); ) {
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	604 dirstateTupleObject *tuple;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	605 char state;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	606 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	607 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	608 PyObject *o;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	609 char *t;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	610
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	611 if (!dirstate_tuple_check(v)) {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	612 PyErr_SetString(PyExc_TypeError,
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	613 "expected a dirstate tuple");
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	614 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	615 }
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	616 tuple = (dirstateTupleObject *)v;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	617
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	618 state = tuple->state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	619 mode = tuple->mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	620 size = tuple->size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	621 mtime = tuple->mtime;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	622 if (state == '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	623 /* 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	624 * 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	625 mtime = -1;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	626 mtime_unset = (PyObject *)make_dirstate_tuple(
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	627 state, mode, size, mtime);
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	628 if (!mtime_unset)
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	629 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	630 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	631 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	632 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	633 mtime_unset = NULL;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	634 }
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	635 *p++ = state;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	636 putbe32(mode, p);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	637 putbe32(size, p + 4);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	638 putbe32(mtime, p + 8);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	639 t = p + 12;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	640 p += 16;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	641 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	642 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	643 p += len;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	644 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	645 if (o) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	646 *p++ = '\0';
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	647 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	648 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	649 p += l;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	650 len += l + 1;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	651 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	652 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	653 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	654
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	655 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	656 if (pos != nbytes) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	657 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	658 (long)pos, (long)nbytes);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	659 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	660 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	661
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	662 return packobj;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	663 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	664 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	665 Py_XDECREF(packobj);
23946 f3e94aa6e182 parsers: don't leak a tuple in pack_dirstate Augie Fackler <augie@google.com> parents: 23945 diff changeset	666 Py_XDECREF(v);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	667 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	668 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	669
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	670 /*
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	671 * 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	672 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	673 * 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	674 * 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	675 * Zero is empty
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 typedef struct {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	678 int children[16];
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	679 } nodetree;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	680
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 * 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	683 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	684 * 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	685 * 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	686 * 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	687 * 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	688 * sentinel.
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	689 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	690 * 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	691 * 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	692 */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	693 typedef struct {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	694 PyObject_HEAD
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	695 /* Type-specific fields go here. */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	696 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	697 PyObject *cache; / cached tuples */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	698 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	699 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	700 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	701 PyObject added; / populated on demand */
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	702 PyObject headrevs; / cache, invalidated on changes */
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	703 PyObject filteredrevs;/ filtered revs set */
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	704 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	705 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	706 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	707 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	708 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	709 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	710 int ntlookups; /* # lookups */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	711 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	712 int inlined;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	713 } indexObject;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	714
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	715 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	716 {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	717 if (self->added == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	718 return self->length;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	719 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	720 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	721
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	722 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	723 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	724
22401 9ba8a93e55f5 parsers: ensure correct return type for inline_scan Henrik Stuart <hg@hstuart.dk> parents: 22400 diff changeset	725 static Py_ssize_t inline_scan(indexObject self, const char *offsets);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	726
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	727 #if LONG_MAX == 0x7fffffffL
16393 ee163a9cf37c util.h: more Python 2.4 fixes Matt Mackall <mpm@selenic.com> parents: 16385 diff changeset	728 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	729 #else
16393 ee163a9cf37c util.h: more Python 2.4 fixes Matt Mackall <mpm@selenic.com> parents: 16385 diff changeset	730 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	731 #endif
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	732
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	733 /* 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	734 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	735
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	736 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	737 * 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	738 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	739 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	740 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	741 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	742 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	743 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	744 sizeof(*self->offsets));
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	745 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	746 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	747 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	748 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	749 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	750 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	751
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	752 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	753 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	754
25810 82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	755 static inline int index_get_parents(indexObject *self, Py_ssize_t rev,
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	756 int *ps, int maxrev)
25311 d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	757 {
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	758 if (rev >= self->length - 1) {
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	759 PyObject *tuple = PyList_GET_ITEM(self->added,
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	760 rev - self->length + 1);
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	761 ps[0] = (int)PyInt_AS_LONG(PyTuple_GET_ITEM(tuple, 5));
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	762 ps[1] = (int)PyInt_AS_LONG(PyTuple_GET_ITEM(tuple, 6));
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	763 } else {
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	764 const char *data = index_deref(self, rev);
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	765 ps[0] = getbe32(data + 24);
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	766 ps[1] = getbe32(data + 28);
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	767 }
25810 82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	768 /* If index file is corrupted, ps[] may point to invalid revisions. So
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	769 * there is a risk of buffer overflow to trust them unconditionally. */
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	770 if (ps[0] > maxrev \|\| ps[1] > maxrev) {
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	771 PyErr_SetString(PyExc_ValueError, "parent out of range");
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	772 return -1;
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	773 }
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	774 return 0;
25311 d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	775 }
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	776
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	777
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	778 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	779 * 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	780 * 6 bytes: offset
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	781 * 2 bytes: flags
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	782 * 4 bytes: compressed length
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	783 * 4 bytes: uncompressed length
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	784 * 4 bytes: base revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	785 * 4 bytes: link revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	786 * 4 bytes: parent 1 revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	787 * 4 bytes: parent 2 revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	788 * 32 bytes: nodeid (only 20 bytes used)
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	789 */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	790 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	791 {
7154 7fdf7a0a41b7 index parser: fix refcounting in case of errors, refactor Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7135 diff changeset	792 uint64_t offset_flags;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	793 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	794 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	795 const char *data;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	796 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	797 PyObject *entry;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	798
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	799 if (pos < 0)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	800 pos += length;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	801
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	802 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	803 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	804 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	805 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	806
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	807 if (pos == length - 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	808 Py_INCREF(nullentry);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	809 return nullentry;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	810 }
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	811
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	812 if (pos >= self->length - 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	813 PyObject *obj;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	814 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	815 Py_INCREF(obj);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	816 return obj;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	817 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	818
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	819 if (self->cache) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	820 if (self->cache[pos]) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	821 Py_INCREF(self->cache[pos]);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	822 return self->cache[pos];
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	823 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	824 } else {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	825 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	826 if (self->cache == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	827 return PyErr_NoMemory();
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	828 }
7190 aecea6934fdd Some additional space/tab cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 7186 diff changeset	829
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	830 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	831 if (data == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	832 return NULL;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	833
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	834 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	835 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	836 offset_flags &= 0xFFFF;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	837 else {
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	838 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	839 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	840 }
7154 7fdf7a0a41b7 index parser: fix refcounting in case of errors, refactor Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7135 diff changeset	841
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	842 comp_len = getbe32(data + 8);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	843 uncomp_len = getbe32(data + 12);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	844 base_rev = getbe32(data + 16);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	845 link_rev = getbe32(data + 20);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	846 parent_1 = getbe32(data + 24);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	847 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	848 c_node_id = data + 32;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	849
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	850 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	851 uncomp_len, base_rev, link_rev,
5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	852 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	853
19726 b3c8c6f2b5c1 parsers: use Py_INCREF safely Bryan O'Sullivan <bryano@fb.com> parents: 19725 diff changeset	854 if (entry) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	855 PyObject_GC_UnTrack(entry);
19726 b3c8c6f2b5c1 parsers: use Py_INCREF safely Bryan O'Sullivan <bryano@fb.com> parents: 19725 diff changeset	856 Py_INCREF(entry);
b3c8c6f2b5c1 parsers: use Py_INCREF safely Bryan O'Sullivan <bryano@fb.com> parents: 19725 diff changeset	857 }
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	858
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	859 self->cache[pos] = entry;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	860
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	861 return entry;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	862 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	863
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	864 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	865 * 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	866 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	867 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	868 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	869 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	870 const char *data;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	871
16664 5bc6edf71b39 parsers: ensure that nullid is always present in the radix tree Bryan O'Sullivan <bryano@fb.com> parents: 16663 diff changeset	872 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	873 return nullid;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	874
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	875 if (pos >= length)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	876 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	877
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	878 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	879 PyObject tuple, str;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	880 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	881 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	882 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	883 }
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 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	886 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	887 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	888
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	889 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	890
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	891 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	892 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	893 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	894 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	895 if (*nodelen == 20)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	896 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	897 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	898 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	899 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	900
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	901 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	902 {
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	903 PyObject *obj;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	904 char *node;
22604 5e0d1478db8e parsers: fix Py2.4 argument parsing issue Matt Mackall <mpm@selenic.com> parents: 22540 diff changeset	905 int index;
5e0d1478db8e parsers: fix Py2.4 argument parsing issue Matt Mackall <mpm@selenic.com> parents: 22540 diff changeset	906 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	907
22604 5e0d1478db8e parsers: fix Py2.4 argument parsing issue Matt Mackall <mpm@selenic.com> parents: 22540 diff changeset	908 if (!PyArg_ParseTuple(args, "iO", &index, &obj))
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	909 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	910
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	911 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	912 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	913 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	914 }
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	915
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	916 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	917 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	918
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	919 len = index_length(self);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	920
22604 5e0d1478db8e parsers: fix Py2.4 argument parsing issue Matt Mackall <mpm@selenic.com> parents: 22540 diff changeset	921 if (index < 0)
5e0d1478db8e parsers: fix Py2.4 argument parsing issue Matt Mackall <mpm@selenic.com> parents: 22540 diff changeset	922 index += len;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	923
22604 5e0d1478db8e parsers: fix Py2.4 argument parsing issue Matt Mackall <mpm@selenic.com> parents: 22540 diff changeset	924 if (index != len - 1) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	925 PyErr_SetString(PyExc_IndexError,
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	926 "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	927 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	928 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	929
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	930 if (self->added == NULL) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	931 self->added = PyList_New(0);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	932 if (self->added == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	933 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	934 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	935
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	936 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	937 return NULL;
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	938
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	939 if (self->nt)
22604 5e0d1478db8e parsers: fix Py2.4 argument parsing issue Matt Mackall <mpm@selenic.com> parents: 22540 diff changeset	940 nt_insert(self, node, index);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	941
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	942 Py_CLEAR(self->headrevs);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	943 Py_RETURN_NONE;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	944 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	945
16370 28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	946 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	947 {
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	948 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	949 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	950
16732 277e2acb7e5c parsers: use Py_CLEAR where appropriate Bryan O'Sullivan <bryano@fb.com> parents: 16699 diff changeset	951 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	952 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	953 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	954 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	955 }
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	956 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	957 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	958 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	959 }
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	960 if (self->nt) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	961 free(self->nt);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	962 self->nt = NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	963 }
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	964 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	965 }
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	966
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	967 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	968 {
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	969 _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	970 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	971 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	972 self->ntrev = -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	973 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	974 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	975 }
28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	976
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	977 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	978 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	979 PyObject *obj = PyDict_New();
23948 bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	980 PyObject *t = NULL;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	981
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	982 if (obj == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	983 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	984
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	985 #define istat(__n, __d) \
23948 bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	986 t = PyInt_FromSsize_t(self->__n); \
bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	987 if (!t) \
bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	988 goto bail; \
bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	989 if (PyDict_SetItemString(obj, __d, t) == -1) \
bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	990 goto bail; \
bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	991 Py_DECREF(t);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	992
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	993 if (self->added) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	994 Py_ssize_t len = PyList_GET_SIZE(self->added);
23948 bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	995 t = PyInt_FromSsize_t(len);
bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	996 if (!t)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	997 goto bail;
23948 bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	998 if (PyDict_SetItemString(obj, "index entries added", t) == -1)
bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	999 goto bail;
bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	1000 Py_DECREF(t);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1001 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1002
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1003 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	1004 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	1005 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	1006 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	1007 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	1008 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	1009 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	1010 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	1011 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	1012 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	1013
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1014 #undef istat
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 return obj;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1017
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1018 bail:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1019 Py_XDECREF(obj);
23948 bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	1020 Py_XDECREF(t);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1021 return NULL;
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
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1024 /*
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1025 * 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	1026 * the cached copy.
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1027 */
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1028 static PyObject list_copy(PyObject list)
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1029 {
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1030 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	1031 PyObject *newlist = PyList_New(len);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1032 Py_ssize_t i;
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1033
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1034 if (newlist == NULL)
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1035 return NULL;
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1036
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1037 for (i = 0; i < len; i++) {
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1038 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	1039 Py_INCREF(obj);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1040 PyList_SET_ITEM(newlist, i, obj);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1041 }
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1042
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1043 return newlist;
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1044 }
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1045
23073 5715c93cb854 parsers: use 'k' format for Py_BuildValue instead of 'n' because Python 2.4 Mads Kiilerich <madski@unity3d.com> parents: 22778 diff changeset	1046 /* arg should be Py_ssize_t but Python 2.4 do not support the n format */
5715c93cb854 parsers: use 'k' format for Py_BuildValue instead of 'n' because Python 2.4 Mads Kiilerich <madski@unity3d.com> parents: 22778 diff changeset	1047 static int check_filter(PyObject *filter, unsigned long arg) {
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1048 if (filter) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1049 PyObject arglist, result;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1050 int isfiltered;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1051
23073 5715c93cb854 parsers: use 'k' format for Py_BuildValue instead of 'n' because Python 2.4 Mads Kiilerich <madski@unity3d.com> parents: 22778 diff changeset	1052 arglist = Py_BuildValue("(k)", arg);
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1053 if (!arglist) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1054 return -1;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1055 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1056
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1057 result = PyEval_CallObject(filter, arglist);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1058 Py_DECREF(arglist);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1059 if (!result) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1060 return -1;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1061 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1062
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1063 /* PyObject_IsTrue returns 1 if true, 0 if false, -1 if error,
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1064 * same as this function, so we can just return it directly.*/
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1065 isfiltered = PyObject_IsTrue(result);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1066 Py_DECREF(result);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1067 return isfiltered;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1068 } else {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1069 return 0;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1070 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1071 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1072
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1073 static Py_ssize_t add_roots_get_min(indexObject self, PyObject list,
24499 90db70de6f9c parsers.c: avoid implicit conversion loses integer warnings Andr? Sintzoff <andre.sintzoff@gmail.com> parents: 24443 diff changeset	1074 Py_ssize_t marker, char *phases)
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1075 {
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1076 PyObject *iter = NULL;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1077 PyObject *iter_item = NULL;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1078 Py_ssize_t min_idx = index_length(self) + 1;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1079 long iter_item_long;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1080
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1081 if (PyList_GET_SIZE(list) != 0) {
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1082 iter = PyObject_GetIter(list);
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1083 if (iter == NULL)
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1084 return -2;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1085 while ((iter_item = PyIter_Next(iter)))
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1086 {
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1087 iter_item_long = PyInt_AS_LONG(iter_item);
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1088 Py_DECREF(iter_item);
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1089 if (iter_item_long < min_idx)
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1090 min_idx = iter_item_long;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1091 phases[iter_item_long] = marker;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1092 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1093 Py_DECREF(iter);
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1094 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1095
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1096 return min_idx;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1097 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1098
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1099 static inline void set_phase_from_parents(char *phases, int parent_1,
24499 90db70de6f9c parsers.c: avoid implicit conversion loses integer warnings Andr? Sintzoff <andre.sintzoff@gmail.com> parents: 24443 diff changeset	1100 int parent_2, Py_ssize_t i)
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1101 {
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1102 if (parent_1 >= 0 && phases[parent_1] > phases[i])
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1103 phases[i] = phases[parent_1];
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1104 if (parent_2 >= 0 && phases[parent_2] > phases[i])
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1105 phases[i] = phases[parent_2];
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1106 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1107
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1108 static PyObject compute_phases_map_sets(indexObject self, PyObject *args)
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1109 {
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1110 PyObject *roots = Py_None;
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1111 PyObject *ret = NULL;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1112 PyObject *phaseslist = NULL;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1113 PyObject *phaseroots = NULL;
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1114 PyObject *phaseset = NULL;
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1115 PyObject *phasessetlist = NULL;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1116 Py_ssize_t len = index_length(self) - 1;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1117 Py_ssize_t numphase = 0;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1118 Py_ssize_t minrevallphases = 0;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1119 Py_ssize_t minrevphase = 0;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1120 Py_ssize_t i = 0;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1121 char *phases = NULL;
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1122 long phase;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1123
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1124 if (!PyArg_ParseTuple(args, "O", &roots))
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1125 goto release_none;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1126 if (roots == NULL \|\| !PyList_Check(roots))
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1127 goto release_none;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1128
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1129 phases = calloc(len, 1); /* phase per rev: {0: public, 1: draft, 2: secret} */
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1130 if (phases == NULL)
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1131 goto release_none;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1132 /* Put the phase information of all the roots in phases */
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1133 numphase = PyList_GET_SIZE(roots)+1;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1134 minrevallphases = len + 1;
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1135 phasessetlist = PyList_New(numphase);
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1136 if (phasessetlist == NULL)
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1137 goto release_none;
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1138
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1139 PyList_SET_ITEM(phasessetlist, 0, Py_None);
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1140 Py_INCREF(Py_None);
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1141
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1142 for (i = 0; i < numphase-1; i++) {
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1143 phaseroots = PyList_GET_ITEM(roots, i);
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1144 phaseset = PySet_New(NULL);
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1145 if (phaseset == NULL)
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1146 goto release_phasesetlist;
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1147 PyList_SET_ITEM(phasessetlist, i+1, phaseset);
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1148 if (!PyList_Check(phaseroots))
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1149 goto release_phasesetlist;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1150 minrevphase = add_roots_get_min(self, phaseroots, i+1, phases);
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1151 if (minrevphase == -2) /* Error from add_roots_get_min */
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1152 goto release_phasesetlist;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1153 minrevallphases = MIN(minrevallphases, minrevphase);
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1154 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1155 /* Propagate the phase information from the roots to the revs */
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1156 if (minrevallphases != -1) {
25312 ee02728dd5f9 parsers: simplify the code computing the phases Laurent Charignon <lcharignon@fb.com> parents: 25311 diff changeset	1157 int parents[2];
ee02728dd5f9 parsers: simplify the code computing the phases Laurent Charignon <lcharignon@fb.com> parents: 25311 diff changeset	1158 for (i = minrevallphases; i < len; i++) {
25810 82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	1159 if (index_get_parents(self, i, parents, len - 1) < 0)
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	1160 goto release_phasesetlist;
25312 ee02728dd5f9 parsers: simplify the code computing the phases Laurent Charignon <lcharignon@fb.com> parents: 25311 diff changeset	1161 set_phase_from_parents(phases, parents[0], parents[1], i);
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1162 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1163 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1164 /* Transform phase list to a python list */
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1165 phaseslist = PyList_New(len);
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1166 if (phaseslist == NULL)
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1167 goto release_phasesetlist;
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1168 for (i = 0; i < len; i++) {
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1169 phase = phases[i];
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1170 /* We only store the sets of phase for non public phase, the public phase
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1171 * is computed as a difference */
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1172 if (phase != 0) {
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1173 phaseset = PyList_GET_ITEM(phasessetlist, phase);
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1174 PySet_Add(phaseset, PyInt_FromLong(i));
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1175 }
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1176 PyList_SET_ITEM(phaseslist, i, PyInt_FromLong(phase));
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1177 }
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1178 ret = PyList_New(2);
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1179 if (ret == NULL)
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1180 goto release_phaseslist;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1181
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1182 PyList_SET_ITEM(ret, 0, phaseslist);
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1183 PyList_SET_ITEM(ret, 1, phasessetlist);
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1184 /* We don't release phaseslist and phasessetlist as we return them to
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1185 * python */
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1186 goto release_phases;
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1187
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1188 release_phaseslist:
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1189 Py_XDECREF(phaseslist);
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1190 release_phasesetlist:
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1191 Py_XDECREF(phasessetlist);
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1192 release_phases:
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1193 free(phases);
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1194 release_none:
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	1195 return ret;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1196 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	1197
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1198 static PyObject index_headrevs(indexObject self, PyObject *args)
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1199 {
25297 3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	1200 Py_ssize_t i, j, len;
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1201 char *nothead = NULL;
22540 9a860ac8c216 parsers: fix uninitialize variable warning David Soria Parra <davidsp@fb.com> parents: 22484 diff changeset	1202 PyObject *heads = NULL;
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1203 PyObject *filter = NULL;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1204 PyObject *filteredrevs = Py_None;
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1205
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1206 if (!PyArg_ParseTuple(args, "\|O", &filteredrevs)) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1207 return NULL;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1208 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1209
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1210 if (self->headrevs && filteredrevs == self->filteredrevs)
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1211 return list_copy(self->headrevs);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1212
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1213 Py_DECREF(self->filteredrevs);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1214 self->filteredrevs = filteredrevs;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1215 Py_INCREF(filteredrevs);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1216
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1217 if (filteredrevs != Py_None) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1218 filter = PyObject_GetAttrString(filteredrevs, "__contains__");
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1219 if (!filter) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1220 PyErr_SetString(PyExc_TypeError,
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1221 "filteredrevs has no attribute __contains__");
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1222 goto bail;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1223 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1224 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1225
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1226 len = index_length(self) - 1;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1227 heads = PyList_New(0);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1228 if (heads == NULL)
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1229 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1230 if (len == 0) {
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1231 PyObject *nullid = PyInt_FromLong(-1);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1232 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	1233 Py_XDECREF(nullid);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1234 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1235 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1236 goto done;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1237 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1238
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1239 nothead = calloc(len, 1);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1240 if (nothead == NULL)
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1241 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1242
25297 3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	1243 for (i = 0; i < len; i++) {
3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	1244 int isfiltered;
3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	1245 int parents[2];
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1246
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1247 isfiltered = check_filter(filter, i);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1248 if (isfiltered == -1) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1249 PyErr_SetString(PyExc_TypeError,
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1250 "unable to check filter");
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1251 goto bail;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1252 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1253
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1254 if (isfiltered) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1255 nothead[i] = 1;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1256 continue;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1257 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1258
25810 82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	1259 if (index_get_parents(self, i, parents, len - 1) < 0)
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	1260 goto bail;
25297 3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	1261 for (j = 0; j < 2; j++) {
3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	1262 if (parents[j] >= 0)
3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	1263 nothead[parents[j]] = 1;
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1264 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1265 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1266
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1267 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	1268 PyObject *head;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1269
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1270 if (nothead[i])
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1271 continue;
22400 888bc106de83 parsers: fix typing issue when constructing Python integer object Henrik Stuart <hg@hstuart.dk> parents: 22399 diff changeset	1272 head = PyInt_FromSsize_t(i);
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1273 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	1274 Py_XDECREF(head);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1275 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1276 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1277 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1278
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1279 done:
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1280 self->headrevs = heads;
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1281 Py_XDECREF(filter);
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1282 free(nothead);
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1283 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	1284 bail:
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1285 Py_XDECREF(filter);
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1286 Py_XDECREF(heads);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1287 free(nothead);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1288 return NULL;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1289 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1290
16618 6bae941b58ad parsers: change the type of nt_level Bryan O'Sullivan <bryano@fb.com> parents: 16617 diff changeset	1291 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	1292 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1293 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	1294 if (!(level & 1))
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1295 v >>= 4;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1296 return v & 0xf;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1297 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1298
16616 8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1299 /*
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1300 * Return values:
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1301 *
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1302 * -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	1303 * -2: not found
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1304 * rest: valid rev
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1305 */
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1306 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	1307 int hex)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1308 {
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1309 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	1310 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	1311
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1312 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	1313 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1314
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1315 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	1316 return -2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1317
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1318 if (hex)
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1319 maxlevel = nodelen > 40 ? 40 : (int)nodelen;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1320 else
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1321 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	1322
e6dfbc5df76f parsers: use the correct maximum radix tree depth Bryan O'Sullivan <bryano@fb.com> parents: 16604 diff changeset	1323 for (level = off = 0; level < maxlevel; level++) {
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1324 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	1325 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	1326 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	1327
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1328 if (v < 0) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1329 const char *n;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1330 Py_ssize_t i;
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1331
24879 b3142ea2a0d4 parsers: avoid signed integer overflow in calculation of leaf-node index Yuya Nishihara <yuya@tcha.org> parents: 24736 diff changeset	1332 v = -(v + 1);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1333 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	1334 if (n == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1335 return -2;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1336 for (i = level; i < maxlevel; i++)
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1337 if (getnybble(node, i) != nt_level(n, i))
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1338 return -2;
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1339 return v;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1340 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1341 if (v == 0)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1342 return -2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1343 off = v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1344 }
16616 8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1345 /* 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	1346 return -4;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1347 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1348
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1349 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	1350 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1351 if (self->ntlength == self->ntcapacity) {
24623 2262d7bc469e parsers: check for memory allocation overflows more carefully Bryan O'Sullivan <bryano@fb.com> parents: 24622 diff changeset	1352 if (self->ntcapacity >= INT_MAX / (sizeof(nodetree) * 2)) {
2262d7bc469e parsers: check for memory allocation overflows more carefully Bryan O'Sullivan <bryano@fb.com> parents: 24622 diff changeset	1353 PyErr_SetString(PyExc_MemoryError,
2262d7bc469e parsers: check for memory allocation overflows more carefully Bryan O'Sullivan <bryano@fb.com> parents: 24622 diff changeset	1354 "overflow in nt_new");
2262d7bc469e parsers: check for memory allocation overflows more carefully Bryan O'Sullivan <bryano@fb.com> parents: 24622 diff changeset	1355 return -1;
2262d7bc469e parsers: check for memory allocation overflows more carefully Bryan O'Sullivan <bryano@fb.com> parents: 24622 diff changeset	1356 }
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1357 self->ntcapacity *= 2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1358 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	1359 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	1360 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	1361 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	1362 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1363 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1364 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	1365 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	1366 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1367 return self->ntlength++;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1368 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1369
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1370 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	1371 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1372 int level = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1373 int off = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1374
16641 e6dfbc5df76f parsers: use the correct maximum radix tree depth Bryan O'Sullivan <bryano@fb.com> parents: 16604 diff changeset	1375 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	1376 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	1377 nodetree *n;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1378 int v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1379
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1380 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	1381 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	1382
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1383 if (v == 0) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1384 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	1385 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1386 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1387 if (v < 0) {
24879 b3142ea2a0d4 parsers: avoid signed integer overflow in calculation of leaf-node index Yuya Nishihara <yuya@tcha.org> parents: 24736 diff changeset	1388 const char *oldnode = index_node(self, -(v + 1));
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1389 int noff;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1390
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1391 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	1392 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	1393 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1394 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1395 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	1396 if (noff == -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1397 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1398 /* 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	1399 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	1400 off = noff;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1401 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	1402 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	1403 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	1404 self->ntdepth = level;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1405 self->ntsplits += 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1406 } else {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1407 level += 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1408 off = v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1409 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1410 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1411
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1412 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1413 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1414
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1415 static int nt_init(indexObject *self)
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1416 {
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1417 if (self->nt == NULL) {
24623 2262d7bc469e parsers: check for memory allocation overflows more carefully Bryan O'Sullivan <bryano@fb.com> parents: 24622 diff changeset	1418 if (self->raw_length > INT_MAX / sizeof(nodetree)) {
20110 40b7c6e4b993 mercurial/parsers.c: fix compiler warning Abhay Kadam <abhaykadam88@gmail.com> parents: 19728 diff changeset	1419 PyErr_SetString(PyExc_ValueError, "overflow in nt_init");
40b7c6e4b993 mercurial/parsers.c: fix compiler warning Abhay Kadam <abhaykadam88@gmail.com> parents: 19728 diff changeset	1420 return -1;
40b7c6e4b993 mercurial/parsers.c: fix compiler warning Abhay Kadam <abhaykadam88@gmail.com> parents: 19728 diff changeset	1421 }
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1422 self->ntcapacity = self->raw_length < 4
20110 40b7c6e4b993 mercurial/parsers.c: fix compiler warning Abhay Kadam <abhaykadam88@gmail.com> parents: 19728 diff changeset	1423 ? 4 : (int)self->raw_length / 2;
40b7c6e4b993 mercurial/parsers.c: fix compiler warning Abhay Kadam <abhaykadam88@gmail.com> parents: 19728 diff changeset	1424
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1425 self->nt = calloc(self->ntcapacity, sizeof(nodetree));
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1426 if (self->nt == NULL) {
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1427 PyErr_NoMemory();
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1428 return -1;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1429 }
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1430 self->ntlength = 1;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1431 self->ntrev = (int)index_length(self) - 1;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1432 self->ntlookups = 1;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1433 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	1434 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	1435 return -1;
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1436 }
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1437 return 0;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1438 }
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1439
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1440 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1441 * Return values:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1442 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1443 * -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	1444 * -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	1445 * rest: valid rev
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1446 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1447 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	1448 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	1449 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1450 int rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1451
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1452 self->ntlookups++;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1453 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	1454 if (rev >= -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1455 return rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1456
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1457 if (nt_init(self) == -1)
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1458 return -3;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1459
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1460 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1461 * 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	1462 * 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	1463 * 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	1464 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1465 * 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	1466 * 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	1467 * 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	1468 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1469 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	1470 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	1471 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	1472 if (n == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1473 return -2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1474 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	1475 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	1476 return -3;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1477 break;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1478 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1479 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1480 } else {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1481 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	1482 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	1483 if (n == NULL) {
1d800eb9ba52 parsers: update ntrev when we stop scanning Bryan O'Sullivan <bryano@fb.com> parents: 16597 diff changeset	1484 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	1485 return -2;
16614 1d800eb9ba52 parsers: update ntrev when we stop scanning Bryan O'Sullivan <bryano@fb.com> parents: 16597 diff changeset	1486 }
1d800eb9ba52 parsers: update ntrev when we stop scanning Bryan O'Sullivan <bryano@fb.com> parents: 16597 diff changeset	1487 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	1488 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	1489 return -3;
16614 1d800eb9ba52 parsers: update ntrev when we stop scanning Bryan O'Sullivan <bryano@fb.com> parents: 16597 diff changeset	1490 }
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1491 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	1492 break;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1493 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1494 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1495 self->ntrev = rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1496 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1497
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1498 if (rev >= 0)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1499 return rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1500 return -2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1501 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1502
25561 50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1503 static void raise_revlog_error(void)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1504 {
25561 50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1505 PyObject mod = NULL, dict = NULL, *errclass = NULL;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1506
25561 50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1507 mod = PyImport_ImportModule("mercurial.error");
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1508 if (mod == NULL) {
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1509 goto cleanup;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1510 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1511
25561 50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1512 dict = PyModule_GetDict(mod);
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1513 if (dict == NULL) {
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1514 goto cleanup;
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1515 }
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1516 Py_INCREF(dict);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1517
25561 50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1518 errclass = PyDict_GetItemString(dict, "RevlogError");
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1519 if (errclass == NULL) {
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1520 PyErr_SetString(PyExc_SystemError,
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1521 "could not find RevlogError");
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1522 goto cleanup;
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1523 }
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1524
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1525 /* value of exception is ignored by callers */
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1526 PyErr_SetString(errclass, "RevlogError");
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1527
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1528 cleanup:
50a6c3c55db1 parsers: do not cache RevlogError type (issue4451) Gregory Szorc <gregory.szorc@gmail.com> parents: 24879 diff changeset	1529 Py_XDECREF(dict);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1530 Py_XDECREF(mod);
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1531 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1532
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1533 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	1534 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1535 char *node;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1536 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	1537 int rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1538
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1539 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	1540 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	1541
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1542 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	1543 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1544 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	1545 if (rev >= -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1546 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	1547 if (rev == -2)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1548 raise_revlog_error();
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1549 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1550 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1551
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1552 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	1553 Py_ssize_t nodelen)
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1554 {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1555 int rev;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1556
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1557 if (nt_init(self) == -1)
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1558 return -3;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1559
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1560 if (self->ntrev > 0) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1561 /* 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	1562 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	1563 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	1564 if (n == NULL)
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1565 return -2;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1566 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	1567 return -3;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1568 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1569 self->ntrev = rev;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1570 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1571
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1572 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	1573 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1574
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1575 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	1576 {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1577 const char *fullnode;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1578 int nodelen;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1579 char *node;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1580 int rev, i;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1581
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1582 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	1583 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1584
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1585 if (nodelen < 4) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1586 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	1587 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1588 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1589
17353 bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	1590 if (nodelen > 40) {
bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	1591 PyErr_SetString(PyExc_ValueError, "key too long");
bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	1592 return NULL;
bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	1593 }
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1594
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1595 for (i = 0; i < nodelen; i++)
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1596 hexdigit(node, i);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1597 if (PyErr_Occurred()) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1598 /* input contains non-hex characters */
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1599 PyErr_Clear();
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1600 Py_RETURN_NONE;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1601 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1602
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1603 rev = nt_partialmatch(self, node, nodelen);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1604
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1605 switch (rev) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1606 case -4:
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1607 raise_revlog_error();
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1608 case -3:
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1609 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1610 case -2:
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1611 Py_RETURN_NONE;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1612 case -1:
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1613 return PyString_FromStringAndSize(nullid, 20);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1614 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1615
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1616 fullnode = index_node(self, rev);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1617 if (fullnode == NULL) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1618 PyErr_Format(PyExc_IndexError,
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1619 "could not access rev %d", rev);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1620 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1621 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1622 return PyString_FromStringAndSize(fullnode, 20);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1623 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1624
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1625 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	1626 {
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1627 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	1628 PyObject *val;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1629 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	1630 int rev;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1631
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1632 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	1633 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	1634 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	1635 return NULL;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1636 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	1637 if (rev == -3)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1638 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1639 if (rev == -2)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1640 Py_RETURN_NONE;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1641 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	1642 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1643
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1644 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	1645 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1646 char *node;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1647 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	1648
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1649 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	1650 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	1651 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	1652 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1653
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1654 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	1655 return -1;
16414 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 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	1658 case -3:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1659 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1660 case -2:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1661 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1662 default:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1663 return 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1664 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1665 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1666
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1667 typedef uint64_t bitmask;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1668
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1669 /*
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1670 * 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	1671 * 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	1672 * "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	1673 */
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1674 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	1675 int revcount)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1676 {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1677 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	1678 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	1679 PyObject *gca = PyList_New(0);
20555 4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	1680 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	1681 int maxrev = -1;
22399 9f490afcb067 parsers: use bitmask type consistently in find_gca_candidates Henrik Stuart <hg@hstuart.dk> parents: 21871 diff changeset	1682 bitmask sp;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1683 bitmask *seen;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1684
19727 3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1685 if (gca == NULL)
3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1686 return PyErr_NoMemory();
3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1687
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1688 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	1689 if (revs[i] > maxrev)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1690 maxrev = revs[i];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1691 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1692
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1693 seen = calloc(sizeof(*seen), maxrev + 1);
19727 3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1694 if (seen == NULL) {
3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1695 Py_DECREF(gca);
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1696 return PyErr_NoMemory();
19727 3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1697 }
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1698
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1699 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	1700 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	1701
20555 4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	1702 interesting = revcount;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1703
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1704 for (v = maxrev; v >= 0 && interesting; v--) {
22399 9f490afcb067 parsers: use bitmask type consistently in find_gca_candidates Henrik Stuart <hg@hstuart.dk> parents: 21871 diff changeset	1705 bitmask sv = seen[v];
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1706 int parents[2];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1707
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1708 if (!sv)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1709 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1710
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1711 if (sv < poison) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1712 interesting -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1713 if (sv == allseen) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1714 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	1715 if (obj == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1716 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1717 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	1718 Py_DECREF(obj);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1719 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1720 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1721 sv \|= poison;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1722 for (i = 0; i < revcount; i++) {
20555 4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	1723 if (revs[i] == v)
4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	1724 goto done;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1725 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1726 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1727 }
25810 82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	1728 if (index_get_parents(self, v, parents, maxrev) < 0)
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	1729 goto bail;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1730
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1731 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	1732 int p = parents[i];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1733 if (p == -1)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1734 continue;
19030 48d6f436363e parsers: fix variable declaration position issue Matt Mackall <mpm@selenic.com> parents: 18988 diff changeset	1735 sp = seen[p];
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1736 if (sv < poison) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1737 if (sp == 0) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1738 seen[p] = sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1739 interesting++;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1740 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1741 else if (sp != sv)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1742 seen[p] \|= sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1743 } else {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1744 if (sp && sp < poison)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1745 interesting--;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1746 seen[p] = sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1747 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1748 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1749 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1750
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1751 done:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1752 free(seen);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1753 return gca;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1754 bail:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1755 free(seen);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1756 Py_XDECREF(gca);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1757 return NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1758 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1759
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1760 /*
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1761 * 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	1762 * path to the root.
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1763 */
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1764 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	1765 {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1766 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	1767 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	1768 int depth, interesting = NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1769 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	1770 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	1771 long *seen = NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1772 int maxrev = -1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1773 long final;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1774
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1775 if (revcount > capacity) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1776 PyErr_Format(PyExc_OverflowError,
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1777 "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	1778 (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	1779 return NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1780 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1781
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1782 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	1783 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	1784 if (n > maxrev)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1785 maxrev = n;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1786 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1787
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1788 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	1789 if (depth == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1790 return PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1791
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1792 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	1793 if (seen == NULL) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1794 PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1795 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1796 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1797
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1798 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	1799 if (interesting == NULL) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1800 PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1801 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1802 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1803
19502 8704477ad3b6 ancestor.deepest: sort revs in C version Siddharth Agarwal <sid0@fb.com> parents: 19062 diff changeset	1804 if (PyList_Sort(revs) == -1)
8704477ad3b6 ancestor.deepest: sort revs in C version Siddharth Agarwal <sid0@fb.com> parents: 19062 diff changeset	1805 goto bail;
8704477ad3b6 ancestor.deepest: sort revs in C version Siddharth Agarwal <sid0@fb.com> parents: 19062 diff changeset	1806
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1807 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	1808 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	1809 long b = 1l << i;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1810 depth[n] = 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1811 seen[n] = b;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1812 interesting[b] = 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1813 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1814
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1815 ninteresting = (int)revcount;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1816
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1817 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	1818 int dv = depth[v];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1819 int parents[2];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1820 long sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1821
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1822 if (dv == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1823 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1824
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1825 sv = seen[v];
25810 82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	1826 if (index_get_parents(self, v, parents, maxrev) < 0)
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	1827 goto bail;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1828
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1829 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	1830 int p = parents[i];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1831 long nsp, sp;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1832 int dp;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1833
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1834 if (p == -1)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1835 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1836
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1837 dp = depth[p];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1838 nsp = sp = seen[p];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1839 if (dp <= dv) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1840 depth[p] = dv + 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1841 if (sp != sv) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1842 interesting[sv] += 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1843 nsp = seen[p] = sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1844 if (sp) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1845 interesting[sp] -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1846 if (interesting[sp] == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1847 ninteresting -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1848 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1849 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1850 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1851 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	1852 nsp = sp \| sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1853 if (nsp == sp)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1854 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1855 seen[p] = nsp;
19503 f2dfda6ac152 ancestor.deepest: decrement ninteresting correctly (issue3984) Wei, Elson <elson.wei@gmail.com> parents: 19502 diff changeset	1856 interesting[sp] -= 1;
f2dfda6ac152 ancestor.deepest: decrement ninteresting correctly (issue3984) Wei, Elson <elson.wei@gmail.com> parents: 19502 diff changeset	1857 if (interesting[sp] == 0 && interesting[nsp] > 0)
f2dfda6ac152 ancestor.deepest: decrement ninteresting correctly (issue3984) Wei, Elson <elson.wei@gmail.com> parents: 19502 diff changeset	1858 ninteresting -= 1;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1859 interesting[nsp] += 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1860 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1861 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1862 interesting[sv] -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1863 if (interesting[sv] == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1864 ninteresting -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1865 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1866
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1867 final = 0;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1868 j = ninteresting;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1869 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	1870 if (interesting[i] == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1871 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1872 final \|= i;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1873 j -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1874 }
21730 8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1875 if (final == 0) {
8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1876 keys = PyList_New(0);
8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1877 goto bail;
8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1878 }
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1879
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1880 dict = PyDict_New();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1881 if (dict == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1882 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1883
19504 2fa303619b4d ancestor.deepest: ignore ninteresting while building result (issue3984) Siddharth Agarwal <sid0@fb.com> parents: 19503 diff changeset	1884 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	1885 PyObject *key;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1886
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1887 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	1888 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1889
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1890 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	1891 Py_INCREF(key);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1892 Py_INCREF(Py_None);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1893 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	1894 Py_DECREF(key);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1895 Py_DECREF(Py_None);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1896 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1897 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1898 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1899
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1900 keys = PyDict_Keys(dict);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1901
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1902 bail:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1903 free(depth);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1904 free(seen);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1905 free(interesting);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1906 Py_XDECREF(dict);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1907
21730 8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1908 return keys;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1909 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1910
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1911 /*
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1912 * Given a (possibly overlapping) set of revs, return all the
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1913 * common ancestors heads: heads(::args[0] and ::a[1] and ...)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1914 */
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1915 static PyObject index_commonancestorsheads(indexObject self, PyObject *args)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1916 {
21103 628c16489d1c parsers: remove unnecessary gca variable in index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 21102 diff changeset	1917 PyObject *ret = NULL;
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1918 Py_ssize_t argcount, i, len;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1919 bitmask repeat = 0;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1920 int revcount = 0;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1921 int *revs;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1922
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1923 argcount = PySequence_Length(args);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1924 revs = malloc(argcount * sizeof(*revs));
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1925 if (argcount > 0 && revs == NULL)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1926 return PyErr_NoMemory();
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1927 len = index_length(self) - 1;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1928
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1929 for (i = 0; i < argcount; i++) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1930 static const int capacity = 24;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1931 PyObject *obj = PySequence_GetItem(args, i);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1932 bitmask x;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1933 long val;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1934
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1935 if (!PyInt_Check(obj)) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1936 PyErr_SetString(PyExc_TypeError,
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1937 "arguments must all be ints");
23945 33d6aaf84c9e parsers.c: fix a memory leak in index_commonancestorsheads Augie Fackler <augie@google.com> parents: 23944 diff changeset	1938 Py_DECREF(obj);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1939 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1940 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1941 val = PyInt_AsLong(obj);
23945 33d6aaf84c9e parsers.c: fix a memory leak in index_commonancestorsheads Augie Fackler <augie@google.com> parents: 23944 diff changeset	1942 Py_DECREF(obj);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1943 if (val == -1) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1944 ret = PyList_New(0);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1945 goto done;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1946 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1947 if (val < 0 \|\| val >= len) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1948 PyErr_SetString(PyExc_IndexError,
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1949 "index out of range");
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1950 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1951 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1952 /* this cheesy bloom filter lets us avoid some more
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1953 * expensive duplicate checks in the common set-is-disjoint
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1954 * case */
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1955 x = 1ull << (val & 0x3f);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1956 if (repeat & x) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1957 int k;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1958 for (k = 0; k < revcount; k++) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1959 if (val == revs[k])
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1960 goto duplicate;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1961 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1962 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1963 else repeat \|= x;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1964 if (revcount >= capacity) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1965 PyErr_Format(PyExc_OverflowError,
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1966 "bitset size (%d) > capacity (%d)",
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1967 revcount, capacity);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1968 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1969 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1970 revs[revcount++] = (int)val;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1971 duplicate:;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1972 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1973
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1974 if (revcount == 0) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1975 ret = PyList_New(0);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1976 goto done;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1977 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1978 if (revcount == 1) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1979 PyObject *obj;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1980 ret = PyList_New(1);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1981 if (ret == NULL)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1982 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1983 obj = PyInt_FromLong(revs[0]);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1984 if (obj == NULL)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1985 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1986 PyList_SET_ITEM(ret, 0, obj);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1987 goto done;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1988 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1989
21103 628c16489d1c parsers: remove unnecessary gca variable in index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 21102 diff changeset	1990 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	1991 if (ret == NULL)
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1992 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1993
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1994 done:
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1995 free(revs);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1996 return ret;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1997
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1998 bail:
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1999 free(revs);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2000 Py_XDECREF(ret);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2001 return NULL;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2002 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2003
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2004 /*
24004 8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2005 * Given a (possibly overlapping) set of revs, return the greatest
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2006 * common ancestors: those with the longest path to the root.
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2007 */
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2008 static PyObject index_ancestors(indexObject self, PyObject *args)
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2009 {
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2010 PyObject *gca = index_commonancestorsheads(self, args);
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2011 if (gca == NULL)
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2012 return NULL;
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2013
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2014 if (PyList_GET_SIZE(gca) <= 1) {
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2015 Py_INCREF(gca);
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2016 return gca;
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2017 }
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2018
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2019 return find_deepest(self, gca);
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2020 }
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2021
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2022 /*
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2023 * 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	2024 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2025 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	2026 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2027 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	2028
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2029 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	2030 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	2031 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	2032
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2033 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	2034 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2035
16732 277e2acb7e5c parsers: use Py_CLEAR where appropriate Bryan O'Sullivan <bryano@fb.com> parents: 16699 diff changeset	2036 if (start == 0)
277e2acb7e5c parsers: use Py_CLEAR where appropriate Bryan O'Sullivan <bryano@fb.com> parents: 16699 diff changeset	2037 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	2038 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2039
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2040 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2041 * 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	2042 * 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	2043 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2044 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	2045 {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2046 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	2047 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	2048 int ret = 0;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2049
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2050 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	2051 &start, &stop, &step, &slicelength) < 0)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2052 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2053
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2054 if (slicelength <= 0)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2055 return 0;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2056
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2057 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	2058 stop = start;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2059
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2060 if (step < 0) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2061 stop = start + 1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2062 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	2063 step = -step;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2064 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2065
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2066 if (step != 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2067 PyErr_SetString(PyExc_ValueError,
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2068 "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	2069 return -1;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2070 }
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2071
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2072 if (stop != length - 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2073 PyErr_SetString(PyExc_IndexError,
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2074 "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	2075 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2076 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2077
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2078 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	2079 if (self->nt) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2080 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	2081
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2082 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	2083 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	2084
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2085 if (node)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2086 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	2087 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2088 if (self->added)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2089 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	2090 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	2091 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	2092 }
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2093 self->length = start + 1;
18504 d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	2094 if (start < self->raw_length) {
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	2095 if (self->cache) {
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	2096 Py_ssize_t i;
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	2097 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	2098 Py_CLEAR(self->cache[i]);
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	2099 }
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2100 self->raw_length = start;
18504 d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	2101 }
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2102 goto done;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2103 }
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2104
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2105 if (self->nt) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2106 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	2107 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	2108 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	2109 }
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2110 if (self->added)
12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2111 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	2112 PyList_GET_SIZE(self->added), NULL);
12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2113 done:
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	2114 Py_CLEAR(self->headrevs);
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2115 return ret;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2116 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2117
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2118 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2119 * Supported ops:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2120 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2121 * slice deletion
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2122 * 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	2123 * 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	2124 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2125 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	2126 PyObject *value)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2127 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2128 char *node;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2129 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	2130 long rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2131
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2132 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	2133 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	2134
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2135 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	2136 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2137
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2138 if (value == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2139 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	2140 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	2141 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	2142 if (!PyErr_Occurred())
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2143 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	2144 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2145 }
23468 ee311681e591 parsers: ensure revlog index node tree is initialized before insertion Mike Edgar <adgar@google.com> parents: 23087 diff changeset	2146
ee311681e591 parsers: ensure revlog index node tree is initialized before insertion Mike Edgar <adgar@google.com> parents: 23087 diff changeset	2147 if (nt_init(self) == -1)
ee311681e591 parsers: ensure revlog index node tree is initialized before insertion Mike Edgar <adgar@google.com> parents: 23087 diff changeset	2148 return -1;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2149 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	2150 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2151
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2152 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2153 * 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	2154 * 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	2155 */
22401 9ba8a93e55f5 parsers: ensure correct return type for inline_scan Henrik Stuart <hg@hstuart.dk> parents: 22400 diff changeset	2156 static Py_ssize_t inline_scan(indexObject self, const char *offsets)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2157 {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2158 const char *data = PyString_AS_STRING(self->data);
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2159 Py_ssize_t pos = 0;
09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2160 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	2161 long incr = v1_hdrsize;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2162 Py_ssize_t len = 0;
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	2163
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2164 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	2165 uint32_t comp_len;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2166 /* 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	2167 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	2168 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	2169 if (offsets)
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2170 offsets[len] = data + pos;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2171 len++;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2172 pos += incr;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2173 }
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	2174
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2175 if (pos != end) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2176 if (!PyErr_Occurred())
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2177 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	2178 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2179 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2180
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2181 return len;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2182 }
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	2183
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2184 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	2185 {
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2186 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	2187 Py_ssize_t size;
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2188
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2189 /* 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	2190 self->raw_length = 0;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2191 self->added = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2192 self->cache = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2193 self->data = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2194 self->headrevs = NULL;
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	2195 self->filteredrevs = Py_None;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	2196 Py_INCREF(Py_None);
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2197 self->nt = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2198 self->offsets = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2199
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2200 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	2201 return -1;
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2202 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	2203 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	2204 return -1;
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2205 }
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2206 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	2207
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2208 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	2209 self->data = data_obj;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2210
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2211 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	2212 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	2213 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	2214 self->ntrev = -1;
16597 b767382a8675 parsers: fix refcount bug on corrupt index Matt Mackall <mpm@selenic.com> parents: 16572 diff changeset	2215 Py_INCREF(self->data);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2216
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2217 if (self->inlined) {
22401 9ba8a93e55f5 parsers: ensure correct return type for inline_scan Henrik Stuart <hg@hstuart.dk> parents: 22400 diff changeset	2218 Py_ssize_t len = inline_scan(self, NULL);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2219 if (len == -1)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2220 goto bail;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2221 self->raw_length = len;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2222 self->length = len + 1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2223 } else {
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	2224 if (size % v1_hdrsize) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2225 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	2226 goto bail;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2227 }
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	2228 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	2229 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	2230 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2231
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2232 return 0;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2233 bail:
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2234 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2235 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2236
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2237 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	2238 {
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2239 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	2240 return (PyObject *)self;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2241 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2242
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2243 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	2244 {
16370 28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	2245 _index_clearcaches(self);
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	2246 Py_XDECREF(self->filteredrevs);
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2247 Py_XDECREF(self->data);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2248 Py_XDECREF(self->added);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2249 PyObject_Del(self);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2250 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2251
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2252 static PySequenceMethods index_sequence_methods = {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2253 (lenfunc)index_length, /* sq_length */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2254 0, /* sq_concat */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2255 0, /* sq_repeat */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2256 (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	2257 0, /* sq_slice */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2258 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	2259 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	2260 (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	2261 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2262
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2263 static PyMappingMethods index_mapping_methods = {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2264 (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	2265 (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	2266 (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	2267 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2268
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2269 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	2270 {"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	2271 "return the gca set of the given revs"},
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2272 {"commonancestorsheads", (PyCFunction)index_commonancestorsheads,
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2273 METH_VARARGS,
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2274 "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	2275 {"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	2276 "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	2277 {"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	2278 "get an index entry"},
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	2279 {"computephasesmapsets", (PyCFunction)compute_phases_map_sets,
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	2280 METH_VARARGS, "compute phases"},
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	2281 {"headrevs", (PyCFunction)index_headrevs, METH_VARARGS,
23087 42342f9afe01 parsers: introduce headrevsfiltered in C extension Mads Kiilerich <madski@unity3d.com> parents: 23073 diff changeset	2282 "get head revisions"}, /* Can do filtering since 3.2 */
42342f9afe01 parsers: introduce headrevsfiltered in C extension Mads Kiilerich <madski@unity3d.com> parents: 23073 diff changeset	2283 {"headrevsfiltered", (PyCFunction)index_headrevs, METH_VARARGS,
42342f9afe01 parsers: introduce headrevsfiltered in C extension Mads Kiilerich <madski@unity3d.com> parents: 23073 diff changeset	2284 "get filtered head revisions"}, /* Can always do filtering */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2285 {"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	2286 "insert an index entry"},
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2287 {"partialmatch", (PyCFunction)index_partialmatch, METH_VARARGS,
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2288 "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	2289 {"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	2290 "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	2291 {NULL} /* Sentinel */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2292 };
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2293
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2294 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	2295 {"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	2296 {NULL} /* Sentinel */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2297 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2298
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2299 static PyTypeObject indexType = {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2300 PyObject_HEAD_INIT(NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2301 0, /* ob_size */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2302 "parsers.index", /* tp_name */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2303 sizeof(indexObject), /* tp_basicsize */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2304 0, /* tp_itemsize */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2305 (destructor)index_dealloc, /* tp_dealloc */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2306 0, /* tp_print */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2307 0, /* tp_getattr */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2308 0, /* tp_setattr */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2309 0, /* tp_compare */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2310 0, /* tp_repr */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2311 0, /* tp_as_number */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2312 &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	2313 &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	2314 0, /* tp_hash */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2315 0, /* tp_call */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2316 0, /* tp_str */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2317 0, /* tp_getattro */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2318 0, /* tp_setattro */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2319 0, /* tp_as_buffer */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2320 Py_TPFLAGS_DEFAULT, /* tp_flags */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2321 "revlog index", /* tp_doc */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2322 0, /* tp_traverse */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2323 0, /* tp_clear */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2324 0, /* tp_richcompare */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2325 0, /* tp_weaklistoffset */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2326 0, /* tp_iter */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2327 0, /* tp_iternext */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2328 index_methods, /* tp_methods */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2329 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	2330 index_getset, /* tp_getset */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2331 0, /* tp_base */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2332 0, /* tp_dict */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2333 0, /* tp_descr_get */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2334 0, /* tp_descr_set */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2335 0, /* tp_dictoffset */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2336 (initproc)index_init, /* tp_init */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2337 0, /* tp_alloc */
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2338 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2339
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2340 /*
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2341 * 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	2342 * follows:
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2343 *
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2344 * 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	2345 * 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	2346 *
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2347 * added complications are for backwards compatibility
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2348 */
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	2349 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	2350 {
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2351 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	2352 indexObject *idx;
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2353 int ret;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2354
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2355 idx = PyObject_New(indexObject, &indexType);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2356 if (idx == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2357 goto bail;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2358
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2359 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	2360 if (ret == -1)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2361 goto bail;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2362
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2363 if (idx->inlined) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2364 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	2365 if (cache == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2366 goto bail;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2367 } else {
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2368 cache = Py_None;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2369 Py_INCREF(cache);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2370 }
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2371
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2372 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	2373 if (!tuple)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2374 goto bail;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2375 return tuple;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2376
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2377 bail:
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2378 Py_XDECREF(idx);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2379 Py_XDECREF(cache);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2380 Py_XDECREF(tuple);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2381 return NULL;
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2382 }
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2383
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2384 #define BUMPED_FIX 1
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2385 #define USING_SHA_256 2
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2386
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2387 static PyObject *readshas(
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2388 const char *source, unsigned char num, Py_ssize_t hashwidth)
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2389 {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2390 int i;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2391 PyObject *list = PyTuple_New(num);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2392 if (list == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2393 return NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2394 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2395 for (i = 0; i < num; i++) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2396 PyObject *hash = PyString_FromStringAndSize(source, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2397 if (hash == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2398 Py_DECREF(list);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2399 return NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2400 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2401 PyTuple_SetItem(list, i, hash);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2402 source += hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2403 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2404 return list;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2405 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2406
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2407 static PyObject fm1readmarker(const char data, uint32_t *msize)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2408 {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2409 const char *meta;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2410
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2411 double mtime;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2412 int16_t tz;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2413 uint16_t flags;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2414 unsigned char nsuccs, nparents, nmetadata;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2415 Py_ssize_t hashwidth = 20;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2416
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2417 PyObject prec = NULL, parents = NULL, *succs = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2418 PyObject metadata = NULL, ret = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2419 int i;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2420
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2421 *msize = getbe32(data);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2422 data += 4;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2423 mtime = getbefloat64(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2424 data += 8;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2425 tz = getbeint16(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2426 data += 2;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2427 flags = getbeuint16(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2428 data += 2;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2429
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2430 if (flags & USING_SHA_256) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2431 hashwidth = 32;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2432 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2433
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2434 nsuccs = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2435 nparents = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2436 nmetadata = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2437
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2438 prec = PyString_FromStringAndSize(data, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2439 data += hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2440 if (prec == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2441 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2442 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2443
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2444 succs = readshas(data, nsuccs, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2445 if (succs == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2446 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2447 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2448 data += nsuccs * hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2449
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2450 if (nparents == 1 \|\| nparents == 2) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2451 parents = readshas(data, nparents, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2452 if (parents == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2453 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2454 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2455 data += nparents * hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2456 } else {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2457 parents = Py_None;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2458 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2459
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2460 meta = data + (2 * nmetadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2461 metadata = PyTuple_New(nmetadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2462 if (metadata == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2463 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2464 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2465 for (i = 0; i < nmetadata; i++) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2466 PyObject tmp, left = NULL, *right = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2467 Py_ssize_t metasize = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2468 left = PyString_FromStringAndSize(meta, metasize);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2469 meta += metasize;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2470 metasize = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2471 right = PyString_FromStringAndSize(meta, metasize);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2472 meta += metasize;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2473 if (!left \|\| !right) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2474 Py_XDECREF(left);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2475 Py_XDECREF(right);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2476 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2477 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2478 tmp = PyTuple_Pack(2, left, right);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2479 Py_DECREF(left);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2480 Py_DECREF(right);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2481 if (!tmp) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2482 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2483 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2484 PyTuple_SetItem(metadata, i, tmp);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2485 }
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2486 ret = Py_BuildValue("(OOHO(di)O)", prec, succs, flags,
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2487 metadata, mtime, (int)tz * 60, parents);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2488 bail:
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2489 Py_XDECREF(prec);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2490 Py_XDECREF(succs);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2491 Py_XDECREF(metadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2492 if (parents != Py_None)
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2493 Py_XDECREF(parents);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2494 return ret;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2495 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2496
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2497
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2498 static PyObject fm1readmarkers(PyObject self, PyObject *args) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2499 const char *data;
24032 c53bc2e52514 parsers: use k instead of n for PyArg_ParseTuple because python 2.4 is awful Augie Fackler <augie@google.com> parents: 24019 diff changeset	2500 Py_ssize_t datalen;
c53bc2e52514 parsers: use k instead of n for PyArg_ParseTuple because python 2.4 is awful Augie Fackler <augie@google.com> parents: 24019 diff changeset	2501 /* only unsigned long because python 2.4, should be Py_ssize_t */
c53bc2e52514 parsers: use k instead of n for PyArg_ParseTuple because python 2.4 is awful Augie Fackler <augie@google.com> parents: 24019 diff changeset	2502 unsigned long offset, stop;
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2503 PyObject *markers = NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2504
24032 c53bc2e52514 parsers: use k instead of n for PyArg_ParseTuple because python 2.4 is awful Augie Fackler <augie@google.com> parents: 24019 diff changeset	2505 /* replace kk with nn when we drop Python 2.4 */
c53bc2e52514 parsers: use k instead of n for PyArg_ParseTuple because python 2.4 is awful Augie Fackler <augie@google.com> parents: 24019 diff changeset	2506 if (!PyArg_ParseTuple(args, "s#kk", &data, &datalen, &offset, &stop)) {
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2507 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2508 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2509 data += offset;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2510 markers = PyList_New(0);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2511 if (!markers) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2512 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2513 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2514 while (offset < stop) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2515 uint32_t msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2516 int error;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2517 PyObject *record = fm1readmarker(data, &msize);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2518 if (!record) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2519 goto bail;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2520 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2521 error = PyList_Append(markers, record);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2522 Py_DECREF(record);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2523 if (error) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2524 goto bail;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2525 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2526 data += msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2527 offset += msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2528 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2529 return markers;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2530 bail:
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2531 Py_DECREF(markers);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2532 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2533 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2534
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2535 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	2536
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	2537 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	2538 PyObject pathencode(PyObject self, PyObject *args);
18430 0459c6555f69 store: implement lowerencode in C Bryan O'Sullivan <bryano@fb.com> parents: 17616 diff changeset	2539 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	2540
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2541 static PyMethodDef methods[] = {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	2542 {"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	2543 {"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	2544 {"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	2545 {"parse_index2", parse_index2, METH_VARARGS, "parse a revlog index\n"},
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	2546 {"asciilower", asciilower, METH_VARARGS, "lowercase an ASCII string\n"},
24577 bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	2547 {"asciiupper", asciiupper, METH_VARARGS, "uppercase an ASCII string\n"},
25584 72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	2548 {"dict_new_presized", dict_new_presized, METH_VARARGS,
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	2549 "construct a dict with an expected size\n"},
24609 670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	2550 {"make_file_foldmap", make_file_foldmap, METH_VARARGS,
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	2551 "make file foldmap\n"},
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	2552 {"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	2553 {"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	2554 {"lowerencode", lowerencode, METH_VARARGS, "lower-encode a path\n"},
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2555 {"fm1readmarkers", fm1readmarkers, METH_VARARGS,
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	2556 "parse v1 obsolete markers\n"},
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2557 {NULL, NULL}
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2558 };
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2559
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	2560 void dirs_module_init(PyObject *mod);
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: 24032 diff changeset	2561 void manifest_module_init(PyObject *mod);
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	2562
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2563 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	2564 {
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2565 /* 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	2566 * 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	2567 * 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	2568 * 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	2569 * 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	2570 * 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	2571 * 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	2572 * 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	2573 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	2574
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	2575 dirs_module_init(mod);
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: 24032 diff changeset	2576 manifest_module_init(mod);
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	2577
16604 48e42f984074 parsers: statically initializing tp_new to PyType_GenericNew is not portable Adrian Buehlmann <adrian@cadifra.com> parents: 16597 diff changeset	2578 indexType.tp_new = PyType_GenericNew;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	2579 if (PyType_Ready(&indexType) < 0 \|\|
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	2580 PyType_Ready(&dirstateTupleType) < 0)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2581 return;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2582 Py_INCREF(&indexType);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2583 PyModule_AddObject(mod, "index", (PyObject *)&indexType);
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	2584 Py_INCREF(&dirstateTupleType);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	2585 PyModule_AddObject(mod, "dirstatetuple",
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	2586 (PyObject *)&dirstateTupleType);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2587
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2588 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	2589 -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	2590 if (nullentry)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2591 PyObject_GC_UnTrack(nullentry);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2592 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2593
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2594 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	2595 {
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	2596 PyObject sys = PyImport_ImportModule("sys"), ver;
5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	2597 long hexversion;
5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	2598 if (!sys)
5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	2599 return -1;
5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	2600 ver = PyObject_GetAttrString(sys, "hexversion");
5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	2601 Py_DECREF(sys);
5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	2602 if (!ver)
5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	2603 return -1;
5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	2604 hexversion = PyInt_AsLong(ver);
5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	2605 Py_DECREF(ver);
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2606 /* 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	2607 * 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	2608 * 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	2609 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	2610 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	2611 "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	2612 "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	2613 "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	2614 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	2615 return -1;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2616 }
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2617 return 0;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2618 }
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2619
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2620 #ifdef IS_PY3K
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2621 static struct PyModuleDef parsers_module = {
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2622 PyModuleDef_HEAD_INIT,
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2623 "parsers",
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2624 parsers_doc,
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2625 -1,
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2626 methods
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2627 };
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2628
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2629 PyMODINIT_FUNC PyInit_parsers(void)
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2630 {
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	2631 PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	2632
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2633 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	2634 return;
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	2635 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	2636 module_init(mod);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2637 return mod;
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2638 }
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2639 #else
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2640 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	2641 {
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	2642 PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	2643
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	2644 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	2645 return;
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	2646 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	2647 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	2648 }
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	2649 #endif

Mercurial > public > mercurial-scm > hg

annotate mercurial/parsers.c @ 25810:82d6a35cf432