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

annotate mercurial/cext/parsers.c @ 34440:7ed0750c71a1

cext: wrap before brace for functions This is our prevailing style. Differential Revision: https://phab.mercurial-scm.org/D910

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Mon, 02 Oct 2017 19:28:41 +0100
parents	b90e8da190da
children	6ece4a85c350

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
34438 b90e8da190da cext: reorder #include Gregory Szorc <gregory.szorc@gmail.com> parents: 33926 diff changeset	15 #include "bitmanipulation.h"
33758 0f4ac3b6dee4 cext: factor out header for charencode.c Yuya Nishihara <yuya@tcha.org> parents: 33757 diff changeset	16 #include "charencode.h"
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	17 #include "util.h"
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	18
30112 9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	19 #ifdef IS_PY3K
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	20 /* 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	21 * 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	22 * supported and proper types are used in the extensions themselves. */
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
30112 9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	26 #define PyInt_AsLong PyLong_AsLong
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	27 #endif
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	28
32386 7640584e697c cext: mark constant variables Yuya Nishihara <yuya@tcha.org> parents: 32384 diff changeset	29 static const char *const versionerrortext = "Python minor version mismatch";
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	30
25584 72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	31 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	32 {
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	33 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	34
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	35 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	36 return NULL;
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	37
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	38 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	39 }
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	40
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	41 /*
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	42 * 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	43 * ('\n') characters.
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	44 */
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	45 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	46 {
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	47 PyObject mfdict, fdict;
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	48 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	49 int len;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	50
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	51 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	52 &PyDict_Type, &mfdict,
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	53 &PyDict_Type, &fdict,
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	54 &str, &len))
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	55 goto quit;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	56
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	57 start = str;
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	58 end = str + len;
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	59 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	60 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	61 PyObject *flags = NULL;
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	62 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	63 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	64
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	65 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	66 if (!zero) {
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	67 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	68 "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	69 goto quit;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	70 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	71
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	72 newline = memchr(zero + 1, '\n', end - (zero + 1));
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	73 if (!newline) {
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	74 PyErr_SetString(PyExc_ValueError,
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	75 "manifest contains trailing garbage");
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	76 goto quit;
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	77 }
3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	78
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	79 file = PyBytes_FromStringAndSize(start, zero - start);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	80
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	81 if (!file)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	82 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	83
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	84 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	85
33759 a22339d389d4 cext: modernize charencode.c to use Py_ssize_t Yuya Nishihara <yuya@tcha.org> parents: 33758 diff changeset	86 node = unhexlify(zero + 1, nlen > 40 ? 40 : (Py_ssize_t)nlen);
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	87 if (!node)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	88 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	89
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	90 if (nlen > 40) {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	91 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	92 nlen - 40);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	93 if (!flags)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	94 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	95
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	96 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	97 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	98 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	99
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	100 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	101 goto bail;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	102
19728 3daabd2da78b parse_manifest: rewrite to use memchr Siddharth Agarwal <sid0@fb.com> parents: 19727 diff changeset	103 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	104
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	105 Py_XDECREF(flags);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	106 Py_XDECREF(node);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	107 Py_XDECREF(file);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	108 continue;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	109 bail:
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	110 Py_XDECREF(flags);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	111 Py_XDECREF(node);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	112 Py_XDECREF(file);
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	113 goto quit;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	114 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	115
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	116 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	117 return Py_None;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	118 quit:
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	119 return NULL;
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	120 }
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	121
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	122 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	123 int size, int mtime)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	124 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	125 dirstateTupleObject *t = PyObject_New(dirstateTupleObject,
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	126 &dirstateTupleType);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	127 if (!t)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	128 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	129 t->state = state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	130 t->mode = mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	131 t->size = size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	132 t->mtime = mtime;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	133 return t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	134 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	135
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	136 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	137 PyObject *kwds)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	138 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	139 /* 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	140 * dirstate_tuple is immutable. */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	141 dirstateTupleObject *t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	142 char state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	143 int size, mode, mtime;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	144 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	145 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	146
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	147 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	148 if (!t)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	149 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	150 t->state = state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	151 t->mode = mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	152 t->size = size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	153 t->mtime = mtime;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	154
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	155 return (PyObject *)t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	156 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	157
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	158 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	159 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	160 PyObject_Del(o);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	161 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	162
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	163 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	164 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	165 return 4;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	166 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	167
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	168 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	169 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	170 dirstateTupleObject t = (dirstateTupleObject )o;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	171 switch (i) {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	172 case 0:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	173 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	174 case 1:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	175 return PyInt_FromLong(t->mode);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	176 case 2:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	177 return PyInt_FromLong(t->size);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	178 case 3:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	179 return PyInt_FromLong(t->mtime);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	180 default:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	181 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	182 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	183 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	184 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	185
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	186 static PySequenceMethods dirstate_tuple_sq = {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	187 dirstate_tuple_length, /* sq_length */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	188 0, /* sq_concat */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	189 0, /* sq_repeat */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	190 dirstate_tuple_item, /* sq_item */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	191 0, /* sq_ass_item */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	192 0, /* sq_contains */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	193 0, /* sq_inplace_concat */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	194 0 /* sq_inplace_repeat */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	195 };
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	196
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	197 PyTypeObject dirstateTupleType = {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	198 PyVarObject_HEAD_INIT(NULL, 0)
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	199 "dirstate_tuple", /* tp_name */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	200 sizeof(dirstateTupleObject),/* tp_basicsize */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	201 0, /* tp_itemsize */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	202 (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	203 0, /* tp_print */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	204 0, /* tp_getattr */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	205 0, /* tp_setattr */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	206 0, /* tp_compare */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	207 0, /* tp_repr */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	208 0, /* tp_as_number */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	209 &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	210 0, /* tp_as_mapping */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	211 0, /* tp_hash */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	212 0, /* tp_call */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	213 0, /* tp_str */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	214 0, /* tp_getattro */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	215 0, /* tp_setattro */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	216 0, /* tp_as_buffer */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	217 Py_TPFLAGS_DEFAULT, /* tp_flags */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	218 "dirstate tuple", /* tp_doc */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	219 0, /* tp_traverse */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	220 0, /* tp_clear */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	221 0, /* tp_richcompare */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	222 0, /* tp_weaklistoffset */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	223 0, /* tp_iter */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	224 0, /* tp_iternext */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	225 0, /* tp_methods */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	226 0, /* tp_members */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	227 0, /* tp_getset */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	228 0, /* tp_base */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	229 0, /* tp_dict */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	230 0, /* tp_descr_get */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	231 0, /* tp_descr_set */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	232 0, /* tp_dictoffset */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	233 0, /* tp_init */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	234 0, /* tp_alloc */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	235 dirstate_tuple_new, /* tp_new */
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	236 };
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	237
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	238 static PyObject parse_dirstate(PyObject self, PyObject *args)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	239 {
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	240 PyObject dmap, cmap, parents = NULL, ret = NULL;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	241 PyObject fname = NULL, cname = NULL, *entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	242 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	243 int mode, size, mtime;
22403 41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	244 unsigned int flen, len, pos = 40;
41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	245 int readlen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	246
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	247 if (!PyArg_ParseTuple(args, "O!O!s#:parse_dirstate",
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	248 &PyDict_Type, &dmap,
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	249 &PyDict_Type, &cmap,
22403 41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	250 &str, &readlen))
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	251 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	252
22403 41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	253 len = readlen;
41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	254
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	255 /* 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	256 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	257 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	258 PyExc_ValueError, "too little data for parents");
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	259 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	260 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	261
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	262 parents = Py_BuildValue("s#s#", str, 20, str + 20, 20);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	263 if (!parents)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	264 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	265
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	266 /* read filenames */
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	267 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	268 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	269 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	270 "overflow in dirstate");
f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	271 goto quit;
f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	272 }
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	273 cur = str + pos;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	274 /* unpack header */
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	275 state = *cur;
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	276 mode = getbe32(cur + 1);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	277 size = getbe32(cur + 5);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	278 mtime = getbe32(cur + 9);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	279 flen = getbe32(cur + 13);
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	280 pos += 17;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	281 cur += 17;
20316 40f08c31844c parsers: fix 'unsigned expression is always true' warning (issue4142) David Soria Parra <davidsp@fb.com> parents: 20169 diff changeset	282 if (flen > len - pos) {
7174 4da87407b845 parsers.c: fix integer overflows Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7168 diff changeset	283 PyErr_SetString(PyExc_ValueError, "overflow in dirstate");
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	284 goto quit;
7174 4da87407b845 parsers.c: fix integer overflows Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7168 diff changeset	285 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	286
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	287 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	288 mtime);
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	289 cpos = memchr(cur, 0, flen);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	290 if (cpos) {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	291 fname = PyBytes_FromStringAndSize(cur, cpos - cur);
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	292 cname = PyBytes_FromStringAndSize(cpos + 1,
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	293 flen - (cpos - cur) - 1);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	294 if (!fname \|\| !cname \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	295 PyDict_SetItem(cmap, fname, cname) == -1 \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	296 PyDict_SetItem(dmap, fname, entry) == -1)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	297 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	298 Py_DECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	299 } else {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	300 fname = PyBytes_FromStringAndSize(cur, flen);
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	301 if (!fname \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	302 PyDict_SetItem(dmap, fname, entry) == -1)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	303 goto quit;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	304 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	305 Py_DECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	306 Py_DECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	307 fname = cname = entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	308 pos += flen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	309 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	310
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	311 ret = parents;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	312 Py_INCREF(ret);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	313 quit:
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	314 Py_XDECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	315 Py_XDECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	316 Py_XDECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	317 Py_XDECREF(parents);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	318 return ret;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	319 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	320
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	321 /*
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	322 * 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	323 */
34440 7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	324 static PyObject nonnormalotherparententries(PyObject self, PyObject *args)
7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	325 {
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	326 PyObject dmap, fname, *v;
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	327 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	328 Py_ssize_t pos;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	329
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	330 if (!PyArg_ParseTuple(args, "O!:nonnormalentries",
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	331 &PyDict_Type, &dmap))
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	332 goto bail;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	333
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	334 nonnset = PySet_New(NULL);
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	335 if (nonnset == NULL)
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	336 goto bail;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	337
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	338 otherpset = PySet_New(NULL);
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	339 if (otherpset == NULL)
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	340 goto bail;
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	341
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	342 pos = 0;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	343 while (PyDict_Next(dmap, &pos, &fname, &v)) {
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	344 dirstateTupleObject *t;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	345 if (!dirstate_tuple_check(v)) {
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	346 PyErr_SetString(PyExc_TypeError,
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	347 "expected a dirstate tuple");
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	348 goto bail;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	349 }
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	350 t = (dirstateTupleObject *)v;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	351
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	352 if (t->state == 'n' && t->size == -2) {
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	353 if (PySet_Add(otherpset, fname) == -1) {
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	354 goto bail;
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	355 }
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	356 }
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	357
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	358 if (t->state == 'n' && t->mtime != -1)
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	359 continue;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	360 if (PySet_Add(nonnset, fname) == -1)
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	361 goto bail;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	362 }
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	363
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	364 result = Py_BuildValue("(OO)", nonnset, otherpset);
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	365 if (result == NULL)
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	366 goto bail;
31291 fffd1abb1337 parsers: avoid leak of nonnset and otherpset Augie Fackler <augie@google.com> parents: 31278 diff changeset	367 Py_DECREF(nonnset);
fffd1abb1337 parsers: avoid leak of nonnset and otherpset Augie Fackler <augie@google.com> parents: 31278 diff changeset	368 Py_DECREF(otherpset);
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	369 return result;
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	370 bail:
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	371 Py_XDECREF(nonnset);
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	372 Py_XDECREF(otherpset);
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	373 Py_XDECREF(result);
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	374 return NULL;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	375 }
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	376
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	377 /*
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	378 * 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	379 */
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	380 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	381 {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	382 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	383 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	384 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	385 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	386 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	387 int now;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	388
26630 3111b45a2bbf parsers: make pack_dirstate take now in integer for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26591 diff changeset	389 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	390 &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	391 &pl, &now))
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	392 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	393
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	394 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	395 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	396 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	397 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	398
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	399 /* 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	400 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	401 PyObject *c;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	402 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	403 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	404 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	405 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	406 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	407 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	408 if (c) {
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	409 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	410 PyErr_SetString(PyExc_TypeError,
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	411 "expected string key");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	412 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	413 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	414 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	415 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	416 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	417
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	418 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	419 if (packobj == NULL)
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	420 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	421
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	422 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	423
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	424 pn = PySequence_ITEM(pl, 0);
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	425 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	426 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	427 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	428 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	429 memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	430 p += 20;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	431 pn = PySequence_ITEM(pl, 1);
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	432 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	433 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	434 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	435 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	436 memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	437 p += 20;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	438
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	439 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	440 dirstateTupleObject *tuple;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	441 char state;
26774 04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	442 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	443 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	444 PyObject *o;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	445 char *t;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	446
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	447 if (!dirstate_tuple_check(v)) {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	448 PyErr_SetString(PyExc_TypeError,
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	449 "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	450 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	451 }
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	452 tuple = (dirstateTupleObject *)v;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	453
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	454 state = tuple->state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	455 mode = tuple->mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	456 size = tuple->size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	457 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	458 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	459 /* 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	460 * 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	461 mtime = -1;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	462 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	463 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	464 if (!mtime_unset)
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	465 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	466 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	467 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	468 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	469 mtime_unset = NULL;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	470 }
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	471 *p++ = state;
26774 04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	472 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	473 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	474 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	475 t = p + 12;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	476 p += 16;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	477 len = PyBytes_GET_SIZE(k);
c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	478 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	479 p += len;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	480 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	481 if (o) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	482 *p++ = '\0';
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	483 l = PyBytes_GET_SIZE(o);
c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	484 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	485 p += l;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	486 len += l + 1;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	487 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	488 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	489 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	490
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	491 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	492 if (pos != nbytes) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	493 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	494 (long)pos, (long)nbytes);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	495 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	496 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	497
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	498 return packobj;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	499 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	500 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	501 Py_XDECREF(packobj);
23946 f3e94aa6e182 parsers: don't leak a tuple in pack_dirstate Augie Fackler <augie@google.com> parents: 23945 diff changeset	502 Py_XDECREF(v);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	503 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	504 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	505
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	506 #define BUMPED_FIX 1
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	507 #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	508 #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	509
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	510 static PyObject *readshas(
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	511 const char *source, unsigned char num, Py_ssize_t hashwidth)
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	512 {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	513 int i;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	514 PyObject *list = PyTuple_New(num);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	515 if (list == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	516 return NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	517 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	518 for (i = 0; i < num; i++) {
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	519 PyObject *hash = PyBytes_FromStringAndSize(source, hashwidth);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	520 if (hash == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	521 Py_DECREF(list);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	522 return NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	523 }
26213 4d6cdea33f37 parsers: use PyTuple_SET_ITEM() to fill new marker tuples Yuya Nishihara <yuya@tcha.org> parents: 26107 diff changeset	524 PyTuple_SET_ITEM(list, i, hash);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	525 source += hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	526 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	527 return list;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	528 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	529
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	530 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	531 uint32_t *msize)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	532 {
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	533 const char *data = databegin;
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	534 const char *meta;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	535
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	536 double mtime;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	537 int16_t tz;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	538 uint16_t flags;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	539 unsigned char nsuccs, nparents, nmetadata;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	540 Py_ssize_t hashwidth = 20;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	541
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	542 PyObject prec = NULL, parents = NULL, *succs = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	543 PyObject metadata = NULL, ret = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	544 int i;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	545
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	546 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	547 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	548 }
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	549
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	550 *msize = getbe32(data);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	551 data += 4;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	552 mtime = getbefloat64(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	553 data += 8;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	554 tz = getbeint16(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	555 data += 2;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	556 flags = getbeuint16(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	557 data += 2;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	558
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	559 if (flags & USING_SHA_256) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	560 hashwidth = 32;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	561 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	562
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	563 nsuccs = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	564 nparents = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	565 nmetadata = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	566
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	567 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	568 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	569 }
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	570 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	571
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	572 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	573 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	574 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	575 prec = PyBytes_FromStringAndSize(data, hashwidth);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	576 data += hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	577 if (prec == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	578 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	579 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	580
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	581 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	582 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	583 }
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	584 succs = readshas(data, nsuccs, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	585 if (succs == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	586 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	587 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	588 data += nsuccs * hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	589
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	590 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	591 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	592 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	593 }
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	594 parents = readshas(data, nparents, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	595 if (parents == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	596 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	597 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	598 data += nparents * hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	599 } else {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	600 parents = Py_None;
31426 43a7dfbead0c parsers: handle refcounting of "parents" consistently Gregory Szorc <gregory.szorc@gmail.com> parents: 31292 diff changeset	601 Py_INCREF(parents);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	602 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	603
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	604 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	605 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	606 }
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	607 meta = data + (2 * nmetadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	608 metadata = PyTuple_New(nmetadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	609 if (metadata == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	610 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	611 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	612 for (i = 0; i < nmetadata; i++) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	613 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	614 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	615 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	616 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	617 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	618 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	619 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	620 meta += leftsize;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	621 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	622 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	623 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	624 if (!left \|\| !right \|\| !tmp) {
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	625 Py_XDECREF(left);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	626 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	627 Py_XDECREF(tmp);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	628 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	629 }
26214 46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	630 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	631 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	632 PyTuple_SET_ITEM(metadata, i, tmp);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	633 }
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	634 ret = Py_BuildValue("(OOHO(di)O)", prec, succs, flags,
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	635 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	636 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	637
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	638 overflow:
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	639 PyErr_SetString(PyExc_ValueError, "overflow in obsstore");
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	640 bail:
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	641 Py_XDECREF(prec);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	642 Py_XDECREF(succs);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	643 Py_XDECREF(metadata);
31426 43a7dfbead0c parsers: handle refcounting of "parents" consistently Gregory Szorc <gregory.szorc@gmail.com> parents: 31292 diff changeset	644 Py_XDECREF(parents);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	645 return ret;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	646 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	647
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	648
34440 7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	649 static PyObject fm1readmarkers(PyObject self, PyObject *args)
7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	650 {
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	651 const char data, dataend;
26872 ce03e72837c6 parsers: fix width of datalen variable in fm1readmarkers Yuya Nishihara <yuya@tcha.org> parents: 26775 diff changeset	652 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	653 Py_ssize_t offset, stop;
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	654 PyObject *markers = NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	655
26107 50582df9d7a7 parsers: fix two cases of unsigned long instead of Py_ssize_t Augie Fackler <augie@google.com> parents: 26098 diff changeset	656 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	657 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	658 }
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	659 dataend = data + datalen;
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	660 data += offset;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	661 markers = PyList_New(0);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	662 if (!markers) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	663 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	664 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	665 while (offset < stop) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	666 uint32_t msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	667 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	668 PyObject *record = fm1readmarker(data, dataend, &msize);
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	669 if (!record) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	670 goto bail;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	671 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	672 error = PyList_Append(markers, record);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	673 Py_DECREF(record);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	674 if (error) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	675 goto bail;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	676 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	677 data += msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	678 offset += msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	679 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	680 return markers;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	681 bail:
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	682 Py_DECREF(markers);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	683 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	684 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	685
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	686 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	687
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	688 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	689 PyObject pathencode(PyObject self, PyObject *args);
18430 0459c6555f69 store: implement lowerencode in C Bryan O'Sullivan <bryano@fb.com> parents: 17616 diff changeset	690 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	691 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	692
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	693 static PyMethodDef methods[] = {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	694 {"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	695 {"nonnormalotherparententries", nonnormalotherparententries, METH_VARARGS,
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	696 "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	697 "dirstate\n"},
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	698 {"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	699 {"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	700 {"parse_index2", parse_index2, METH_VARARGS, "parse a revlog index\n"},
33926 f4433f2713d0 encoding: add function to test if a str consists of ASCII characters Yuya Nishihara <yuya@tcha.org> parents: 33925 diff changeset	701 {"isasciistr", isasciistr, METH_VARARGS, "check if an ASCII string\n"},
22778 80f2b63dd83a parsers: add a function to efficiently lowercase ASCII strings Siddharth Agarwal <sid0@fb.com> parents: 22604 diff changeset	702 {"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	703 {"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	704 {"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	705 "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	706 {"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	707 "make file foldmap\n"},
33925 2c37f9dabc32 encoding: add fast path of jsonescape() (issue5533) Yuya Nishihara <yuya@tcha.org> parents: 33812 diff changeset	708 {"jsonescapeu8fast", jsonescapeu8fast, METH_VARARGS,
2c37f9dabc32 encoding: add fast path of jsonescape() (issue5533) Yuya Nishihara <yuya@tcha.org> parents: 33812 diff changeset	709 "escape a UTF-8 byte string to JSON (fast path)\n"},
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	710 {"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	711 {"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	712 {"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	713 {"fm1readmarkers", fm1readmarkers, METH_VARARGS,
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	714 "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	715 {NULL, NULL}
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	716 };
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	717
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	718 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	719 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	720 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	721
33926 f4433f2713d0 encoding: add function to test if a str consists of ASCII characters Yuya Nishihara <yuya@tcha.org> parents: 33925 diff changeset	722 static const int version = 3;
32360 af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	723
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	724 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	725 {
32360 af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	726 PyModule_AddIntConstant(mod, "version", version);
af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	727
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	728 /* 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	729 * 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	730 * 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	731 * 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	732 * 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	733 * 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	734 * 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	735 * 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	736 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	737
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	738 dirs_module_init(mod);
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: 24032 diff changeset	739 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	740 revlog_module_init(mod);
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	741
32384 2e5a476b2e46 cext: move back finalization of dirstateTupleType where it should be Yuya Nishihara <yuya@tcha.org> parents: 32378 diff changeset	742 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	743 return;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	744 Py_INCREF(&dirstateTupleType);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	745 PyModule_AddObject(mod, "dirstatetuple",
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	746 (PyObject *)&dirstateTupleType);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	747 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	748
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	749 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	750 {
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	751 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	752 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	753 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	754 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	755 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	756 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	757 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	758 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	759 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	760 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	761 /* 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	762 * 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	763 * 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	764 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	765 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	766 "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	767 "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	768 "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	769 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	770 return -1;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	771 }
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	772 return 0;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	773 }
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	774
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	775 #ifdef IS_PY3K
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	776 static struct PyModuleDef parsers_module = {
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	777 PyModuleDef_HEAD_INIT,
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	778 "parsers",
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	779 parsers_doc,
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	780 -1,
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	781 methods
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	782 };
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	783
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	784 PyMODINIT_FUNC PyInit_parsers(void)
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	785 {
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	786 PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	787
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	788 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	789 return NULL;
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	790 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	791 module_init(mod);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	792 return mod;
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	793 }
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	794 #else
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	795 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	796 {
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	797 PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	798
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	799 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	800 return;
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	801 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	802 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	803 }
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	804 #endif

Mercurial > public > mercurial-scm > hg

annotate mercurial/cext/parsers.c @ 34440:7ed0750c71a1