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

annotate mercurial/cext/parsers.c @ 32384:2e5a476b2e46

cext: move back finalization of dirstateTupleType where it should be

author	Yuya Nishihara <yuya@tcha.org>
date	Sun, 21 May 2017 13:31:27 +0900
parents	7d0c69505a66
children	7640584e697c

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"
29444 284d742e5611 internals: move the bitmanipulation routines into its own file Maciej Fijalkowski <fijall@gmail.com> parents: 28792 diff changeset	16 #include "bitmanipulation.h"
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	17
30112 9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	18 #ifdef IS_PY3K
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	19 /* The mapping of Python types is meant to be temporary to get Python
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	20 * 3 to compile. We should remove this once Python 3 support is fully
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	21 * supported and proper types are used in the extensions themselves. */
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	22 #define PyInt_Type PyLong_Type
30169 5f7151e6de85 parsers: alias more PyInt* symbols on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 30112 diff changeset	23 #define PyInt_Check PyLong_Check
30112 9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	24 #define PyInt_FromLong PyLong_FromLong
30169 5f7151e6de85 parsers: alias more PyInt* symbols on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 30112 diff changeset	25 #define PyInt_FromSsize_t PyLong_FromSsize_t
5f7151e6de85 parsers: alias more PyInt* symbols on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 30112 diff changeset	26 #define PyInt_AS_LONG PyLong_AS_LONG
30112 9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	27 #define PyInt_AsLong PyLong_AsLong
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	28 #endif
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	29
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	30 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	31
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	32 static char lowertable[128] = {
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	33 '\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	34 '\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	35 '\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	36 '\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	37 '\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	38 '\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	39 '\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	40 '\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	41 '\x40',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	42 '\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	43 '\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	44 '\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	45 '\x78', '\x79', '\x7a', /* X-Z */
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	46 '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	47 '\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	48 '\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	49 '\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	50 '\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	51 };
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	52
24577 bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	53 static char uppertable[128] = {
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	54 '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	55 '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	56 '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	57 '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	58 '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	59 '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	60 '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	61 '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	62 '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	63 '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	64 '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	65 '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	66 '\x60',
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	67 '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47', /* a-g */
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	68 '\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	69 '\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	70 '\x58', '\x59', '\x5a', /* x-z */
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	71 '\x7b', '\x7c', '\x7d', '\x7e', '\x7f'
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	72 };
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	73
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	74 /*
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	75 * 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	76 */
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: 24032 diff changeset	77 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	78 {
7092 fb3fc27617a2 parsers: speed up hex decoding for manifests Matt Mackall <mpm@selenic.com> parents: 7091 diff changeset	79 PyObject *ret;
6395 3f0294536b24 fix const annotation warning Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6389 diff changeset	80 char *d;
16617 4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	81 int i;
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	82
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	83 ret = PyBytes_FromStringAndSize(NULL, len / 2);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	84
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	85 if (!ret)
7092 fb3fc27617a2 parsers: speed up hex decoding for manifests Matt Mackall <mpm@selenic.com> parents: 7091 diff changeset	86 return NULL;
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	87
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	88 d = PyBytes_AsString(ret);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	89
16617 4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	90 for (i = 0; i < len;) {
4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	91 int hi = hexdigit(str, i++);
4fb16743049d parsers: change the type signature of hexdigit Bryan O'Sullivan <bryano@fb.com> parents: 16616 diff changeset	92 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	93 *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	94 }
7091 12b35ae03365 parsers: clean up whitespace Matt Mackall <mpm@selenic.com> parents: 6395 diff changeset	95
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	96 return ret;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	97 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	98
24576 fe173106e7fe parsers: make _asciilower a generic _asciitransform function Siddharth Agarwal <sid0@fb.com> parents: 24575 diff changeset	99 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	100 const char table[128],
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	101 PyObject *fallback_fn)
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	102 {
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	103 char str, newstr;
24574 e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	104 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	105 PyObject *newobj = NULL;
24575 a62e957413f7 parsers._asciilower: use an explicit return object Siddharth Agarwal <sid0@fb.com> parents: 24574 diff changeset	106 PyObject *ret = NULL;
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	107
24574 e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	108 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	109 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	110
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	111 newobj = PyBytes_FromStringAndSize(NULL, len);
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	112 if (!newobj)
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	113 goto quit;
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	114
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	115 newstr = PyBytes_AS_STRING(newobj);
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	116
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	117 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	118 char c = str[i];
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	119 if (c & 0x80) {
24606 e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	120 if (fallback_fn != NULL) {
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	121 ret = PyObject_CallFunctionObjArgs(fallback_fn,
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	122 str_obj, NULL);
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	123 } else {
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	124 PyObject *err = PyUnicodeDecodeError_Create(
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	125 "ascii", str, len, i, (i + 1),
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	126 "unexpected code byte");
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	127 PyErr_SetObject(PyExc_UnicodeDecodeError, err);
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	128 Py_XDECREF(err);
e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	129 }
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	130 goto quit;
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	131 }
24576 fe173106e7fe parsers: make _asciilower a generic _asciitransform function Siddharth Agarwal <sid0@fb.com> parents: 24575 diff changeset	132 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	133 }
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	134
24575 a62e957413f7 parsers._asciilower: use an explicit return object Siddharth Agarwal <sid0@fb.com> parents: 24574 diff changeset	135 ret = newobj;
a62e957413f7 parsers._asciilower: use an explicit return object Siddharth Agarwal <sid0@fb.com> parents: 24574 diff changeset	136 Py_INCREF(ret);
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	137 quit:
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	138 Py_XDECREF(newobj);
24575 a62e957413f7 parsers._asciilower: use an explicit return object Siddharth Agarwal <sid0@fb.com> parents: 24574 diff changeset	139 return ret;
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	140 }
80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	141
24574 e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	142 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	143 {
e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	144 PyObject *str_obj;
e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	145 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	146 return NULL;
24606 e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	147 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	148 }
e97a00bf18ae parsers: factor out most of asciilower into an internal function Siddharth Agarwal <sid0@fb.com> parents: 24499 diff changeset	149
24577 bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	150 static PyObject asciiupper(PyObject self, PyObject *args)
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	151 {
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	152 PyObject *str_obj;
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	153 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	154 return NULL;
24606 e4a733c34bc6 parsers._asciitransform: also accept a fallback function Siddharth Agarwal <sid0@fb.com> parents: 24577 diff changeset	155 return _asciitransform(str_obj, uppertable, NULL);
24577 bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	156 }
bf55df007535 parsers: introduce an asciiupper function Siddharth Agarwal <sid0@fb.com> parents: 24576 diff changeset	157
25583 ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	158 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	159 {
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	160 /* _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	161 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	162 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	163 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	164 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	165 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	166 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	167 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	168 }
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	169
25584 72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	170 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	171 {
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	172 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	173
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	174 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	175 return NULL;
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	176
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	177 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	178 }
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	179
24609 670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	180 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	181 {
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	182 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	183 PyObject *file_foldmap = NULL;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	184 enum normcase_spec spec;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	185 PyObject k, v;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	186 dirstateTupleObject *tuple;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	187 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	188 const char *table;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	189
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	190 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	191 &PyDict_Type, &dmap,
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	192 &PyInt_Type, &spec_obj,
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	193 &PyFunction_Type, &normcase_fallback))
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	194 goto quit;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	195
24622 1e05f11619bb parsers.c: avoid implicit conversion loses integer precision warning Andr? Sintzoff <andre.sintzoff@gmail.com> parents: 24609 diff changeset	196 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	197 switch (spec) {
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	198 case NORMCASE_LOWER:
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	199 table = lowertable;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	200 break;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	201 case NORMCASE_UPPER:
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	202 table = uppertable;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	203 break;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	204 case NORMCASE_OTHER:
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	205 table = NULL;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	206 break;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	207 default:
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	208 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	209 goto quit;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	210 }
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	211
25583 ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	212 /* 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	213 function. */
ce64c9ab19f2 parsers: factor out code to create a presized dict Siddharth Agarwal <sid0@fb.com> parents: 25582 diff changeset	214 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	215 if (file_foldmap == NULL)
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	216 goto quit;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	217
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	218 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	219 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	220 PyErr_SetString(PyExc_TypeError,
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	221 "expected a dirstate tuple");
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	222 goto quit;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	223 }
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	224
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	225 tuple = (dirstateTupleObject *)v;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	226 if (tuple->state != 'r') {
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	227 PyObject *normed;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	228 if (table != NULL) {
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	229 normed = _asciitransform(k, table,
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	230 normcase_fallback);
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	231 } else {
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	232 normed = PyObject_CallFunctionObjArgs(
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	233 normcase_fallback, k, NULL);
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	234 }
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 if (normed == NULL)
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	237 goto quit;
26049 b1634b7804c7 parsers: correctly decref normed value after PyDict_SetItem Augie Fackler <augie@google.com> parents: 26048 diff changeset	238 if (PyDict_SetItem(file_foldmap, normed, k) == -1) {
b1634b7804c7 parsers: correctly decref normed value after PyDict_SetItem Augie Fackler <augie@google.com> parents: 26048 diff changeset	239 Py_DECREF(normed);
24609 670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	240 goto quit;
26049 b1634b7804c7 parsers: correctly decref normed value after PyDict_SetItem Augie Fackler <augie@google.com> parents: 26048 diff changeset	241 }
b1634b7804c7 parsers: correctly decref normed value after PyDict_SetItem Augie Fackler <augie@google.com> parents: 26048 diff changeset	242 Py_DECREF(normed);
24609 670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	243 }
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	244 }
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	245 return file_foldmap;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	246 quit:
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	247 Py_XDECREF(file_foldmap);
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	248 return NULL;
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	249 }
670aaee7931c parsers: add a C function to create a file foldmap Siddharth Agarwal <sid0@fb.com> parents: 24606 diff changeset	250
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	251 /*
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	252 * 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	253 * ('\n') characters.
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	254 */
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	255 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	256 {
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	257 PyObject mfdict, fdict;
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	258 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	259 int len;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	260
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	261 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	262 &PyDict_Type, &mfdict,
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	263 &PyDict_Type, &fdict,
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	264 &str, &len))
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	265 goto quit;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	266
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	267 start = str;
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	268 end = str + len;
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	269 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	270 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	271 PyObject *flags = NULL;
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	272 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	273 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	274
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	275 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	276 if (!zero) {
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	277 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	278 "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	279 goto quit;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	280 }
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 newline = memchr(zero + 1, '\n', end - (zero + 1));
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	283 if (!newline) {
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	284 PyErr_SetString(PyExc_ValueError,
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	285 "manifest contains trailing garbage");
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	286 goto quit;
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	287 }
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	288
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	289 file = PyBytes_FromStringAndSize(start, zero - start);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	290
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	291 if (!file)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	292 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	293
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	294 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	295
17356 511dfb34b412 parsers: fix an integer size warning issued by clang Bryan O'Sullivan <bryano@fb.com> parents: 17353 diff changeset	296 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	297 if (!node)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	298 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	299
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	300 if (nlen > 40) {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	301 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	302 nlen - 40);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	303 if (!flags)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	304 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	305
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	306 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	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 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	309
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	310 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	311 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	312
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	313 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	314
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	315 Py_XDECREF(flags);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	316 Py_XDECREF(node);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	317 Py_XDECREF(file);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	318 continue;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	319 bail:
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	320 Py_XDECREF(flags);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	321 Py_XDECREF(node);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	322 Py_XDECREF(file);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	323 goto quit;
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
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	326 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	327 return Py_None;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	328 quit:
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	329 return NULL;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	330 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	331
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	332 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	333 int size, int mtime)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	334 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	335 dirstateTupleObject *t = PyObject_New(dirstateTupleObject,
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	336 &dirstateTupleType);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	337 if (!t)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	338 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	339 t->state = state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	340 t->mode = mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	341 t->size = size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	342 t->mtime = mtime;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	343 return t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	344 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	345
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	346 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	347 PyObject *kwds)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	348 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	349 /* 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	350 * dirstate_tuple is immutable. */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	351 dirstateTupleObject *t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	352 char state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	353 int size, mode, mtime;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	354 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	355 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	356
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	357 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	358 if (!t)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	359 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	360 t->state = state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	361 t->mode = mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	362 t->size = size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	363 t->mtime = mtime;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	364
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	365 return (PyObject *)t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	366 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	367
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	368 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	369 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	370 PyObject_Del(o);
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
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	373 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	374 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	375 return 4;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	376 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	377
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	378 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	379 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	380 dirstateTupleObject t = (dirstateTupleObject )o;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	381 switch (i) {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	382 case 0:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	383 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	384 case 1:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	385 return PyInt_FromLong(t->mode);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	386 case 2:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	387 return PyInt_FromLong(t->size);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	388 case 3:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	389 return PyInt_FromLong(t->mtime);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	390 default:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	391 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	392 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	393 }
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
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	396 static PySequenceMethods dirstate_tuple_sq = {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	397 dirstate_tuple_length, /* sq_length */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	398 0, /* sq_concat */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	399 0, /* sq_repeat */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	400 dirstate_tuple_item, /* sq_item */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	401 0, /* sq_ass_item */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	402 0, /* sq_contains */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	403 0, /* sq_inplace_concat */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	404 0 /* sq_inplace_repeat */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	405 };
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	406
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	407 PyTypeObject dirstateTupleType = {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	408 PyVarObject_HEAD_INIT(NULL, 0)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	409 "dirstate_tuple", /* tp_name */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	410 sizeof(dirstateTupleObject),/* tp_basicsize */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	411 0, /* tp_itemsize */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	412 (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	413 0, /* tp_print */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	414 0, /* tp_getattr */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	415 0, /* tp_setattr */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	416 0, /* tp_compare */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	417 0, /* tp_repr */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	418 0, /* tp_as_number */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	419 &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	420 0, /* tp_as_mapping */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	421 0, /* tp_hash */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	422 0, /* tp_call */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	423 0, /* tp_str */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	424 0, /* tp_getattro */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	425 0, /* tp_setattro */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	426 0, /* tp_as_buffer */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	427 Py_TPFLAGS_DEFAULT, /* tp_flags */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	428 "dirstate tuple", /* tp_doc */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	429 0, /* tp_traverse */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	430 0, /* tp_clear */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	431 0, /* tp_richcompare */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	432 0, /* tp_weaklistoffset */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	433 0, /* tp_iter */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	434 0, /* tp_iternext */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	435 0, /* tp_methods */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	436 0, /* tp_members */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	437 0, /* tp_getset */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	438 0, /* tp_base */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	439 0, /* tp_dict */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	440 0, /* tp_descr_get */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	441 0, /* tp_descr_set */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	442 0, /* tp_dictoffset */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	443 0, /* tp_init */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	444 0, /* tp_alloc */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	445 dirstate_tuple_new, /* tp_new */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	446 };
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	447
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	448 static PyObject parse_dirstate(PyObject self, PyObject *args)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	449 {
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	450 PyObject dmap, cmap, parents = NULL, ret = NULL;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	451 PyObject fname = NULL, cname = NULL, *entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	452 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	453 int mode, size, mtime;
22403 41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	454 unsigned int flen, len, pos = 40;
41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	455 int readlen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	456
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	457 if (!PyArg_ParseTuple(args, "O!O!s#:parse_dirstate",
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	458 &PyDict_Type, &dmap,
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	459 &PyDict_Type, &cmap,
22403 41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	460 &str, &readlen))
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	461 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	462
22403 41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	463 len = readlen;
41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	464
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	465 /* read parents */
26052 b970418bbafe parsers: set exception when there's too little string data to extract parents Augie Fackler <augie@google.com> parents: 26051 diff changeset	466 if (len < 40) {
b970418bbafe parsers: set exception when there's too little string data to extract parents Augie Fackler <augie@google.com> parents: 26051 diff changeset	467 PyErr_SetString(
b970418bbafe parsers: set exception when there's too little string data to extract parents Augie Fackler <augie@google.com> parents: 26051 diff changeset	468 PyExc_ValueError, "too little data for parents");
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	469 goto quit;
26052 b970418bbafe parsers: set exception when there's too little string data to extract parents Augie Fackler <augie@google.com> parents: 26051 diff changeset	470 }
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 parents = Py_BuildValue("s#s#", str, 20, str + 20, 20);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	473 if (!parents)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	474 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	475
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	476 /* read filenames */
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	477 while (pos >= 40 && pos < len) {
27226 f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	478 if (pos + 17 > len) {
f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	479 PyErr_SetString(PyExc_ValueError,
f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	480 "overflow in dirstate");
f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	481 goto quit;
f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	482 }
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	483 cur = str + pos;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	484 /* unpack header */
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	485 state = *cur;
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	486 mode = getbe32(cur + 1);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	487 size = getbe32(cur + 5);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	488 mtime = getbe32(cur + 9);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	489 flen = getbe32(cur + 13);
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	490 pos += 17;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	491 cur += 17;
20316 40f08c31844c parsers: fix 'unsigned expression is always true' warning (issue4142) David Soria Parra <davidsp@fb.com> parents: 20169 diff changeset	492 if (flen > len - pos) {
7174 4da87407b845 parsers.c: fix integer overflows Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7168 diff changeset	493 PyErr_SetString(PyExc_ValueError, "overflow in dirstate");
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	494 goto quit;
7174 4da87407b845 parsers.c: fix integer overflows Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7168 diff changeset	495 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	496
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	497 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	498 mtime);
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	499 cpos = memchr(cur, 0, flen);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	500 if (cpos) {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	501 fname = PyBytes_FromStringAndSize(cur, cpos - cur);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	502 cname = PyBytes_FromStringAndSize(cpos + 1,
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	503 flen - (cpos - cur) - 1);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	504 if (!fname \|\| !cname \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	505 PyDict_SetItem(cmap, fname, cname) == -1 \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	506 PyDict_SetItem(dmap, fname, entry) == -1)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	507 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	508 Py_DECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	509 } else {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	510 fname = PyBytes_FromStringAndSize(cur, flen);
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	511 if (!fname \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	512 PyDict_SetItem(dmap, fname, entry) == -1)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	513 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	514 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	515 Py_DECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	516 Py_DECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	517 fname = cname = entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	518 pos += flen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	519 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	520
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	521 ret = parents;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	522 Py_INCREF(ret);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	523 quit:
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	524 Py_XDECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	525 Py_XDECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	526 Py_XDECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	527 Py_XDECREF(parents);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	528 return ret;
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
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	531 /*
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	532 * Build a set of non-normal and other parent entries from the dirstate dmap
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	533 */
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	534 static PyObject nonnormalotherparententries(PyObject self, PyObject *args) {
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	535 PyObject dmap, fname, *v;
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	536 PyObject nonnset = NULL, otherpset = NULL, *result = NULL;
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	537 Py_ssize_t pos;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	538
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	539 if (!PyArg_ParseTuple(args, "O!:nonnormalentries",
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	540 &PyDict_Type, &dmap))
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	541 goto bail;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	542
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	543 nonnset = PySet_New(NULL);
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	544 if (nonnset == NULL)
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	545 goto bail;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	546
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	547 otherpset = PySet_New(NULL);
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	548 if (otherpset == NULL)
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	549 goto bail;
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	550
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	551 pos = 0;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	552 while (PyDict_Next(dmap, &pos, &fname, &v)) {
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	553 dirstateTupleObject *t;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	554 if (!dirstate_tuple_check(v)) {
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	555 PyErr_SetString(PyExc_TypeError,
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	556 "expected a dirstate tuple");
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	557 goto bail;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	558 }
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	559 t = (dirstateTupleObject *)v;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	560
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	561 if (t->state == 'n' && t->size == -2) {
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	562 if (PySet_Add(otherpset, fname) == -1) {
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	563 goto bail;
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	564 }
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	565 }
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	566
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	567 if (t->state == 'n' && t->mtime != -1)
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	568 continue;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	569 if (PySet_Add(nonnset, fname) == -1)
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	570 goto bail;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	571 }
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	572
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	573 result = Py_BuildValue("(OO)", nonnset, otherpset);
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	574 if (result == NULL)
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	575 goto bail;
31291 fffd1abb1337 parsers: avoid leak of nonnset and otherpset Augie Fackler <augie@google.com> parents: 31278 diff changeset	576 Py_DECREF(nonnset);
fffd1abb1337 parsers: avoid leak of nonnset and otherpset Augie Fackler <augie@google.com> parents: 31278 diff changeset	577 Py_DECREF(otherpset);
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	578 return result;
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	579 bail:
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	580 Py_XDECREF(nonnset);
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	581 Py_XDECREF(otherpset);
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	582 Py_XDECREF(result);
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	583 return NULL;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	584 }
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	585
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	586 /*
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	587 * 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	588 */
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	589 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	590 {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	591 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	592 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	593 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	594 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	595 char p, s;
26630 3111b45a2bbf parsers: make pack_dirstate take now in integer for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26591 diff changeset	596 int now;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	597
26630 3111b45a2bbf parsers: make pack_dirstate take now in integer for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26591 diff changeset	598 if (!PyArg_ParseTuple(args, "O!O!Oi:pack_dirstate",
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	599 &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	600 &pl, &now))
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	601 return NULL;
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 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	604 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	605 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	606 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	607
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	608 /* 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	609 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	610 PyObject *c;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	611 if (!PyBytes_Check(k)) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	612 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	613 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	614 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	615 nbytes += PyBytes_GET_SIZE(k) + 17;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	616 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	617 if (c) {
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	618 if (!PyBytes_Check(c)) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	619 PyErr_SetString(PyExc_TypeError,
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	620 "expected string key");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	621 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	622 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	623 nbytes += PyBytes_GET_SIZE(c) + 1;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	624 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	625 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	626
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	627 packobj = PyBytes_FromStringAndSize(NULL, nbytes);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	628 if (packobj == NULL)
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	629 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	630
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	631 p = PyBytes_AS_STRING(packobj);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	632
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	633 pn = PySequence_ITEM(pl, 0);
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	634 if (PyBytes_AsStringAndSize(pn, &s, &l) == -1 \|\| l != 20) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	635 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	636 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	637 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	638 memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	639 p += 20;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	640 pn = PySequence_ITEM(pl, 1);
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	641 if (PyBytes_AsStringAndSize(pn, &s, &l) == -1 \|\| l != 20) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	642 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	643 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	644 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	645 memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	646 p += 20;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	647
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	648 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	649 dirstateTupleObject *tuple;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	650 char state;
26774 04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	651 int mode, size, mtime;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	652 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	653 PyObject *o;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	654 char *t;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	655
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	656 if (!dirstate_tuple_check(v)) {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	657 PyErr_SetString(PyExc_TypeError,
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	658 "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	659 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	660 }
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	661 tuple = (dirstateTupleObject *)v;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	662
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	663 state = tuple->state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	664 mode = tuple->mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	665 size = tuple->size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	666 mtime = tuple->mtime;
26630 3111b45a2bbf parsers: make pack_dirstate take now in integer for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26591 diff changeset	667 if (state == 'n' && mtime == now) {
18567 194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 18504 diff changeset	668 /* 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	669 * 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	670 mtime = -1;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	671 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	672 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	673 if (!mtime_unset)
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	674 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	675 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	676 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	677 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	678 mtime_unset = NULL;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	679 }
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	680 *p++ = state;
26774 04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	681 putbe32((uint32_t)mode, p);
04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	682 putbe32((uint32_t)size, p + 4);
04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	683 putbe32((uint32_t)mtime, p + 8);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	684 t = p + 12;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	685 p += 16;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	686 len = PyBytes_GET_SIZE(k);
c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	687 memcpy(p, PyBytes_AS_STRING(k), len);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	688 p += len;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	689 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	690 if (o) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	691 *p++ = '\0';
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	692 l = PyBytes_GET_SIZE(o);
c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	693 memcpy(p, PyBytes_AS_STRING(o), l);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	694 p += l;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	695 len += l + 1;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	696 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	697 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	698 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	699
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	700 pos = p - PyBytes_AS_STRING(packobj);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	701 if (pos != nbytes) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	702 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	703 (long)pos, (long)nbytes);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	704 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	705 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	706
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	707 return packobj;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	708 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	709 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	710 Py_XDECREF(packobj);
23946 f3e94aa6e182 parsers: don't leak a tuple in pack_dirstate Augie Fackler <augie@google.com> parents: 23945 diff changeset	711 Py_XDECREF(v);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	712 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	713 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	714
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	715 #define BUMPED_FIX 1
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	716 #define USING_SHA_256 2
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	717 #define FM1_HEADER_SIZE (4 + 8 + 2 + 2 + 1 + 1 + 1)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	718
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	719 static PyObject *readshas(
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	720 const char *source, unsigned char num, Py_ssize_t hashwidth)
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	721 {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	722 int i;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	723 PyObject *list = PyTuple_New(num);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	724 if (list == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	725 return NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	726 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	727 for (i = 0; i < num; i++) {
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	728 PyObject *hash = PyBytes_FromStringAndSize(source, hashwidth);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	729 if (hash == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	730 Py_DECREF(list);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	731 return NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	732 }
26213 4d6cdea33f37 parsers: use PyTuple_SET_ITEM() to fill new marker tuples Yuya Nishihara <yuya@tcha.org> parents: 26107 diff changeset	733 PyTuple_SET_ITEM(list, i, hash);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	734 source += hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	735 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	736 return list;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	737 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	738
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	739 static PyObject fm1readmarker(const char databegin, const char *dataend,
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	740 uint32_t *msize)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	741 {
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	742 const char *data = databegin;
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	743 const char *meta;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	744
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	745 double mtime;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	746 int16_t tz;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	747 uint16_t flags;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	748 unsigned char nsuccs, nparents, nmetadata;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	749 Py_ssize_t hashwidth = 20;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	750
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	751 PyObject prec = NULL, parents = NULL, *succs = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	752 PyObject metadata = NULL, ret = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	753 int i;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	754
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	755 if (data + FM1_HEADER_SIZE > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	756 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	757 }
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	758
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	759 *msize = getbe32(data);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	760 data += 4;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	761 mtime = getbefloat64(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	762 data += 8;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	763 tz = getbeint16(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	764 data += 2;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	765 flags = getbeuint16(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	766 data += 2;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	767
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	768 if (flags & USING_SHA_256) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	769 hashwidth = 32;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	770 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	771
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	772 nsuccs = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	773 nparents = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	774 nmetadata = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	775
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	776 if (databegin + *msize > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	777 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	778 }
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	779 dataend = databegin + msize; / narrow down to marker size */
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	780
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	781 if (data + hashwidth > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	782 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	783 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	784 prec = PyBytes_FromStringAndSize(data, hashwidth);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	785 data += hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	786 if (prec == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	787 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	788 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	789
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	790 if (data + nsuccs * hashwidth > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	791 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	792 }
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	793 succs = readshas(data, nsuccs, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	794 if (succs == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	795 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	796 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	797 data += nsuccs * hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	798
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	799 if (nparents == 1 \|\| nparents == 2) {
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	800 if (data + nparents * hashwidth > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	801 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	802 }
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	803 parents = readshas(data, nparents, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	804 if (parents == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	805 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	806 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	807 data += nparents * hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	808 } else {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	809 parents = Py_None;
31426 43a7dfbead0c parsers: handle refcounting of "parents" consistently Gregory Szorc <gregory.szorc@gmail.com> parents: 31292 diff changeset	810 Py_INCREF(parents);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	811 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	812
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	813 if (data + 2 * nmetadata > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	814 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	815 }
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	816 meta = data + (2 * nmetadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	817 metadata = PyTuple_New(nmetadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	818 if (metadata == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	819 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	820 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	821 for (i = 0; i < nmetadata; i++) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	822 PyObject tmp, left = NULL, *right = NULL;
26590 473a63c45394 parsers: read sizes of metadata pair of obsolete marker at once Yuya Nishihara <yuya@tcha.org> parents: 26214 diff changeset	823 Py_ssize_t leftsize = (unsigned char)(*data++);
473a63c45394 parsers: read sizes of metadata pair of obsolete marker at once Yuya Nishihara <yuya@tcha.org> parents: 26214 diff changeset	824 Py_ssize_t rightsize = (unsigned char)(*data++);
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	825 if (meta + leftsize + rightsize > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	826 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	827 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	828 left = PyBytes_FromStringAndSize(meta, leftsize);
26590 473a63c45394 parsers: read sizes of metadata pair of obsolete marker at once Yuya Nishihara <yuya@tcha.org> parents: 26214 diff changeset	829 meta += leftsize;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	830 right = PyBytes_FromStringAndSize(meta, rightsize);
26590 473a63c45394 parsers: read sizes of metadata pair of obsolete marker at once Yuya Nishihara <yuya@tcha.org> parents: 26214 diff changeset	831 meta += rightsize;
26214 46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	832 tmp = PyTuple_New(2);
46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	833 if (!left \|\| !right \|\| !tmp) {
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	834 Py_XDECREF(left);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	835 Py_XDECREF(right);
26214 46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	836 Py_XDECREF(tmp);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	837 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	838 }
26214 46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	839 PyTuple_SET_ITEM(tmp, 0, left);
46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	840 PyTuple_SET_ITEM(tmp, 1, right);
26213 4d6cdea33f37 parsers: use PyTuple_SET_ITEM() to fill new marker tuples Yuya Nishihara <yuya@tcha.org> parents: 26107 diff changeset	841 PyTuple_SET_ITEM(metadata, i, tmp);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	842 }
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	843 ret = Py_BuildValue("(OOHO(di)O)", prec, succs, flags,
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	844 metadata, mtime, (int)tz * 60, parents);
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	845 goto bail; /* return successfully */
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	846
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	847 overflow:
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	848 PyErr_SetString(PyExc_ValueError, "overflow in obsstore");
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	849 bail:
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	850 Py_XDECREF(prec);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	851 Py_XDECREF(succs);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	852 Py_XDECREF(metadata);
31426 43a7dfbead0c parsers: handle refcounting of "parents" consistently Gregory Szorc <gregory.szorc@gmail.com> parents: 31292 diff changeset	853 Py_XDECREF(parents);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	854 return ret;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	855 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	856
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	857
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	858 static PyObject fm1readmarkers(PyObject self, PyObject *args) {
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	859 const char data, dataend;
26872 ce03e72837c6 parsers: fix width of datalen variable in fm1readmarkers Yuya Nishihara <yuya@tcha.org> parents: 26775 diff changeset	860 int datalen;
26107 50582df9d7a7 parsers: fix two cases of unsigned long instead of Py_ssize_t Augie Fackler <augie@google.com> parents: 26098 diff changeset	861 Py_ssize_t offset, stop;
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	862 PyObject *markers = NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	863
26107 50582df9d7a7 parsers: fix two cases of unsigned long instead of Py_ssize_t Augie Fackler <augie@google.com> parents: 26098 diff changeset	864 if (!PyArg_ParseTuple(args, "s#nn", &data, &datalen, &offset, &stop)) {
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	865 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	866 }
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	867 dataend = data + datalen;
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	868 data += offset;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	869 markers = PyList_New(0);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	870 if (!markers) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	871 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	872 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	873 while (offset < stop) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	874 uint32_t msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	875 int error;
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	876 PyObject *record = fm1readmarker(data, dataend, &msize);
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	877 if (!record) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	878 goto bail;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	879 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	880 error = PyList_Append(markers, record);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	881 Py_DECREF(record);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	882 if (error) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	883 goto bail;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	884 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	885 data += msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	886 offset += msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	887 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	888 return markers;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	889 bail:
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	890 Py_DECREF(markers);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	891 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	892 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	893
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	894 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	895
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	896 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	897 PyObject pathencode(PyObject self, PyObject *args);
18430 0459c6555f69 store: implement lowerencode in C Bryan O'Sullivan <bryano@fb.com> parents: 17616 diff changeset	898 PyObject lowerencode(PyObject self, PyObject *args);
32378 7d0c69505a66 cext: extract revlog/index parsing code to own C file Gregory Szorc <gregory.szorc@gmail.com> parents: 32372 diff changeset	899 PyObject parse_index2(PyObject self, PyObject *args);
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	900
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	901 static PyMethodDef methods[] = {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	902 {"pack_dirstate", pack_dirstate, METH_VARARGS, "pack a dirstate\n"},
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	903 {"nonnormalotherparententries", nonnormalotherparententries, METH_VARARGS,
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	904 "create a set containing non-normal and other parent entries of given "
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	905 "dirstate\n"},
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	906 {"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	907 {"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	908 {"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	909 {"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	910 {"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	911 {"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	912 "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	913 {"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	914 "make file foldmap\n"},
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	915 {"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	916 {"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	917 {"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	918 {"fm1readmarkers", fm1readmarkers, METH_VARARGS,
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	919 "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	920 {NULL, NULL}
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	921 };
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	922
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	923 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	924 void manifest_module_init(PyObject *mod);
32378 7d0c69505a66 cext: extract revlog/index parsing code to own C file Gregory Szorc <gregory.szorc@gmail.com> parents: 32372 diff changeset	925 void revlog_module_init(PyObject *mod);
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	926
32360 af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	927 static const int version = 1;
af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	928
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	929 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	930 {
32360 af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	931 PyModule_AddIntConstant(mod, "version", version);
af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	932
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	933 /* 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	934 * 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	935 * 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	936 * 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	937 * 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	938 * 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	939 * 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	940 * 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	941 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	942
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	943 dirs_module_init(mod);
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: 24032 diff changeset	944 manifest_module_init(mod);
32378 7d0c69505a66 cext: extract revlog/index parsing code to own C file Gregory Szorc <gregory.szorc@gmail.com> parents: 32372 diff changeset	945 revlog_module_init(mod);
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	946
32384 2e5a476b2e46 cext: move back finalization of dirstateTupleType where it should be Yuya Nishihara <yuya@tcha.org> parents: 32378 diff changeset	947 if (PyType_Ready(&dirstateTupleType) < 0)
2e5a476b2e46 cext: move back finalization of dirstateTupleType where it should be Yuya Nishihara <yuya@tcha.org> parents: 32378 diff changeset	948 return;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	949 Py_INCREF(&dirstateTupleType);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	950 PyModule_AddObject(mod, "dirstatetuple",
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	951 (PyObject *)&dirstateTupleType);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	952 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	953
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	954 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	955 {
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	956 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	957 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	958 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	959 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	960 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	961 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	962 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	963 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	964 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	965 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	966 /* 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	967 * 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	968 * 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	969 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	970 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	971 "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	972 "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	973 "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	974 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	975 return -1;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	976 }
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	977 return 0;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	978 }
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	979
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	980 #ifdef IS_PY3K
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	981 static struct PyModuleDef parsers_module = {
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	982 PyModuleDef_HEAD_INIT,
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	983 "parsers",
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	984 parsers_doc,
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	985 -1,
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	986 methods
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	987 };
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	988
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	989 PyMODINIT_FUNC PyInit_parsers(void)
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	990 {
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	991 PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	992
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	993 if (check_python_version() == -1)
30090 8abe9264c73a parsers: return NULL from PyInit_parsers on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 29444 diff changeset	994 return NULL;
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	995 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	996 module_init(mod);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	997 return mod;
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	998 }
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	999 #else
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1000 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	1001 {
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1002 PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1003
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1004 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	1005 return;
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1006 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	1007 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	1008 }
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1009 #endif

Mercurial > public > mercurial-scm > hg

annotate mercurial/cext/parsers.c @ 32384:2e5a476b2e46