##// END OF EJS Templates
parsers: use k instead of n for PyArg_ParseTuple because python 2.4 is awful
Augie Fackler -
r24032:c53bc2e5 default
parent child Browse files
Show More
@@ -1,2404 +1,2407 b''
1 /*
1 /*
2 parsers.c - efficient content parsing
2 parsers.c - efficient content parsing
3
3
4 Copyright 2008 Matt Mackall <mpm@selenic.com> and others
4 Copyright 2008 Matt Mackall <mpm@selenic.com> and others
5
5
6 This software may be used and distributed according to the terms of
6 This software may be used and distributed according to the terms of
7 the GNU General Public License, incorporated herein by reference.
7 the GNU General Public License, incorporated herein by reference.
8 */
8 */
9
9
10 #include <Python.h>
10 #include <Python.h>
11 #include <ctype.h>
11 #include <ctype.h>
12 #include <stddef.h>
12 #include <stddef.h>
13 #include <string.h>
13 #include <string.h>
14
14
15 #include "util.h"
15 #include "util.h"
16
16
17 static char *versionerrortext = "Python minor version mismatch";
17 static char *versionerrortext = "Python minor version mismatch";
18
18
19 static int8_t hextable[256] = {
19 static int8_t hextable[256] = {
20 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
20 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
21 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
21 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
22 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
22 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
23 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 0-9 */
23 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 0-9 */
24 -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* A-F */
24 -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* A-F */
25 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
25 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
26 -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* a-f */
26 -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* a-f */
27 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
27 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
28 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
28 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
29 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
29 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
30 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
30 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
31 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
31 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
32 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
32 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
33 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
33 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
34 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
34 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
35 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
35 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
36 };
36 };
37
37
38 static char lowertable[128] = {
38 static char lowertable[128] = {
39 '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
39 '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
40 '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
40 '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
41 '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
41 '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
42 '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
42 '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
43 '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
43 '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
44 '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
44 '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
45 '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
45 '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
46 '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
46 '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
47 '\x40',
47 '\x40',
48 '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67', /* A-G */
48 '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67', /* A-G */
49 '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f', /* H-O */
49 '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f', /* H-O */
50 '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77', /* P-W */
50 '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77', /* P-W */
51 '\x78', '\x79', '\x7a', /* X-Z */
51 '\x78', '\x79', '\x7a', /* X-Z */
52 '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
52 '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
53 '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
53 '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
54 '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
54 '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
55 '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
55 '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
56 '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f'
56 '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f'
57 };
57 };
58
58
59 static inline int hexdigit(const char *p, Py_ssize_t off)
59 static inline int hexdigit(const char *p, Py_ssize_t off)
60 {
60 {
61 int8_t val = hextable[(unsigned char)p[off]];
61 int8_t val = hextable[(unsigned char)p[off]];
62
62
63 if (val >= 0) {
63 if (val >= 0) {
64 return val;
64 return val;
65 }
65 }
66
66
67 PyErr_SetString(PyExc_ValueError, "input contains non-hex character");
67 PyErr_SetString(PyExc_ValueError, "input contains non-hex character");
68 return 0;
68 return 0;
69 }
69 }
70
70
71 /*
71 /*
72 * Turn a hex-encoded string into binary.
72 * Turn a hex-encoded string into binary.
73 */
73 */
74 static PyObject *unhexlify(const char *str, int len)
74 static PyObject *unhexlify(const char *str, int len)
75 {
75 {
76 PyObject *ret;
76 PyObject *ret;
77 char *d;
77 char *d;
78 int i;
78 int i;
79
79
80 ret = PyBytes_FromStringAndSize(NULL, len / 2);
80 ret = PyBytes_FromStringAndSize(NULL, len / 2);
81
81
82 if (!ret)
82 if (!ret)
83 return NULL;
83 return NULL;
84
84
85 d = PyBytes_AsString(ret);
85 d = PyBytes_AsString(ret);
86
86
87 for (i = 0; i < len;) {
87 for (i = 0; i < len;) {
88 int hi = hexdigit(str, i++);
88 int hi = hexdigit(str, i++);
89 int lo = hexdigit(str, i++);
89 int lo = hexdigit(str, i++);
90 *d++ = (hi << 4) | lo;
90 *d++ = (hi << 4) | lo;
91 }
91 }
92
92
93 return ret;
93 return ret;
94 }
94 }
95
95
96 static PyObject *asciilower(PyObject *self, PyObject *args)
96 static PyObject *asciilower(PyObject *self, PyObject *args)
97 {
97 {
98 char *str, *newstr;
98 char *str, *newstr;
99 int i, len;
99 int i, len;
100 PyObject *newobj = NULL;
100 PyObject *newobj = NULL;
101
101
102 if (!PyArg_ParseTuple(args, "s#", &str, &len))
102 if (!PyArg_ParseTuple(args, "s#", &str, &len))
103 goto quit;
103 goto quit;
104
104
105 newobj = PyBytes_FromStringAndSize(NULL, len);
105 newobj = PyBytes_FromStringAndSize(NULL, len);
106 if (!newobj)
106 if (!newobj)
107 goto quit;
107 goto quit;
108
108
109 newstr = PyBytes_AS_STRING(newobj);
109 newstr = PyBytes_AS_STRING(newobj);
110
110
111 for (i = 0; i < len; i++) {
111 for (i = 0; i < len; i++) {
112 char c = str[i];
112 char c = str[i];
113 if (c & 0x80) {
113 if (c & 0x80) {
114 PyObject *err = PyUnicodeDecodeError_Create(
114 PyObject *err = PyUnicodeDecodeError_Create(
115 "ascii", str, len, i, (i + 1),
115 "ascii", str, len, i, (i + 1),
116 "unexpected code byte");
116 "unexpected code byte");
117 PyErr_SetObject(PyExc_UnicodeDecodeError, err);
117 PyErr_SetObject(PyExc_UnicodeDecodeError, err);
118 Py_XDECREF(err);
118 Py_XDECREF(err);
119 goto quit;
119 goto quit;
120 }
120 }
121 newstr[i] = lowertable[(unsigned char)c];
121 newstr[i] = lowertable[(unsigned char)c];
122 }
122 }
123
123
124 return newobj;
124 return newobj;
125 quit:
125 quit:
126 Py_XDECREF(newobj);
126 Py_XDECREF(newobj);
127 return NULL;
127 return NULL;
128 }
128 }
129
129
130 /*
130 /*
131 * This code assumes that a manifest is stitched together with newline
131 * This code assumes that a manifest is stitched together with newline
132 * ('\n') characters.
132 * ('\n') characters.
133 */
133 */
134 static PyObject *parse_manifest(PyObject *self, PyObject *args)
134 static PyObject *parse_manifest(PyObject *self, PyObject *args)
135 {
135 {
136 PyObject *mfdict, *fdict;
136 PyObject *mfdict, *fdict;
137 char *str, *start, *end;
137 char *str, *start, *end;
138 int len;
138 int len;
139
139
140 if (!PyArg_ParseTuple(args, "O!O!s#:parse_manifest",
140 if (!PyArg_ParseTuple(args, "O!O!s#:parse_manifest",
141 &PyDict_Type, &mfdict,
141 &PyDict_Type, &mfdict,
142 &PyDict_Type, &fdict,
142 &PyDict_Type, &fdict,
143 &str, &len))
143 &str, &len))
144 goto quit;
144 goto quit;
145
145
146 start = str;
146 start = str;
147 end = str + len;
147 end = str + len;
148 while (start < end) {
148 while (start < end) {
149 PyObject *file = NULL, *node = NULL;
149 PyObject *file = NULL, *node = NULL;
150 PyObject *flags = NULL;
150 PyObject *flags = NULL;
151 char *zero = NULL, *newline = NULL;
151 char *zero = NULL, *newline = NULL;
152 ptrdiff_t nlen;
152 ptrdiff_t nlen;
153
153
154 zero = memchr(start, '\0', end - start);
154 zero = memchr(start, '\0', end - start);
155 if (!zero) {
155 if (!zero) {
156 PyErr_SetString(PyExc_ValueError,
156 PyErr_SetString(PyExc_ValueError,
157 "manifest entry has no separator");
157 "manifest entry has no separator");
158 goto quit;
158 goto quit;
159 }
159 }
160
160
161 newline = memchr(zero + 1, '\n', end - (zero + 1));
161 newline = memchr(zero + 1, '\n', end - (zero + 1));
162 if (!newline) {
162 if (!newline) {
163 PyErr_SetString(PyExc_ValueError,
163 PyErr_SetString(PyExc_ValueError,
164 "manifest contains trailing garbage");
164 "manifest contains trailing garbage");
165 goto quit;
165 goto quit;
166 }
166 }
167
167
168 file = PyBytes_FromStringAndSize(start, zero - start);
168 file = PyBytes_FromStringAndSize(start, zero - start);
169
169
170 if (!file)
170 if (!file)
171 goto bail;
171 goto bail;
172
172
173 nlen = newline - zero - 1;
173 nlen = newline - zero - 1;
174
174
175 node = unhexlify(zero + 1, nlen > 40 ? 40 : (int)nlen);
175 node = unhexlify(zero + 1, nlen > 40 ? 40 : (int)nlen);
176 if (!node)
176 if (!node)
177 goto bail;
177 goto bail;
178
178
179 if (nlen > 40) {
179 if (nlen > 40) {
180 flags = PyBytes_FromStringAndSize(zero + 41,
180 flags = PyBytes_FromStringAndSize(zero + 41,
181 nlen - 40);
181 nlen - 40);
182 if (!flags)
182 if (!flags)
183 goto bail;
183 goto bail;
184
184
185 if (PyDict_SetItem(fdict, file, flags) == -1)
185 if (PyDict_SetItem(fdict, file, flags) == -1)
186 goto bail;
186 goto bail;
187 }
187 }
188
188
189 if (PyDict_SetItem(mfdict, file, node) == -1)
189 if (PyDict_SetItem(mfdict, file, node) == -1)
190 goto bail;
190 goto bail;
191
191
192 start = newline + 1;
192 start = newline + 1;
193
193
194 Py_XDECREF(flags);
194 Py_XDECREF(flags);
195 Py_XDECREF(node);
195 Py_XDECREF(node);
196 Py_XDECREF(file);
196 Py_XDECREF(file);
197 continue;
197 continue;
198 bail:
198 bail:
199 Py_XDECREF(flags);
199 Py_XDECREF(flags);
200 Py_XDECREF(node);
200 Py_XDECREF(node);
201 Py_XDECREF(file);
201 Py_XDECREF(file);
202 goto quit;
202 goto quit;
203 }
203 }
204
204
205 Py_INCREF(Py_None);
205 Py_INCREF(Py_None);
206 return Py_None;
206 return Py_None;
207 quit:
207 quit:
208 return NULL;
208 return NULL;
209 }
209 }
210
210
211 static inline dirstateTupleObject *make_dirstate_tuple(char state, int mode,
211 static inline dirstateTupleObject *make_dirstate_tuple(char state, int mode,
212 int size, int mtime)
212 int size, int mtime)
213 {
213 {
214 dirstateTupleObject *t = PyObject_New(dirstateTupleObject,
214 dirstateTupleObject *t = PyObject_New(dirstateTupleObject,
215 &dirstateTupleType);
215 &dirstateTupleType);
216 if (!t)
216 if (!t)
217 return NULL;
217 return NULL;
218 t->state = state;
218 t->state = state;
219 t->mode = mode;
219 t->mode = mode;
220 t->size = size;
220 t->size = size;
221 t->mtime = mtime;
221 t->mtime = mtime;
222 return t;
222 return t;
223 }
223 }
224
224
225 static PyObject *dirstate_tuple_new(PyTypeObject *subtype, PyObject *args,
225 static PyObject *dirstate_tuple_new(PyTypeObject *subtype, PyObject *args,
226 PyObject *kwds)
226 PyObject *kwds)
227 {
227 {
228 /* We do all the initialization here and not a tp_init function because
228 /* We do all the initialization here and not a tp_init function because
229 * dirstate_tuple is immutable. */
229 * dirstate_tuple is immutable. */
230 dirstateTupleObject *t;
230 dirstateTupleObject *t;
231 char state;
231 char state;
232 int size, mode, mtime;
232 int size, mode, mtime;
233 if (!PyArg_ParseTuple(args, "ciii", &state, &mode, &size, &mtime))
233 if (!PyArg_ParseTuple(args, "ciii", &state, &mode, &size, &mtime))
234 return NULL;
234 return NULL;
235
235
236 t = (dirstateTupleObject *)subtype->tp_alloc(subtype, 1);
236 t = (dirstateTupleObject *)subtype->tp_alloc(subtype, 1);
237 if (!t)
237 if (!t)
238 return NULL;
238 return NULL;
239 t->state = state;
239 t->state = state;
240 t->mode = mode;
240 t->mode = mode;
241 t->size = size;
241 t->size = size;
242 t->mtime = mtime;
242 t->mtime = mtime;
243
243
244 return (PyObject *)t;
244 return (PyObject *)t;
245 }
245 }
246
246
247 static void dirstate_tuple_dealloc(PyObject *o)
247 static void dirstate_tuple_dealloc(PyObject *o)
248 {
248 {
249 PyObject_Del(o);
249 PyObject_Del(o);
250 }
250 }
251
251
252 static Py_ssize_t dirstate_tuple_length(PyObject *o)
252 static Py_ssize_t dirstate_tuple_length(PyObject *o)
253 {
253 {
254 return 4;
254 return 4;
255 }
255 }
256
256
257 static PyObject *dirstate_tuple_item(PyObject *o, Py_ssize_t i)
257 static PyObject *dirstate_tuple_item(PyObject *o, Py_ssize_t i)
258 {
258 {
259 dirstateTupleObject *t = (dirstateTupleObject *)o;
259 dirstateTupleObject *t = (dirstateTupleObject *)o;
260 switch (i) {
260 switch (i) {
261 case 0:
261 case 0:
262 return PyBytes_FromStringAndSize(&t->state, 1);
262 return PyBytes_FromStringAndSize(&t->state, 1);
263 case 1:
263 case 1:
264 return PyInt_FromLong(t->mode);
264 return PyInt_FromLong(t->mode);
265 case 2:
265 case 2:
266 return PyInt_FromLong(t->size);
266 return PyInt_FromLong(t->size);
267 case 3:
267 case 3:
268 return PyInt_FromLong(t->mtime);
268 return PyInt_FromLong(t->mtime);
269 default:
269 default:
270 PyErr_SetString(PyExc_IndexError, "index out of range");
270 PyErr_SetString(PyExc_IndexError, "index out of range");
271 return NULL;
271 return NULL;
272 }
272 }
273 }
273 }
274
274
275 static PySequenceMethods dirstate_tuple_sq = {
275 static PySequenceMethods dirstate_tuple_sq = {
276 dirstate_tuple_length, /* sq_length */
276 dirstate_tuple_length, /* sq_length */
277 0, /* sq_concat */
277 0, /* sq_concat */
278 0, /* sq_repeat */
278 0, /* sq_repeat */
279 dirstate_tuple_item, /* sq_item */
279 dirstate_tuple_item, /* sq_item */
280 0, /* sq_ass_item */
280 0, /* sq_ass_item */
281 0, /* sq_contains */
281 0, /* sq_contains */
282 0, /* sq_inplace_concat */
282 0, /* sq_inplace_concat */
283 0 /* sq_inplace_repeat */
283 0 /* sq_inplace_repeat */
284 };
284 };
285
285
286 PyTypeObject dirstateTupleType = {
286 PyTypeObject dirstateTupleType = {
287 PyVarObject_HEAD_INIT(NULL, 0)
287 PyVarObject_HEAD_INIT(NULL, 0)
288 "dirstate_tuple", /* tp_name */
288 "dirstate_tuple", /* tp_name */
289 sizeof(dirstateTupleObject),/* tp_basicsize */
289 sizeof(dirstateTupleObject),/* tp_basicsize */
290 0, /* tp_itemsize */
290 0, /* tp_itemsize */
291 (destructor)dirstate_tuple_dealloc, /* tp_dealloc */
291 (destructor)dirstate_tuple_dealloc, /* tp_dealloc */
292 0, /* tp_print */
292 0, /* tp_print */
293 0, /* tp_getattr */
293 0, /* tp_getattr */
294 0, /* tp_setattr */
294 0, /* tp_setattr */
295 0, /* tp_compare */
295 0, /* tp_compare */
296 0, /* tp_repr */
296 0, /* tp_repr */
297 0, /* tp_as_number */
297 0, /* tp_as_number */
298 &dirstate_tuple_sq, /* tp_as_sequence */
298 &dirstate_tuple_sq, /* tp_as_sequence */
299 0, /* tp_as_mapping */
299 0, /* tp_as_mapping */
300 0, /* tp_hash */
300 0, /* tp_hash */
301 0, /* tp_call */
301 0, /* tp_call */
302 0, /* tp_str */
302 0, /* tp_str */
303 0, /* tp_getattro */
303 0, /* tp_getattro */
304 0, /* tp_setattro */
304 0, /* tp_setattro */
305 0, /* tp_as_buffer */
305 0, /* tp_as_buffer */
306 Py_TPFLAGS_DEFAULT, /* tp_flags */
306 Py_TPFLAGS_DEFAULT, /* tp_flags */
307 "dirstate tuple", /* tp_doc */
307 "dirstate tuple", /* tp_doc */
308 0, /* tp_traverse */
308 0, /* tp_traverse */
309 0, /* tp_clear */
309 0, /* tp_clear */
310 0, /* tp_richcompare */
310 0, /* tp_richcompare */
311 0, /* tp_weaklistoffset */
311 0, /* tp_weaklistoffset */
312 0, /* tp_iter */
312 0, /* tp_iter */
313 0, /* tp_iternext */
313 0, /* tp_iternext */
314 0, /* tp_methods */
314 0, /* tp_methods */
315 0, /* tp_members */
315 0, /* tp_members */
316 0, /* tp_getset */
316 0, /* tp_getset */
317 0, /* tp_base */
317 0, /* tp_base */
318 0, /* tp_dict */
318 0, /* tp_dict */
319 0, /* tp_descr_get */
319 0, /* tp_descr_get */
320 0, /* tp_descr_set */
320 0, /* tp_descr_set */
321 0, /* tp_dictoffset */
321 0, /* tp_dictoffset */
322 0, /* tp_init */
322 0, /* tp_init */
323 0, /* tp_alloc */
323 0, /* tp_alloc */
324 dirstate_tuple_new, /* tp_new */
324 dirstate_tuple_new, /* tp_new */
325 };
325 };
326
326
327 static PyObject *parse_dirstate(PyObject *self, PyObject *args)
327 static PyObject *parse_dirstate(PyObject *self, PyObject *args)
328 {
328 {
329 PyObject *dmap, *cmap, *parents = NULL, *ret = NULL;
329 PyObject *dmap, *cmap, *parents = NULL, *ret = NULL;
330 PyObject *fname = NULL, *cname = NULL, *entry = NULL;
330 PyObject *fname = NULL, *cname = NULL, *entry = NULL;
331 char state, *cur, *str, *cpos;
331 char state, *cur, *str, *cpos;
332 int mode, size, mtime;
332 int mode, size, mtime;
333 unsigned int flen, len, pos = 40;
333 unsigned int flen, len, pos = 40;
334 int readlen;
334 int readlen;
335
335
336 if (!PyArg_ParseTuple(args, "O!O!s#:parse_dirstate",
336 if (!PyArg_ParseTuple(args, "O!O!s#:parse_dirstate",
337 &PyDict_Type, &dmap,
337 &PyDict_Type, &dmap,
338 &PyDict_Type, &cmap,
338 &PyDict_Type, &cmap,
339 &str, &readlen))
339 &str, &readlen))
340 goto quit;
340 goto quit;
341
341
342 if (readlen < 0)
342 if (readlen < 0)
343 goto quit;
343 goto quit;
344
344
345 len = readlen;
345 len = readlen;
346
346
347 /* read parents */
347 /* read parents */
348 if (len < 40)
348 if (len < 40)
349 goto quit;
349 goto quit;
350
350
351 parents = Py_BuildValue("s#s#", str, 20, str + 20, 20);
351 parents = Py_BuildValue("s#s#", str, 20, str + 20, 20);
352 if (!parents)
352 if (!parents)
353 goto quit;
353 goto quit;
354
354
355 /* read filenames */
355 /* read filenames */
356 while (pos >= 40 && pos < len) {
356 while (pos >= 40 && pos < len) {
357 cur = str + pos;
357 cur = str + pos;
358 /* unpack header */
358 /* unpack header */
359 state = *cur;
359 state = *cur;
360 mode = getbe32(cur + 1);
360 mode = getbe32(cur + 1);
361 size = getbe32(cur + 5);
361 size = getbe32(cur + 5);
362 mtime = getbe32(cur + 9);
362 mtime = getbe32(cur + 9);
363 flen = getbe32(cur + 13);
363 flen = getbe32(cur + 13);
364 pos += 17;
364 pos += 17;
365 cur += 17;
365 cur += 17;
366 if (flen > len - pos) {
366 if (flen > len - pos) {
367 PyErr_SetString(PyExc_ValueError, "overflow in dirstate");
367 PyErr_SetString(PyExc_ValueError, "overflow in dirstate");
368 goto quit;
368 goto quit;
369 }
369 }
370
370
371 entry = (PyObject *)make_dirstate_tuple(state, mode, size,
371 entry = (PyObject *)make_dirstate_tuple(state, mode, size,
372 mtime);
372 mtime);
373 cpos = memchr(cur, 0, flen);
373 cpos = memchr(cur, 0, flen);
374 if (cpos) {
374 if (cpos) {
375 fname = PyBytes_FromStringAndSize(cur, cpos - cur);
375 fname = PyBytes_FromStringAndSize(cur, cpos - cur);
376 cname = PyBytes_FromStringAndSize(cpos + 1,
376 cname = PyBytes_FromStringAndSize(cpos + 1,
377 flen - (cpos - cur) - 1);
377 flen - (cpos - cur) - 1);
378 if (!fname || !cname ||
378 if (!fname || !cname ||
379 PyDict_SetItem(cmap, fname, cname) == -1 ||
379 PyDict_SetItem(cmap, fname, cname) == -1 ||
380 PyDict_SetItem(dmap, fname, entry) == -1)
380 PyDict_SetItem(dmap, fname, entry) == -1)
381 goto quit;
381 goto quit;
382 Py_DECREF(cname);
382 Py_DECREF(cname);
383 } else {
383 } else {
384 fname = PyBytes_FromStringAndSize(cur, flen);
384 fname = PyBytes_FromStringAndSize(cur, flen);
385 if (!fname ||
385 if (!fname ||
386 PyDict_SetItem(dmap, fname, entry) == -1)
386 PyDict_SetItem(dmap, fname, entry) == -1)
387 goto quit;
387 goto quit;
388 }
388 }
389 Py_DECREF(fname);
389 Py_DECREF(fname);
390 Py_DECREF(entry);
390 Py_DECREF(entry);
391 fname = cname = entry = NULL;
391 fname = cname = entry = NULL;
392 pos += flen;
392 pos += flen;
393 }
393 }
394
394
395 ret = parents;
395 ret = parents;
396 Py_INCREF(ret);
396 Py_INCREF(ret);
397 quit:
397 quit:
398 Py_XDECREF(fname);
398 Py_XDECREF(fname);
399 Py_XDECREF(cname);
399 Py_XDECREF(cname);
400 Py_XDECREF(entry);
400 Py_XDECREF(entry);
401 Py_XDECREF(parents);
401 Py_XDECREF(parents);
402 return ret;
402 return ret;
403 }
403 }
404
404
405 /*
405 /*
406 * Efficiently pack a dirstate object into its on-disk format.
406 * Efficiently pack a dirstate object into its on-disk format.
407 */
407 */
408 static PyObject *pack_dirstate(PyObject *self, PyObject *args)
408 static PyObject *pack_dirstate(PyObject *self, PyObject *args)
409 {
409 {
410 PyObject *packobj = NULL;
410 PyObject *packobj = NULL;
411 PyObject *map, *copymap, *pl, *mtime_unset = NULL;
411 PyObject *map, *copymap, *pl, *mtime_unset = NULL;
412 Py_ssize_t nbytes, pos, l;
412 Py_ssize_t nbytes, pos, l;
413 PyObject *k, *v = NULL, *pn;
413 PyObject *k, *v = NULL, *pn;
414 char *p, *s;
414 char *p, *s;
415 double now;
415 double now;
416
416
417 if (!PyArg_ParseTuple(args, "O!O!Od:pack_dirstate",
417 if (!PyArg_ParseTuple(args, "O!O!Od:pack_dirstate",
418 &PyDict_Type, &map, &PyDict_Type, &copymap,
418 &PyDict_Type, &map, &PyDict_Type, &copymap,
419 &pl, &now))
419 &pl, &now))
420 return NULL;
420 return NULL;
421
421
422 if (!PySequence_Check(pl) || PySequence_Size(pl) != 2) {
422 if (!PySequence_Check(pl) || PySequence_Size(pl) != 2) {
423 PyErr_SetString(PyExc_TypeError, "expected 2-element sequence");
423 PyErr_SetString(PyExc_TypeError, "expected 2-element sequence");
424 return NULL;
424 return NULL;
425 }
425 }
426
426
427 /* Figure out how much we need to allocate. */
427 /* Figure out how much we need to allocate. */
428 for (nbytes = 40, pos = 0; PyDict_Next(map, &pos, &k, &v);) {
428 for (nbytes = 40, pos = 0; PyDict_Next(map, &pos, &k, &v);) {
429 PyObject *c;
429 PyObject *c;
430 if (!PyString_Check(k)) {
430 if (!PyString_Check(k)) {
431 PyErr_SetString(PyExc_TypeError, "expected string key");
431 PyErr_SetString(PyExc_TypeError, "expected string key");
432 goto bail;
432 goto bail;
433 }
433 }
434 nbytes += PyString_GET_SIZE(k) + 17;
434 nbytes += PyString_GET_SIZE(k) + 17;
435 c = PyDict_GetItem(copymap, k);
435 c = PyDict_GetItem(copymap, k);
436 if (c) {
436 if (c) {
437 if (!PyString_Check(c)) {
437 if (!PyString_Check(c)) {
438 PyErr_SetString(PyExc_TypeError,
438 PyErr_SetString(PyExc_TypeError,
439 "expected string key");
439 "expected string key");
440 goto bail;
440 goto bail;
441 }
441 }
442 nbytes += PyString_GET_SIZE(c) + 1;
442 nbytes += PyString_GET_SIZE(c) + 1;
443 }
443 }
444 }
444 }
445
445
446 packobj = PyString_FromStringAndSize(NULL, nbytes);
446 packobj = PyString_FromStringAndSize(NULL, nbytes);
447 if (packobj == NULL)
447 if (packobj == NULL)
448 goto bail;
448 goto bail;
449
449
450 p = PyString_AS_STRING(packobj);
450 p = PyString_AS_STRING(packobj);
451
451
452 pn = PySequence_ITEM(pl, 0);
452 pn = PySequence_ITEM(pl, 0);
453 if (PyString_AsStringAndSize(pn, &s, &l) == -1 || l != 20) {
453 if (PyString_AsStringAndSize(pn, &s, &l) == -1 || l != 20) {
454 PyErr_SetString(PyExc_TypeError, "expected a 20-byte hash");
454 PyErr_SetString(PyExc_TypeError, "expected a 20-byte hash");
455 goto bail;
455 goto bail;
456 }
456 }
457 memcpy(p, s, l);
457 memcpy(p, s, l);
458 p += 20;
458 p += 20;
459 pn = PySequence_ITEM(pl, 1);
459 pn = PySequence_ITEM(pl, 1);
460 if (PyString_AsStringAndSize(pn, &s, &l) == -1 || l != 20) {
460 if (PyString_AsStringAndSize(pn, &s, &l) == -1 || l != 20) {
461 PyErr_SetString(PyExc_TypeError, "expected a 20-byte hash");
461 PyErr_SetString(PyExc_TypeError, "expected a 20-byte hash");
462 goto bail;
462 goto bail;
463 }
463 }
464 memcpy(p, s, l);
464 memcpy(p, s, l);
465 p += 20;
465 p += 20;
466
466
467 for (pos = 0; PyDict_Next(map, &pos, &k, &v); ) {
467 for (pos = 0; PyDict_Next(map, &pos, &k, &v); ) {
468 dirstateTupleObject *tuple;
468 dirstateTupleObject *tuple;
469 char state;
469 char state;
470 uint32_t mode, size, mtime;
470 uint32_t mode, size, mtime;
471 Py_ssize_t len, l;
471 Py_ssize_t len, l;
472 PyObject *o;
472 PyObject *o;
473 char *t;
473 char *t;
474
474
475 if (!dirstate_tuple_check(v)) {
475 if (!dirstate_tuple_check(v)) {
476 PyErr_SetString(PyExc_TypeError,
476 PyErr_SetString(PyExc_TypeError,
477 "expected a dirstate tuple");
477 "expected a dirstate tuple");
478 goto bail;
478 goto bail;
479 }
479 }
480 tuple = (dirstateTupleObject *)v;
480 tuple = (dirstateTupleObject *)v;
481
481
482 state = tuple->state;
482 state = tuple->state;
483 mode = tuple->mode;
483 mode = tuple->mode;
484 size = tuple->size;
484 size = tuple->size;
485 mtime = tuple->mtime;
485 mtime = tuple->mtime;
486 if (state == 'n' && mtime == (uint32_t)now) {
486 if (state == 'n' && mtime == (uint32_t)now) {
487 /* See pure/parsers.py:pack_dirstate for why we do
487 /* See pure/parsers.py:pack_dirstate for why we do
488 * this. */
488 * this. */
489 mtime = -1;
489 mtime = -1;
490 mtime_unset = (PyObject *)make_dirstate_tuple(
490 mtime_unset = (PyObject *)make_dirstate_tuple(
491 state, mode, size, mtime);
491 state, mode, size, mtime);
492 if (!mtime_unset)
492 if (!mtime_unset)
493 goto bail;
493 goto bail;
494 if (PyDict_SetItem(map, k, mtime_unset) == -1)
494 if (PyDict_SetItem(map, k, mtime_unset) == -1)
495 goto bail;
495 goto bail;
496 Py_DECREF(mtime_unset);
496 Py_DECREF(mtime_unset);
497 mtime_unset = NULL;
497 mtime_unset = NULL;
498 }
498 }
499 *p++ = state;
499 *p++ = state;
500 putbe32(mode, p);
500 putbe32(mode, p);
501 putbe32(size, p + 4);
501 putbe32(size, p + 4);
502 putbe32(mtime, p + 8);
502 putbe32(mtime, p + 8);
503 t = p + 12;
503 t = p + 12;
504 p += 16;
504 p += 16;
505 len = PyString_GET_SIZE(k);
505 len = PyString_GET_SIZE(k);
506 memcpy(p, PyString_AS_STRING(k), len);
506 memcpy(p, PyString_AS_STRING(k), len);
507 p += len;
507 p += len;
508 o = PyDict_GetItem(copymap, k);
508 o = PyDict_GetItem(copymap, k);
509 if (o) {
509 if (o) {
510 *p++ = '\0';
510 *p++ = '\0';
511 l = PyString_GET_SIZE(o);
511 l = PyString_GET_SIZE(o);
512 memcpy(p, PyString_AS_STRING(o), l);
512 memcpy(p, PyString_AS_STRING(o), l);
513 p += l;
513 p += l;
514 len += l + 1;
514 len += l + 1;
515 }
515 }
516 putbe32((uint32_t)len, t);
516 putbe32((uint32_t)len, t);
517 }
517 }
518
518
519 pos = p - PyString_AS_STRING(packobj);
519 pos = p - PyString_AS_STRING(packobj);
520 if (pos != nbytes) {
520 if (pos != nbytes) {
521 PyErr_Format(PyExc_SystemError, "bad dirstate size: %ld != %ld",
521 PyErr_Format(PyExc_SystemError, "bad dirstate size: %ld != %ld",
522 (long)pos, (long)nbytes);
522 (long)pos, (long)nbytes);
523 goto bail;
523 goto bail;
524 }
524 }
525
525
526 return packobj;
526 return packobj;
527 bail:
527 bail:
528 Py_XDECREF(mtime_unset);
528 Py_XDECREF(mtime_unset);
529 Py_XDECREF(packobj);
529 Py_XDECREF(packobj);
530 Py_XDECREF(v);
530 Py_XDECREF(v);
531 return NULL;
531 return NULL;
532 }
532 }
533
533
534 /*
534 /*
535 * A base-16 trie for fast node->rev mapping.
535 * A base-16 trie for fast node->rev mapping.
536 *
536 *
537 * Positive value is index of the next node in the trie
537 * Positive value is index of the next node in the trie
538 * Negative value is a leaf: -(rev + 1)
538 * Negative value is a leaf: -(rev + 1)
539 * Zero is empty
539 * Zero is empty
540 */
540 */
541 typedef struct {
541 typedef struct {
542 int children[16];
542 int children[16];
543 } nodetree;
543 } nodetree;
544
544
545 /*
545 /*
546 * This class has two behaviours.
546 * This class has two behaviours.
547 *
547 *
548 * When used in a list-like way (with integer keys), we decode an
548 * When used in a list-like way (with integer keys), we decode an
549 * entry in a RevlogNG index file on demand. Our last entry is a
549 * entry in a RevlogNG index file on demand. Our last entry is a
550 * sentinel, always a nullid. We have limited support for
550 * sentinel, always a nullid. We have limited support for
551 * integer-keyed insert and delete, only at elements right before the
551 * integer-keyed insert and delete, only at elements right before the
552 * sentinel.
552 * sentinel.
553 *
553 *
554 * With string keys, we lazily perform a reverse mapping from node to
554 * With string keys, we lazily perform a reverse mapping from node to
555 * rev, using a base-16 trie.
555 * rev, using a base-16 trie.
556 */
556 */
557 typedef struct {
557 typedef struct {
558 PyObject_HEAD
558 PyObject_HEAD
559 /* Type-specific fields go here. */
559 /* Type-specific fields go here. */
560 PyObject *data; /* raw bytes of index */
560 PyObject *data; /* raw bytes of index */
561 PyObject **cache; /* cached tuples */
561 PyObject **cache; /* cached tuples */
562 const char **offsets; /* populated on demand */
562 const char **offsets; /* populated on demand */
563 Py_ssize_t raw_length; /* original number of elements */
563 Py_ssize_t raw_length; /* original number of elements */
564 Py_ssize_t length; /* current number of elements */
564 Py_ssize_t length; /* current number of elements */
565 PyObject *added; /* populated on demand */
565 PyObject *added; /* populated on demand */
566 PyObject *headrevs; /* cache, invalidated on changes */
566 PyObject *headrevs; /* cache, invalidated on changes */
567 PyObject *filteredrevs;/* filtered revs set */
567 PyObject *filteredrevs;/* filtered revs set */
568 nodetree *nt; /* base-16 trie */
568 nodetree *nt; /* base-16 trie */
569 int ntlength; /* # nodes in use */
569 int ntlength; /* # nodes in use */
570 int ntcapacity; /* # nodes allocated */
570 int ntcapacity; /* # nodes allocated */
571 int ntdepth; /* maximum depth of tree */
571 int ntdepth; /* maximum depth of tree */
572 int ntsplits; /* # splits performed */
572 int ntsplits; /* # splits performed */
573 int ntrev; /* last rev scanned */
573 int ntrev; /* last rev scanned */
574 int ntlookups; /* # lookups */
574 int ntlookups; /* # lookups */
575 int ntmisses; /* # lookups that miss the cache */
575 int ntmisses; /* # lookups that miss the cache */
576 int inlined;
576 int inlined;
577 } indexObject;
577 } indexObject;
578
578
579 static Py_ssize_t index_length(const indexObject *self)
579 static Py_ssize_t index_length(const indexObject *self)
580 {
580 {
581 if (self->added == NULL)
581 if (self->added == NULL)
582 return self->length;
582 return self->length;
583 return self->length + PyList_GET_SIZE(self->added);
583 return self->length + PyList_GET_SIZE(self->added);
584 }
584 }
585
585
586 static PyObject *nullentry;
586 static PyObject *nullentry;
587 static const char nullid[20];
587 static const char nullid[20];
588
588
589 static Py_ssize_t inline_scan(indexObject *self, const char **offsets);
589 static Py_ssize_t inline_scan(indexObject *self, const char **offsets);
590
590
591 #if LONG_MAX == 0x7fffffffL
591 #if LONG_MAX == 0x7fffffffL
592 static char *tuple_format = "Kiiiiiis#";
592 static char *tuple_format = "Kiiiiiis#";
593 #else
593 #else
594 static char *tuple_format = "kiiiiiis#";
594 static char *tuple_format = "kiiiiiis#";
595 #endif
595 #endif
596
596
597 /* A RevlogNG v1 index entry is 64 bytes long. */
597 /* A RevlogNG v1 index entry is 64 bytes long. */
598 static const long v1_hdrsize = 64;
598 static const long v1_hdrsize = 64;
599
599
600 /*
600 /*
601 * Return a pointer to the beginning of a RevlogNG record.
601 * Return a pointer to the beginning of a RevlogNG record.
602 */
602 */
603 static const char *index_deref(indexObject *self, Py_ssize_t pos)
603 static const char *index_deref(indexObject *self, Py_ssize_t pos)
604 {
604 {
605 if (self->inlined && pos > 0) {
605 if (self->inlined && pos > 0) {
606 if (self->offsets == NULL) {
606 if (self->offsets == NULL) {
607 self->offsets = malloc(self->raw_length *
607 self->offsets = malloc(self->raw_length *
608 sizeof(*self->offsets));
608 sizeof(*self->offsets));
609 if (self->offsets == NULL)
609 if (self->offsets == NULL)
610 return (const char *)PyErr_NoMemory();
610 return (const char *)PyErr_NoMemory();
611 inline_scan(self, self->offsets);
611 inline_scan(self, self->offsets);
612 }
612 }
613 return self->offsets[pos];
613 return self->offsets[pos];
614 }
614 }
615
615
616 return PyString_AS_STRING(self->data) + pos * v1_hdrsize;
616 return PyString_AS_STRING(self->data) + pos * v1_hdrsize;
617 }
617 }
618
618
619 /*
619 /*
620 * RevlogNG format (all in big endian, data may be inlined):
620 * RevlogNG format (all in big endian, data may be inlined):
621 * 6 bytes: offset
621 * 6 bytes: offset
622 * 2 bytes: flags
622 * 2 bytes: flags
623 * 4 bytes: compressed length
623 * 4 bytes: compressed length
624 * 4 bytes: uncompressed length
624 * 4 bytes: uncompressed length
625 * 4 bytes: base revision
625 * 4 bytes: base revision
626 * 4 bytes: link revision
626 * 4 bytes: link revision
627 * 4 bytes: parent 1 revision
627 * 4 bytes: parent 1 revision
628 * 4 bytes: parent 2 revision
628 * 4 bytes: parent 2 revision
629 * 32 bytes: nodeid (only 20 bytes used)
629 * 32 bytes: nodeid (only 20 bytes used)
630 */
630 */
631 static PyObject *index_get(indexObject *self, Py_ssize_t pos)
631 static PyObject *index_get(indexObject *self, Py_ssize_t pos)
632 {
632 {
633 uint64_t offset_flags;
633 uint64_t offset_flags;
634 int comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2;
634 int comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2;
635 const char *c_node_id;
635 const char *c_node_id;
636 const char *data;
636 const char *data;
637 Py_ssize_t length = index_length(self);
637 Py_ssize_t length = index_length(self);
638 PyObject *entry;
638 PyObject *entry;
639
639
640 if (pos < 0)
640 if (pos < 0)
641 pos += length;
641 pos += length;
642
642
643 if (pos < 0 || pos >= length) {
643 if (pos < 0 || pos >= length) {
644 PyErr_SetString(PyExc_IndexError, "revlog index out of range");
644 PyErr_SetString(PyExc_IndexError, "revlog index out of range");
645 return NULL;
645 return NULL;
646 }
646 }
647
647
648 if (pos == length - 1) {
648 if (pos == length - 1) {
649 Py_INCREF(nullentry);
649 Py_INCREF(nullentry);
650 return nullentry;
650 return nullentry;
651 }
651 }
652
652
653 if (pos >= self->length - 1) {
653 if (pos >= self->length - 1) {
654 PyObject *obj;
654 PyObject *obj;
655 obj = PyList_GET_ITEM(self->added, pos - self->length + 1);
655 obj = PyList_GET_ITEM(self->added, pos - self->length + 1);
656 Py_INCREF(obj);
656 Py_INCREF(obj);
657 return obj;
657 return obj;
658 }
658 }
659
659
660 if (self->cache) {
660 if (self->cache) {
661 if (self->cache[pos]) {
661 if (self->cache[pos]) {
662 Py_INCREF(self->cache[pos]);
662 Py_INCREF(self->cache[pos]);
663 return self->cache[pos];
663 return self->cache[pos];
664 }
664 }
665 } else {
665 } else {
666 self->cache = calloc(self->raw_length, sizeof(PyObject *));
666 self->cache = calloc(self->raw_length, sizeof(PyObject *));
667 if (self->cache == NULL)
667 if (self->cache == NULL)
668 return PyErr_NoMemory();
668 return PyErr_NoMemory();
669 }
669 }
670
670
671 data = index_deref(self, pos);
671 data = index_deref(self, pos);
672 if (data == NULL)
672 if (data == NULL)
673 return NULL;
673 return NULL;
674
674
675 offset_flags = getbe32(data + 4);
675 offset_flags = getbe32(data + 4);
676 if (pos == 0) /* mask out version number for the first entry */
676 if (pos == 0) /* mask out version number for the first entry */
677 offset_flags &= 0xFFFF;
677 offset_flags &= 0xFFFF;
678 else {
678 else {
679 uint32_t offset_high = getbe32(data);
679 uint32_t offset_high = getbe32(data);
680 offset_flags |= ((uint64_t)offset_high) << 32;
680 offset_flags |= ((uint64_t)offset_high) << 32;
681 }
681 }
682
682
683 comp_len = getbe32(data + 8);
683 comp_len = getbe32(data + 8);
684 uncomp_len = getbe32(data + 12);
684 uncomp_len = getbe32(data + 12);
685 base_rev = getbe32(data + 16);
685 base_rev = getbe32(data + 16);
686 link_rev = getbe32(data + 20);
686 link_rev = getbe32(data + 20);
687 parent_1 = getbe32(data + 24);
687 parent_1 = getbe32(data + 24);
688 parent_2 = getbe32(data + 28);
688 parent_2 = getbe32(data + 28);
689 c_node_id = data + 32;
689 c_node_id = data + 32;
690
690
691 entry = Py_BuildValue(tuple_format, offset_flags, comp_len,
691 entry = Py_BuildValue(tuple_format, offset_flags, comp_len,
692 uncomp_len, base_rev, link_rev,
692 uncomp_len, base_rev, link_rev,
693 parent_1, parent_2, c_node_id, 20);
693 parent_1, parent_2, c_node_id, 20);
694
694
695 if (entry) {
695 if (entry) {
696 PyObject_GC_UnTrack(entry);
696 PyObject_GC_UnTrack(entry);
697 Py_INCREF(entry);
697 Py_INCREF(entry);
698 }
698 }
699
699
700 self->cache[pos] = entry;
700 self->cache[pos] = entry;
701
701
702 return entry;
702 return entry;
703 }
703 }
704
704
705 /*
705 /*
706 * Return the 20-byte SHA of the node corresponding to the given rev.
706 * Return the 20-byte SHA of the node corresponding to the given rev.
707 */
707 */
708 static const char *index_node(indexObject *self, Py_ssize_t pos)
708 static const char *index_node(indexObject *self, Py_ssize_t pos)
709 {
709 {
710 Py_ssize_t length = index_length(self);
710 Py_ssize_t length = index_length(self);
711 const char *data;
711 const char *data;
712
712
713 if (pos == length - 1 || pos == INT_MAX)
713 if (pos == length - 1 || pos == INT_MAX)
714 return nullid;
714 return nullid;
715
715
716 if (pos >= length)
716 if (pos >= length)
717 return NULL;
717 return NULL;
718
718
719 if (pos >= self->length - 1) {
719 if (pos >= self->length - 1) {
720 PyObject *tuple, *str;
720 PyObject *tuple, *str;
721 tuple = PyList_GET_ITEM(self->added, pos - self->length + 1);
721 tuple = PyList_GET_ITEM(self->added, pos - self->length + 1);
722 str = PyTuple_GetItem(tuple, 7);
722 str = PyTuple_GetItem(tuple, 7);
723 return str ? PyString_AS_STRING(str) : NULL;
723 return str ? PyString_AS_STRING(str) : NULL;
724 }
724 }
725
725
726 data = index_deref(self, pos);
726 data = index_deref(self, pos);
727 return data ? data + 32 : NULL;
727 return data ? data + 32 : NULL;
728 }
728 }
729
729
730 static int nt_insert(indexObject *self, const char *node, int rev);
730 static int nt_insert(indexObject *self, const char *node, int rev);
731
731
732 static int node_check(PyObject *obj, char **node, Py_ssize_t *nodelen)
732 static int node_check(PyObject *obj, char **node, Py_ssize_t *nodelen)
733 {
733 {
734 if (PyString_AsStringAndSize(obj, node, nodelen) == -1)
734 if (PyString_AsStringAndSize(obj, node, nodelen) == -1)
735 return -1;
735 return -1;
736 if (*nodelen == 20)
736 if (*nodelen == 20)
737 return 0;
737 return 0;
738 PyErr_SetString(PyExc_ValueError, "20-byte hash required");
738 PyErr_SetString(PyExc_ValueError, "20-byte hash required");
739 return -1;
739 return -1;
740 }
740 }
741
741
742 static PyObject *index_insert(indexObject *self, PyObject *args)
742 static PyObject *index_insert(indexObject *self, PyObject *args)
743 {
743 {
744 PyObject *obj;
744 PyObject *obj;
745 char *node;
745 char *node;
746 int index;
746 int index;
747 Py_ssize_t len, nodelen;
747 Py_ssize_t len, nodelen;
748
748
749 if (!PyArg_ParseTuple(args, "iO", &index, &obj))
749 if (!PyArg_ParseTuple(args, "iO", &index, &obj))
750 return NULL;
750 return NULL;
751
751
752 if (!PyTuple_Check(obj) || PyTuple_GET_SIZE(obj) != 8) {
752 if (!PyTuple_Check(obj) || PyTuple_GET_SIZE(obj) != 8) {
753 PyErr_SetString(PyExc_TypeError, "8-tuple required");
753 PyErr_SetString(PyExc_TypeError, "8-tuple required");
754 return NULL;
754 return NULL;
755 }
755 }
756
756
757 if (node_check(PyTuple_GET_ITEM(obj, 7), &node, &nodelen) == -1)
757 if (node_check(PyTuple_GET_ITEM(obj, 7), &node, &nodelen) == -1)
758 return NULL;
758 return NULL;
759
759
760 len = index_length(self);
760 len = index_length(self);
761
761
762 if (index < 0)
762 if (index < 0)
763 index += len;
763 index += len;
764
764
765 if (index != len - 1) {
765 if (index != len - 1) {
766 PyErr_SetString(PyExc_IndexError,
766 PyErr_SetString(PyExc_IndexError,
767 "insert only supported at index -1");
767 "insert only supported at index -1");
768 return NULL;
768 return NULL;
769 }
769 }
770
770
771 if (self->added == NULL) {
771 if (self->added == NULL) {
772 self->added = PyList_New(0);
772 self->added = PyList_New(0);
773 if (self->added == NULL)
773 if (self->added == NULL)
774 return NULL;
774 return NULL;
775 }
775 }
776
776
777 if (PyList_Append(self->added, obj) == -1)
777 if (PyList_Append(self->added, obj) == -1)
778 return NULL;
778 return NULL;
779
779
780 if (self->nt)
780 if (self->nt)
781 nt_insert(self, node, index);
781 nt_insert(self, node, index);
782
782
783 Py_CLEAR(self->headrevs);
783 Py_CLEAR(self->headrevs);
784 Py_RETURN_NONE;
784 Py_RETURN_NONE;
785 }
785 }
786
786
787 static void _index_clearcaches(indexObject *self)
787 static void _index_clearcaches(indexObject *self)
788 {
788 {
789 if (self->cache) {
789 if (self->cache) {
790 Py_ssize_t i;
790 Py_ssize_t i;
791
791
792 for (i = 0; i < self->raw_length; i++)
792 for (i = 0; i < self->raw_length; i++)
793 Py_CLEAR(self->cache[i]);
793 Py_CLEAR(self->cache[i]);
794 free(self->cache);
794 free(self->cache);
795 self->cache = NULL;
795 self->cache = NULL;
796 }
796 }
797 if (self->offsets) {
797 if (self->offsets) {
798 free(self->offsets);
798 free(self->offsets);
799 self->offsets = NULL;
799 self->offsets = NULL;
800 }
800 }
801 if (self->nt) {
801 if (self->nt) {
802 free(self->nt);
802 free(self->nt);
803 self->nt = NULL;
803 self->nt = NULL;
804 }
804 }
805 Py_CLEAR(self->headrevs);
805 Py_CLEAR(self->headrevs);
806 }
806 }
807
807
808 static PyObject *index_clearcaches(indexObject *self)
808 static PyObject *index_clearcaches(indexObject *self)
809 {
809 {
810 _index_clearcaches(self);
810 _index_clearcaches(self);
811 self->ntlength = self->ntcapacity = 0;
811 self->ntlength = self->ntcapacity = 0;
812 self->ntdepth = self->ntsplits = 0;
812 self->ntdepth = self->ntsplits = 0;
813 self->ntrev = -1;
813 self->ntrev = -1;
814 self->ntlookups = self->ntmisses = 0;
814 self->ntlookups = self->ntmisses = 0;
815 Py_RETURN_NONE;
815 Py_RETURN_NONE;
816 }
816 }
817
817
818 static PyObject *index_stats(indexObject *self)
818 static PyObject *index_stats(indexObject *self)
819 {
819 {
820 PyObject *obj = PyDict_New();
820 PyObject *obj = PyDict_New();
821 PyObject *t = NULL;
821 PyObject *t = NULL;
822
822
823 if (obj == NULL)
823 if (obj == NULL)
824 return NULL;
824 return NULL;
825
825
826 #define istat(__n, __d) \
826 #define istat(__n, __d) \
827 t = PyInt_FromSsize_t(self->__n); \
827 t = PyInt_FromSsize_t(self->__n); \
828 if (!t) \
828 if (!t) \
829 goto bail; \
829 goto bail; \
830 if (PyDict_SetItemString(obj, __d, t) == -1) \
830 if (PyDict_SetItemString(obj, __d, t) == -1) \
831 goto bail; \
831 goto bail; \
832 Py_DECREF(t);
832 Py_DECREF(t);
833
833
834 if (self->added) {
834 if (self->added) {
835 Py_ssize_t len = PyList_GET_SIZE(self->added);
835 Py_ssize_t len = PyList_GET_SIZE(self->added);
836 t = PyInt_FromSsize_t(len);
836 t = PyInt_FromSsize_t(len);
837 if (!t)
837 if (!t)
838 goto bail;
838 goto bail;
839 if (PyDict_SetItemString(obj, "index entries added", t) == -1)
839 if (PyDict_SetItemString(obj, "index entries added", t) == -1)
840 goto bail;
840 goto bail;
841 Py_DECREF(t);
841 Py_DECREF(t);
842 }
842 }
843
843
844 if (self->raw_length != self->length - 1)
844 if (self->raw_length != self->length - 1)
845 istat(raw_length, "revs on disk");
845 istat(raw_length, "revs on disk");
846 istat(length, "revs in memory");
846 istat(length, "revs in memory");
847 istat(ntcapacity, "node trie capacity");
847 istat(ntcapacity, "node trie capacity");
848 istat(ntdepth, "node trie depth");
848 istat(ntdepth, "node trie depth");
849 istat(ntlength, "node trie count");
849 istat(ntlength, "node trie count");
850 istat(ntlookups, "node trie lookups");
850 istat(ntlookups, "node trie lookups");
851 istat(ntmisses, "node trie misses");
851 istat(ntmisses, "node trie misses");
852 istat(ntrev, "node trie last rev scanned");
852 istat(ntrev, "node trie last rev scanned");
853 istat(ntsplits, "node trie splits");
853 istat(ntsplits, "node trie splits");
854
854
855 #undef istat
855 #undef istat
856
856
857 return obj;
857 return obj;
858
858
859 bail:
859 bail:
860 Py_XDECREF(obj);
860 Py_XDECREF(obj);
861 Py_XDECREF(t);
861 Py_XDECREF(t);
862 return NULL;
862 return NULL;
863 }
863 }
864
864
865 /*
865 /*
866 * When we cache a list, we want to be sure the caller can't mutate
866 * When we cache a list, we want to be sure the caller can't mutate
867 * the cached copy.
867 * the cached copy.
868 */
868 */
869 static PyObject *list_copy(PyObject *list)
869 static PyObject *list_copy(PyObject *list)
870 {
870 {
871 Py_ssize_t len = PyList_GET_SIZE(list);
871 Py_ssize_t len = PyList_GET_SIZE(list);
872 PyObject *newlist = PyList_New(len);
872 PyObject *newlist = PyList_New(len);
873 Py_ssize_t i;
873 Py_ssize_t i;
874
874
875 if (newlist == NULL)
875 if (newlist == NULL)
876 return NULL;
876 return NULL;
877
877
878 for (i = 0; i < len; i++) {
878 for (i = 0; i < len; i++) {
879 PyObject *obj = PyList_GET_ITEM(list, i);
879 PyObject *obj = PyList_GET_ITEM(list, i);
880 Py_INCREF(obj);
880 Py_INCREF(obj);
881 PyList_SET_ITEM(newlist, i, obj);
881 PyList_SET_ITEM(newlist, i, obj);
882 }
882 }
883
883
884 return newlist;
884 return newlist;
885 }
885 }
886
886
887 /* arg should be Py_ssize_t but Python 2.4 do not support the n format */
887 /* arg should be Py_ssize_t but Python 2.4 do not support the n format */
888 static int check_filter(PyObject *filter, unsigned long arg) {
888 static int check_filter(PyObject *filter, unsigned long arg) {
889 if (filter) {
889 if (filter) {
890 PyObject *arglist, *result;
890 PyObject *arglist, *result;
891 int isfiltered;
891 int isfiltered;
892
892
893 arglist = Py_BuildValue("(k)", arg);
893 arglist = Py_BuildValue("(k)", arg);
894 if (!arglist) {
894 if (!arglist) {
895 return -1;
895 return -1;
896 }
896 }
897
897
898 result = PyEval_CallObject(filter, arglist);
898 result = PyEval_CallObject(filter, arglist);
899 Py_DECREF(arglist);
899 Py_DECREF(arglist);
900 if (!result) {
900 if (!result) {
901 return -1;
901 return -1;
902 }
902 }
903
903
904 /* PyObject_IsTrue returns 1 if true, 0 if false, -1 if error,
904 /* PyObject_IsTrue returns 1 if true, 0 if false, -1 if error,
905 * same as this function, so we can just return it directly.*/
905 * same as this function, so we can just return it directly.*/
906 isfiltered = PyObject_IsTrue(result);
906 isfiltered = PyObject_IsTrue(result);
907 Py_DECREF(result);
907 Py_DECREF(result);
908 return isfiltered;
908 return isfiltered;
909 } else {
909 } else {
910 return 0;
910 return 0;
911 }
911 }
912 }
912 }
913
913
914 static PyObject *index_headrevs(indexObject *self, PyObject *args)
914 static PyObject *index_headrevs(indexObject *self, PyObject *args)
915 {
915 {
916 Py_ssize_t i, len, addlen;
916 Py_ssize_t i, len, addlen;
917 char *nothead = NULL;
917 char *nothead = NULL;
918 PyObject *heads = NULL;
918 PyObject *heads = NULL;
919 PyObject *filter = NULL;
919 PyObject *filter = NULL;
920 PyObject *filteredrevs = Py_None;
920 PyObject *filteredrevs = Py_None;
921
921
922 if (!PyArg_ParseTuple(args, "|O", &filteredrevs)) {
922 if (!PyArg_ParseTuple(args, "|O", &filteredrevs)) {
923 return NULL;
923 return NULL;
924 }
924 }
925
925
926 if (self->headrevs && filteredrevs == self->filteredrevs)
926 if (self->headrevs && filteredrevs == self->filteredrevs)
927 return list_copy(self->headrevs);
927 return list_copy(self->headrevs);
928
928
929 Py_DECREF(self->filteredrevs);
929 Py_DECREF(self->filteredrevs);
930 self->filteredrevs = filteredrevs;
930 self->filteredrevs = filteredrevs;
931 Py_INCREF(filteredrevs);
931 Py_INCREF(filteredrevs);
932
932
933 if (filteredrevs != Py_None) {
933 if (filteredrevs != Py_None) {
934 filter = PyObject_GetAttrString(filteredrevs, "__contains__");
934 filter = PyObject_GetAttrString(filteredrevs, "__contains__");
935 if (!filter) {
935 if (!filter) {
936 PyErr_SetString(PyExc_TypeError,
936 PyErr_SetString(PyExc_TypeError,
937 "filteredrevs has no attribute __contains__");
937 "filteredrevs has no attribute __contains__");
938 goto bail;
938 goto bail;
939 }
939 }
940 }
940 }
941
941
942 len = index_length(self) - 1;
942 len = index_length(self) - 1;
943 heads = PyList_New(0);
943 heads = PyList_New(0);
944 if (heads == NULL)
944 if (heads == NULL)
945 goto bail;
945 goto bail;
946 if (len == 0) {
946 if (len == 0) {
947 PyObject *nullid = PyInt_FromLong(-1);
947 PyObject *nullid = PyInt_FromLong(-1);
948 if (nullid == NULL || PyList_Append(heads, nullid) == -1) {
948 if (nullid == NULL || PyList_Append(heads, nullid) == -1) {
949 Py_XDECREF(nullid);
949 Py_XDECREF(nullid);
950 goto bail;
950 goto bail;
951 }
951 }
952 goto done;
952 goto done;
953 }
953 }
954
954
955 nothead = calloc(len, 1);
955 nothead = calloc(len, 1);
956 if (nothead == NULL)
956 if (nothead == NULL)
957 goto bail;
957 goto bail;
958
958
959 for (i = 0; i < self->raw_length; i++) {
959 for (i = 0; i < self->raw_length; i++) {
960 const char *data;
960 const char *data;
961 int parent_1, parent_2, isfiltered;
961 int parent_1, parent_2, isfiltered;
962
962
963 isfiltered = check_filter(filter, i);
963 isfiltered = check_filter(filter, i);
964 if (isfiltered == -1) {
964 if (isfiltered == -1) {
965 PyErr_SetString(PyExc_TypeError,
965 PyErr_SetString(PyExc_TypeError,
966 "unable to check filter");
966 "unable to check filter");
967 goto bail;
967 goto bail;
968 }
968 }
969
969
970 if (isfiltered) {
970 if (isfiltered) {
971 nothead[i] = 1;
971 nothead[i] = 1;
972 continue;
972 continue;
973 }
973 }
974
974
975 data = index_deref(self, i);
975 data = index_deref(self, i);
976 parent_1 = getbe32(data + 24);
976 parent_1 = getbe32(data + 24);
977 parent_2 = getbe32(data + 28);
977 parent_2 = getbe32(data + 28);
978
978
979 if (parent_1 >= 0)
979 if (parent_1 >= 0)
980 nothead[parent_1] = 1;
980 nothead[parent_1] = 1;
981 if (parent_2 >= 0)
981 if (parent_2 >= 0)
982 nothead[parent_2] = 1;
982 nothead[parent_2] = 1;
983 }
983 }
984
984
985 addlen = self->added ? PyList_GET_SIZE(self->added) : 0;
985 addlen = self->added ? PyList_GET_SIZE(self->added) : 0;
986
986
987 for (i = 0; i < addlen; i++) {
987 for (i = 0; i < addlen; i++) {
988 PyObject *rev = PyList_GET_ITEM(self->added, i);
988 PyObject *rev = PyList_GET_ITEM(self->added, i);
989 PyObject *p1 = PyTuple_GET_ITEM(rev, 5);
989 PyObject *p1 = PyTuple_GET_ITEM(rev, 5);
990 PyObject *p2 = PyTuple_GET_ITEM(rev, 6);
990 PyObject *p2 = PyTuple_GET_ITEM(rev, 6);
991 long parent_1, parent_2;
991 long parent_1, parent_2;
992 int isfiltered;
992 int isfiltered;
993
993
994 if (!PyInt_Check(p1) || !PyInt_Check(p2)) {
994 if (!PyInt_Check(p1) || !PyInt_Check(p2)) {
995 PyErr_SetString(PyExc_TypeError,
995 PyErr_SetString(PyExc_TypeError,
996 "revlog parents are invalid");
996 "revlog parents are invalid");
997 goto bail;
997 goto bail;
998 }
998 }
999
999
1000 isfiltered = check_filter(filter, i);
1000 isfiltered = check_filter(filter, i);
1001 if (isfiltered == -1) {
1001 if (isfiltered == -1) {
1002 PyErr_SetString(PyExc_TypeError,
1002 PyErr_SetString(PyExc_TypeError,
1003 "unable to check filter");
1003 "unable to check filter");
1004 goto bail;
1004 goto bail;
1005 }
1005 }
1006
1006
1007 if (isfiltered) {
1007 if (isfiltered) {
1008 nothead[i] = 1;
1008 nothead[i] = 1;
1009 continue;
1009 continue;
1010 }
1010 }
1011
1011
1012 parent_1 = PyInt_AS_LONG(p1);
1012 parent_1 = PyInt_AS_LONG(p1);
1013 parent_2 = PyInt_AS_LONG(p2);
1013 parent_2 = PyInt_AS_LONG(p2);
1014 if (parent_1 >= 0)
1014 if (parent_1 >= 0)
1015 nothead[parent_1] = 1;
1015 nothead[parent_1] = 1;
1016 if (parent_2 >= 0)
1016 if (parent_2 >= 0)
1017 nothead[parent_2] = 1;
1017 nothead[parent_2] = 1;
1018 }
1018 }
1019
1019
1020 for (i = 0; i < len; i++) {
1020 for (i = 0; i < len; i++) {
1021 PyObject *head;
1021 PyObject *head;
1022
1022
1023 if (nothead[i])
1023 if (nothead[i])
1024 continue;
1024 continue;
1025 head = PyInt_FromSsize_t(i);
1025 head = PyInt_FromSsize_t(i);
1026 if (head == NULL || PyList_Append(heads, head) == -1) {
1026 if (head == NULL || PyList_Append(heads, head) == -1) {
1027 Py_XDECREF(head);
1027 Py_XDECREF(head);
1028 goto bail;
1028 goto bail;
1029 }
1029 }
1030 }
1030 }
1031
1031
1032 done:
1032 done:
1033 self->headrevs = heads;
1033 self->headrevs = heads;
1034 Py_XDECREF(filter);
1034 Py_XDECREF(filter);
1035 free(nothead);
1035 free(nothead);
1036 return list_copy(self->headrevs);
1036 return list_copy(self->headrevs);
1037 bail:
1037 bail:
1038 Py_XDECREF(filter);
1038 Py_XDECREF(filter);
1039 Py_XDECREF(heads);
1039 Py_XDECREF(heads);
1040 free(nothead);
1040 free(nothead);
1041 return NULL;
1041 return NULL;
1042 }
1042 }
1043
1043
1044 static inline int nt_level(const char *node, Py_ssize_t level)
1044 static inline int nt_level(const char *node, Py_ssize_t level)
1045 {
1045 {
1046 int v = node[level>>1];
1046 int v = node[level>>1];
1047 if (!(level & 1))
1047 if (!(level & 1))
1048 v >>= 4;
1048 v >>= 4;
1049 return v & 0xf;
1049 return v & 0xf;
1050 }
1050 }
1051
1051
1052 /*
1052 /*
1053 * Return values:
1053 * Return values:
1054 *
1054 *
1055 * -4: match is ambiguous (multiple candidates)
1055 * -4: match is ambiguous (multiple candidates)
1056 * -2: not found
1056 * -2: not found
1057 * rest: valid rev
1057 * rest: valid rev
1058 */
1058 */
1059 static int nt_find(indexObject *self, const char *node, Py_ssize_t nodelen,
1059 static int nt_find(indexObject *self, const char *node, Py_ssize_t nodelen,
1060 int hex)
1060 int hex)
1061 {
1061 {
1062 int (*getnybble)(const char *, Py_ssize_t) = hex ? hexdigit : nt_level;
1062 int (*getnybble)(const char *, Py_ssize_t) = hex ? hexdigit : nt_level;
1063 int level, maxlevel, off;
1063 int level, maxlevel, off;
1064
1064
1065 if (nodelen == 20 && node[0] == '\0' && memcmp(node, nullid, 20) == 0)
1065 if (nodelen == 20 && node[0] == '\0' && memcmp(node, nullid, 20) == 0)
1066 return -1;
1066 return -1;
1067
1067
1068 if (self->nt == NULL)
1068 if (self->nt == NULL)
1069 return -2;
1069 return -2;
1070
1070
1071 if (hex)
1071 if (hex)
1072 maxlevel = nodelen > 40 ? 40 : (int)nodelen;
1072 maxlevel = nodelen > 40 ? 40 : (int)nodelen;
1073 else
1073 else
1074 maxlevel = nodelen > 20 ? 40 : ((int)nodelen * 2);
1074 maxlevel = nodelen > 20 ? 40 : ((int)nodelen * 2);
1075
1075
1076 for (level = off = 0; level < maxlevel; level++) {
1076 for (level = off = 0; level < maxlevel; level++) {
1077 int k = getnybble(node, level);
1077 int k = getnybble(node, level);
1078 nodetree *n = &self->nt[off];
1078 nodetree *n = &self->nt[off];
1079 int v = n->children[k];
1079 int v = n->children[k];
1080
1080
1081 if (v < 0) {
1081 if (v < 0) {
1082 const char *n;
1082 const char *n;
1083 Py_ssize_t i;
1083 Py_ssize_t i;
1084
1084
1085 v = -v - 1;
1085 v = -v - 1;
1086 n = index_node(self, v);
1086 n = index_node(self, v);
1087 if (n == NULL)
1087 if (n == NULL)
1088 return -2;
1088 return -2;
1089 for (i = level; i < maxlevel; i++)
1089 for (i = level; i < maxlevel; i++)
1090 if (getnybble(node, i) != nt_level(n, i))
1090 if (getnybble(node, i) != nt_level(n, i))
1091 return -2;
1091 return -2;
1092 return v;
1092 return v;
1093 }
1093 }
1094 if (v == 0)
1094 if (v == 0)
1095 return -2;
1095 return -2;
1096 off = v;
1096 off = v;
1097 }
1097 }
1098 /* multiple matches against an ambiguous prefix */
1098 /* multiple matches against an ambiguous prefix */
1099 return -4;
1099 return -4;
1100 }
1100 }
1101
1101
1102 static int nt_new(indexObject *self)
1102 static int nt_new(indexObject *self)
1103 {
1103 {
1104 if (self->ntlength == self->ntcapacity) {
1104 if (self->ntlength == self->ntcapacity) {
1105 self->ntcapacity *= 2;
1105 self->ntcapacity *= 2;
1106 self->nt = realloc(self->nt,
1106 self->nt = realloc(self->nt,
1107 self->ntcapacity * sizeof(nodetree));
1107 self->ntcapacity * sizeof(nodetree));
1108 if (self->nt == NULL) {
1108 if (self->nt == NULL) {
1109 PyErr_SetString(PyExc_MemoryError, "out of memory");
1109 PyErr_SetString(PyExc_MemoryError, "out of memory");
1110 return -1;
1110 return -1;
1111 }
1111 }
1112 memset(&self->nt[self->ntlength], 0,
1112 memset(&self->nt[self->ntlength], 0,
1113 sizeof(nodetree) * (self->ntcapacity - self->ntlength));
1113 sizeof(nodetree) * (self->ntcapacity - self->ntlength));
1114 }
1114 }
1115 return self->ntlength++;
1115 return self->ntlength++;
1116 }
1116 }
1117
1117
1118 static int nt_insert(indexObject *self, const char *node, int rev)
1118 static int nt_insert(indexObject *self, const char *node, int rev)
1119 {
1119 {
1120 int level = 0;
1120 int level = 0;
1121 int off = 0;
1121 int off = 0;
1122
1122
1123 while (level < 40) {
1123 while (level < 40) {
1124 int k = nt_level(node, level);
1124 int k = nt_level(node, level);
1125 nodetree *n;
1125 nodetree *n;
1126 int v;
1126 int v;
1127
1127
1128 n = &self->nt[off];
1128 n = &self->nt[off];
1129 v = n->children[k];
1129 v = n->children[k];
1130
1130
1131 if (v == 0) {
1131 if (v == 0) {
1132 n->children[k] = -rev - 1;
1132 n->children[k] = -rev - 1;
1133 return 0;
1133 return 0;
1134 }
1134 }
1135 if (v < 0) {
1135 if (v < 0) {
1136 const char *oldnode = index_node(self, -v - 1);
1136 const char *oldnode = index_node(self, -v - 1);
1137 int noff;
1137 int noff;
1138
1138
1139 if (!oldnode || !memcmp(oldnode, node, 20)) {
1139 if (!oldnode || !memcmp(oldnode, node, 20)) {
1140 n->children[k] = -rev - 1;
1140 n->children[k] = -rev - 1;
1141 return 0;
1141 return 0;
1142 }
1142 }
1143 noff = nt_new(self);
1143 noff = nt_new(self);
1144 if (noff == -1)
1144 if (noff == -1)
1145 return -1;
1145 return -1;
1146 /* self->nt may have been changed by realloc */
1146 /* self->nt may have been changed by realloc */
1147 self->nt[off].children[k] = noff;
1147 self->nt[off].children[k] = noff;
1148 off = noff;
1148 off = noff;
1149 n = &self->nt[off];
1149 n = &self->nt[off];
1150 n->children[nt_level(oldnode, ++level)] = v;
1150 n->children[nt_level(oldnode, ++level)] = v;
1151 if (level > self->ntdepth)
1151 if (level > self->ntdepth)
1152 self->ntdepth = level;
1152 self->ntdepth = level;
1153 self->ntsplits += 1;
1153 self->ntsplits += 1;
1154 } else {
1154 } else {
1155 level += 1;
1155 level += 1;
1156 off = v;
1156 off = v;
1157 }
1157 }
1158 }
1158 }
1159
1159
1160 return -1;
1160 return -1;
1161 }
1161 }
1162
1162
1163 static int nt_init(indexObject *self)
1163 static int nt_init(indexObject *self)
1164 {
1164 {
1165 if (self->nt == NULL) {
1165 if (self->nt == NULL) {
1166 if (self->raw_length > INT_MAX) {
1166 if (self->raw_length > INT_MAX) {
1167 PyErr_SetString(PyExc_ValueError, "overflow in nt_init");
1167 PyErr_SetString(PyExc_ValueError, "overflow in nt_init");
1168 return -1;
1168 return -1;
1169 }
1169 }
1170 self->ntcapacity = self->raw_length < 4
1170 self->ntcapacity = self->raw_length < 4
1171 ? 4 : (int)self->raw_length / 2;
1171 ? 4 : (int)self->raw_length / 2;
1172
1172
1173 self->nt = calloc(self->ntcapacity, sizeof(nodetree));
1173 self->nt = calloc(self->ntcapacity, sizeof(nodetree));
1174 if (self->nt == NULL) {
1174 if (self->nt == NULL) {
1175 PyErr_NoMemory();
1175 PyErr_NoMemory();
1176 return -1;
1176 return -1;
1177 }
1177 }
1178 self->ntlength = 1;
1178 self->ntlength = 1;
1179 self->ntrev = (int)index_length(self) - 1;
1179 self->ntrev = (int)index_length(self) - 1;
1180 self->ntlookups = 1;
1180 self->ntlookups = 1;
1181 self->ntmisses = 0;
1181 self->ntmisses = 0;
1182 if (nt_insert(self, nullid, INT_MAX) == -1)
1182 if (nt_insert(self, nullid, INT_MAX) == -1)
1183 return -1;
1183 return -1;
1184 }
1184 }
1185 return 0;
1185 return 0;
1186 }
1186 }
1187
1187
1188 /*
1188 /*
1189 * Return values:
1189 * Return values:
1190 *
1190 *
1191 * -3: error (exception set)
1191 * -3: error (exception set)
1192 * -2: not found (no exception set)
1192 * -2: not found (no exception set)
1193 * rest: valid rev
1193 * rest: valid rev
1194 */
1194 */
1195 static int index_find_node(indexObject *self,
1195 static int index_find_node(indexObject *self,
1196 const char *node, Py_ssize_t nodelen)
1196 const char *node, Py_ssize_t nodelen)
1197 {
1197 {
1198 int rev;
1198 int rev;
1199
1199
1200 self->ntlookups++;
1200 self->ntlookups++;
1201 rev = nt_find(self, node, nodelen, 0);
1201 rev = nt_find(self, node, nodelen, 0);
1202 if (rev >= -1)
1202 if (rev >= -1)
1203 return rev;
1203 return rev;
1204
1204
1205 if (nt_init(self) == -1)
1205 if (nt_init(self) == -1)
1206 return -3;
1206 return -3;
1207
1207
1208 /*
1208 /*
1209 * For the first handful of lookups, we scan the entire index,
1209 * For the first handful of lookups, we scan the entire index,
1210 * and cache only the matching nodes. This optimizes for cases
1210 * and cache only the matching nodes. This optimizes for cases
1211 * like "hg tip", where only a few nodes are accessed.
1211 * like "hg tip", where only a few nodes are accessed.
1212 *
1212 *
1213 * After that, we cache every node we visit, using a single
1213 * After that, we cache every node we visit, using a single
1214 * scan amortized over multiple lookups. This gives the best
1214 * scan amortized over multiple lookups. This gives the best
1215 * bulk performance, e.g. for "hg log".
1215 * bulk performance, e.g. for "hg log".
1216 */
1216 */
1217 if (self->ntmisses++ < 4) {
1217 if (self->ntmisses++ < 4) {
1218 for (rev = self->ntrev - 1; rev >= 0; rev--) {
1218 for (rev = self->ntrev - 1; rev >= 0; rev--) {
1219 const char *n = index_node(self, rev);
1219 const char *n = index_node(self, rev);
1220 if (n == NULL)
1220 if (n == NULL)
1221 return -2;
1221 return -2;
1222 if (memcmp(node, n, nodelen > 20 ? 20 : nodelen) == 0) {
1222 if (memcmp(node, n, nodelen > 20 ? 20 : nodelen) == 0) {
1223 if (nt_insert(self, n, rev) == -1)
1223 if (nt_insert(self, n, rev) == -1)
1224 return -3;
1224 return -3;
1225 break;
1225 break;
1226 }
1226 }
1227 }
1227 }
1228 } else {
1228 } else {
1229 for (rev = self->ntrev - 1; rev >= 0; rev--) {
1229 for (rev = self->ntrev - 1; rev >= 0; rev--) {
1230 const char *n = index_node(self, rev);
1230 const char *n = index_node(self, rev);
1231 if (n == NULL) {
1231 if (n == NULL) {
1232 self->ntrev = rev + 1;
1232 self->ntrev = rev + 1;
1233 return -2;
1233 return -2;
1234 }
1234 }
1235 if (nt_insert(self, n, rev) == -1) {
1235 if (nt_insert(self, n, rev) == -1) {
1236 self->ntrev = rev + 1;
1236 self->ntrev = rev + 1;
1237 return -3;
1237 return -3;
1238 }
1238 }
1239 if (memcmp(node, n, nodelen > 20 ? 20 : nodelen) == 0) {
1239 if (memcmp(node, n, nodelen > 20 ? 20 : nodelen) == 0) {
1240 break;
1240 break;
1241 }
1241 }
1242 }
1242 }
1243 self->ntrev = rev;
1243 self->ntrev = rev;
1244 }
1244 }
1245
1245
1246 if (rev >= 0)
1246 if (rev >= 0)
1247 return rev;
1247 return rev;
1248 return -2;
1248 return -2;
1249 }
1249 }
1250
1250
1251 static PyObject *raise_revlog_error(void)
1251 static PyObject *raise_revlog_error(void)
1252 {
1252 {
1253 static PyObject *errclass;
1253 static PyObject *errclass;
1254 PyObject *mod = NULL, *errobj;
1254 PyObject *mod = NULL, *errobj;
1255
1255
1256 if (errclass == NULL) {
1256 if (errclass == NULL) {
1257 PyObject *dict;
1257 PyObject *dict;
1258
1258
1259 mod = PyImport_ImportModule("mercurial.error");
1259 mod = PyImport_ImportModule("mercurial.error");
1260 if (mod == NULL)
1260 if (mod == NULL)
1261 goto classfail;
1261 goto classfail;
1262
1262
1263 dict = PyModule_GetDict(mod);
1263 dict = PyModule_GetDict(mod);
1264 if (dict == NULL)
1264 if (dict == NULL)
1265 goto classfail;
1265 goto classfail;
1266
1266
1267 errclass = PyDict_GetItemString(dict, "RevlogError");
1267 errclass = PyDict_GetItemString(dict, "RevlogError");
1268 if (errclass == NULL) {
1268 if (errclass == NULL) {
1269 PyErr_SetString(PyExc_SystemError,
1269 PyErr_SetString(PyExc_SystemError,
1270 "could not find RevlogError");
1270 "could not find RevlogError");
1271 goto classfail;
1271 goto classfail;
1272 }
1272 }
1273 Py_INCREF(errclass);
1273 Py_INCREF(errclass);
1274 Py_DECREF(mod);
1274 Py_DECREF(mod);
1275 }
1275 }
1276
1276
1277 errobj = PyObject_CallFunction(errclass, NULL);
1277 errobj = PyObject_CallFunction(errclass, NULL);
1278 if (errobj == NULL)
1278 if (errobj == NULL)
1279 return NULL;
1279 return NULL;
1280 PyErr_SetObject(errclass, errobj);
1280 PyErr_SetObject(errclass, errobj);
1281 return errobj;
1281 return errobj;
1282
1282
1283 classfail:
1283 classfail:
1284 Py_XDECREF(mod);
1284 Py_XDECREF(mod);
1285 return NULL;
1285 return NULL;
1286 }
1286 }
1287
1287
1288 static PyObject *index_getitem(indexObject *self, PyObject *value)
1288 static PyObject *index_getitem(indexObject *self, PyObject *value)
1289 {
1289 {
1290 char *node;
1290 char *node;
1291 Py_ssize_t nodelen;
1291 Py_ssize_t nodelen;
1292 int rev;
1292 int rev;
1293
1293
1294 if (PyInt_Check(value))
1294 if (PyInt_Check(value))
1295 return index_get(self, PyInt_AS_LONG(value));
1295 return index_get(self, PyInt_AS_LONG(value));
1296
1296
1297 if (node_check(value, &node, &nodelen) == -1)
1297 if (node_check(value, &node, &nodelen) == -1)
1298 return NULL;
1298 return NULL;
1299 rev = index_find_node(self, node, nodelen);
1299 rev = index_find_node(self, node, nodelen);
1300 if (rev >= -1)
1300 if (rev >= -1)
1301 return PyInt_FromLong(rev);
1301 return PyInt_FromLong(rev);
1302 if (rev == -2)
1302 if (rev == -2)
1303 raise_revlog_error();
1303 raise_revlog_error();
1304 return NULL;
1304 return NULL;
1305 }
1305 }
1306
1306
1307 static int nt_partialmatch(indexObject *self, const char *node,
1307 static int nt_partialmatch(indexObject *self, const char *node,
1308 Py_ssize_t nodelen)
1308 Py_ssize_t nodelen)
1309 {
1309 {
1310 int rev;
1310 int rev;
1311
1311
1312 if (nt_init(self) == -1)
1312 if (nt_init(self) == -1)
1313 return -3;
1313 return -3;
1314
1314
1315 if (self->ntrev > 0) {
1315 if (self->ntrev > 0) {
1316 /* ensure that the radix tree is fully populated */
1316 /* ensure that the radix tree is fully populated */
1317 for (rev = self->ntrev - 1; rev >= 0; rev--) {
1317 for (rev = self->ntrev - 1; rev >= 0; rev--) {
1318 const char *n = index_node(self, rev);
1318 const char *n = index_node(self, rev);
1319 if (n == NULL)
1319 if (n == NULL)
1320 return -2;
1320 return -2;
1321 if (nt_insert(self, n, rev) == -1)
1321 if (nt_insert(self, n, rev) == -1)
1322 return -3;
1322 return -3;
1323 }
1323 }
1324 self->ntrev = rev;
1324 self->ntrev = rev;
1325 }
1325 }
1326
1326
1327 return nt_find(self, node, nodelen, 1);
1327 return nt_find(self, node, nodelen, 1);
1328 }
1328 }
1329
1329
1330 static PyObject *index_partialmatch(indexObject *self, PyObject *args)
1330 static PyObject *index_partialmatch(indexObject *self, PyObject *args)
1331 {
1331 {
1332 const char *fullnode;
1332 const char *fullnode;
1333 int nodelen;
1333 int nodelen;
1334 char *node;
1334 char *node;
1335 int rev, i;
1335 int rev, i;
1336
1336
1337 if (!PyArg_ParseTuple(args, "s#", &node, &nodelen))
1337 if (!PyArg_ParseTuple(args, "s#", &node, &nodelen))
1338 return NULL;
1338 return NULL;
1339
1339
1340 if (nodelen < 4) {
1340 if (nodelen < 4) {
1341 PyErr_SetString(PyExc_ValueError, "key too short");
1341 PyErr_SetString(PyExc_ValueError, "key too short");
1342 return NULL;
1342 return NULL;
1343 }
1343 }
1344
1344
1345 if (nodelen > 40) {
1345 if (nodelen > 40) {
1346 PyErr_SetString(PyExc_ValueError, "key too long");
1346 PyErr_SetString(PyExc_ValueError, "key too long");
1347 return NULL;
1347 return NULL;
1348 }
1348 }
1349
1349
1350 for (i = 0; i < nodelen; i++)
1350 for (i = 0; i < nodelen; i++)
1351 hexdigit(node, i);
1351 hexdigit(node, i);
1352 if (PyErr_Occurred()) {
1352 if (PyErr_Occurred()) {
1353 /* input contains non-hex characters */
1353 /* input contains non-hex characters */
1354 PyErr_Clear();
1354 PyErr_Clear();
1355 Py_RETURN_NONE;
1355 Py_RETURN_NONE;
1356 }
1356 }
1357
1357
1358 rev = nt_partialmatch(self, node, nodelen);
1358 rev = nt_partialmatch(self, node, nodelen);
1359
1359
1360 switch (rev) {
1360 switch (rev) {
1361 case -4:
1361 case -4:
1362 raise_revlog_error();
1362 raise_revlog_error();
1363 case -3:
1363 case -3:
1364 return NULL;
1364 return NULL;
1365 case -2:
1365 case -2:
1366 Py_RETURN_NONE;
1366 Py_RETURN_NONE;
1367 case -1:
1367 case -1:
1368 return PyString_FromStringAndSize(nullid, 20);
1368 return PyString_FromStringAndSize(nullid, 20);
1369 }
1369 }
1370
1370
1371 fullnode = index_node(self, rev);
1371 fullnode = index_node(self, rev);
1372 if (fullnode == NULL) {
1372 if (fullnode == NULL) {
1373 PyErr_Format(PyExc_IndexError,
1373 PyErr_Format(PyExc_IndexError,
1374 "could not access rev %d", rev);
1374 "could not access rev %d", rev);
1375 return NULL;
1375 return NULL;
1376 }
1376 }
1377 return PyString_FromStringAndSize(fullnode, 20);
1377 return PyString_FromStringAndSize(fullnode, 20);
1378 }
1378 }
1379
1379
1380 static PyObject *index_m_get(indexObject *self, PyObject *args)
1380 static PyObject *index_m_get(indexObject *self, PyObject *args)
1381 {
1381 {
1382 Py_ssize_t nodelen;
1382 Py_ssize_t nodelen;
1383 PyObject *val;
1383 PyObject *val;
1384 char *node;
1384 char *node;
1385 int rev;
1385 int rev;
1386
1386
1387 if (!PyArg_ParseTuple(args, "O", &val))
1387 if (!PyArg_ParseTuple(args, "O", &val))
1388 return NULL;
1388 return NULL;
1389 if (node_check(val, &node, &nodelen) == -1)
1389 if (node_check(val, &node, &nodelen) == -1)
1390 return NULL;
1390 return NULL;
1391 rev = index_find_node(self, node, nodelen);
1391 rev = index_find_node(self, node, nodelen);
1392 if (rev == -3)
1392 if (rev == -3)
1393 return NULL;
1393 return NULL;
1394 if (rev == -2)
1394 if (rev == -2)
1395 Py_RETURN_NONE;
1395 Py_RETURN_NONE;
1396 return PyInt_FromLong(rev);
1396 return PyInt_FromLong(rev);
1397 }
1397 }
1398
1398
1399 static int index_contains(indexObject *self, PyObject *value)
1399 static int index_contains(indexObject *self, PyObject *value)
1400 {
1400 {
1401 char *node;
1401 char *node;
1402 Py_ssize_t nodelen;
1402 Py_ssize_t nodelen;
1403
1403
1404 if (PyInt_Check(value)) {
1404 if (PyInt_Check(value)) {
1405 long rev = PyInt_AS_LONG(value);
1405 long rev = PyInt_AS_LONG(value);
1406 return rev >= -1 && rev < index_length(self);
1406 return rev >= -1 && rev < index_length(self);
1407 }
1407 }
1408
1408
1409 if (node_check(value, &node, &nodelen) == -1)
1409 if (node_check(value, &node, &nodelen) == -1)
1410 return -1;
1410 return -1;
1411
1411
1412 switch (index_find_node(self, node, nodelen)) {
1412 switch (index_find_node(self, node, nodelen)) {
1413 case -3:
1413 case -3:
1414 return -1;
1414 return -1;
1415 case -2:
1415 case -2:
1416 return 0;
1416 return 0;
1417 default:
1417 default:
1418 return 1;
1418 return 1;
1419 }
1419 }
1420 }
1420 }
1421
1421
1422 static inline void index_get_parents(indexObject *self, int rev, int *ps)
1422 static inline void index_get_parents(indexObject *self, int rev, int *ps)
1423 {
1423 {
1424 if (rev >= self->length - 1) {
1424 if (rev >= self->length - 1) {
1425 PyObject *tuple = PyList_GET_ITEM(self->added,
1425 PyObject *tuple = PyList_GET_ITEM(self->added,
1426 rev - self->length + 1);
1426 rev - self->length + 1);
1427 ps[0] = (int)PyInt_AS_LONG(PyTuple_GET_ITEM(tuple, 5));
1427 ps[0] = (int)PyInt_AS_LONG(PyTuple_GET_ITEM(tuple, 5));
1428 ps[1] = (int)PyInt_AS_LONG(PyTuple_GET_ITEM(tuple, 6));
1428 ps[1] = (int)PyInt_AS_LONG(PyTuple_GET_ITEM(tuple, 6));
1429 } else {
1429 } else {
1430 const char *data = index_deref(self, rev);
1430 const char *data = index_deref(self, rev);
1431 ps[0] = getbe32(data + 24);
1431 ps[0] = getbe32(data + 24);
1432 ps[1] = getbe32(data + 28);
1432 ps[1] = getbe32(data + 28);
1433 }
1433 }
1434 }
1434 }
1435
1435
1436 typedef uint64_t bitmask;
1436 typedef uint64_t bitmask;
1437
1437
1438 /*
1438 /*
1439 * Given a disjoint set of revs, return all candidates for the
1439 * Given a disjoint set of revs, return all candidates for the
1440 * greatest common ancestor. In revset notation, this is the set
1440 * greatest common ancestor. In revset notation, this is the set
1441 * "heads(::a and ::b and ...)"
1441 * "heads(::a and ::b and ...)"
1442 */
1442 */
1443 static PyObject *find_gca_candidates(indexObject *self, const int *revs,
1443 static PyObject *find_gca_candidates(indexObject *self, const int *revs,
1444 int revcount)
1444 int revcount)
1445 {
1445 {
1446 const bitmask allseen = (1ull << revcount) - 1;
1446 const bitmask allseen = (1ull << revcount) - 1;
1447 const bitmask poison = 1ull << revcount;
1447 const bitmask poison = 1ull << revcount;
1448 PyObject *gca = PyList_New(0);
1448 PyObject *gca = PyList_New(0);
1449 int i, v, interesting;
1449 int i, v, interesting;
1450 int maxrev = -1;
1450 int maxrev = -1;
1451 bitmask sp;
1451 bitmask sp;
1452 bitmask *seen;
1452 bitmask *seen;
1453
1453
1454 if (gca == NULL)
1454 if (gca == NULL)
1455 return PyErr_NoMemory();
1455 return PyErr_NoMemory();
1456
1456
1457 for (i = 0; i < revcount; i++) {
1457 for (i = 0; i < revcount; i++) {
1458 if (revs[i] > maxrev)
1458 if (revs[i] > maxrev)
1459 maxrev = revs[i];
1459 maxrev = revs[i];
1460 }
1460 }
1461
1461
1462 seen = calloc(sizeof(*seen), maxrev + 1);
1462 seen = calloc(sizeof(*seen), maxrev + 1);
1463 if (seen == NULL) {
1463 if (seen == NULL) {
1464 Py_DECREF(gca);
1464 Py_DECREF(gca);
1465 return PyErr_NoMemory();
1465 return PyErr_NoMemory();
1466 }
1466 }
1467
1467
1468 for (i = 0; i < revcount; i++)
1468 for (i = 0; i < revcount; i++)
1469 seen[revs[i]] = 1ull << i;
1469 seen[revs[i]] = 1ull << i;
1470
1470
1471 interesting = revcount;
1471 interesting = revcount;
1472
1472
1473 for (v = maxrev; v >= 0 && interesting; v--) {
1473 for (v = maxrev; v >= 0 && interesting; v--) {
1474 bitmask sv = seen[v];
1474 bitmask sv = seen[v];
1475 int parents[2];
1475 int parents[2];
1476
1476
1477 if (!sv)
1477 if (!sv)
1478 continue;
1478 continue;
1479
1479
1480 if (sv < poison) {
1480 if (sv < poison) {
1481 interesting -= 1;
1481 interesting -= 1;
1482 if (sv == allseen) {
1482 if (sv == allseen) {
1483 PyObject *obj = PyInt_FromLong(v);
1483 PyObject *obj = PyInt_FromLong(v);
1484 if (obj == NULL)
1484 if (obj == NULL)
1485 goto bail;
1485 goto bail;
1486 if (PyList_Append(gca, obj) == -1) {
1486 if (PyList_Append(gca, obj) == -1) {
1487 Py_DECREF(obj);
1487 Py_DECREF(obj);
1488 goto bail;
1488 goto bail;
1489 }
1489 }
1490 sv |= poison;
1490 sv |= poison;
1491 for (i = 0; i < revcount; i++) {
1491 for (i = 0; i < revcount; i++) {
1492 if (revs[i] == v)
1492 if (revs[i] == v)
1493 goto done;
1493 goto done;
1494 }
1494 }
1495 }
1495 }
1496 }
1496 }
1497 index_get_parents(self, v, parents);
1497 index_get_parents(self, v, parents);
1498
1498
1499 for (i = 0; i < 2; i++) {
1499 for (i = 0; i < 2; i++) {
1500 int p = parents[i];
1500 int p = parents[i];
1501 if (p == -1)
1501 if (p == -1)
1502 continue;
1502 continue;
1503 sp = seen[p];
1503 sp = seen[p];
1504 if (sv < poison) {
1504 if (sv < poison) {
1505 if (sp == 0) {
1505 if (sp == 0) {
1506 seen[p] = sv;
1506 seen[p] = sv;
1507 interesting++;
1507 interesting++;
1508 }
1508 }
1509 else if (sp != sv)
1509 else if (sp != sv)
1510 seen[p] |= sv;
1510 seen[p] |= sv;
1511 } else {
1511 } else {
1512 if (sp && sp < poison)
1512 if (sp && sp < poison)
1513 interesting--;
1513 interesting--;
1514 seen[p] = sv;
1514 seen[p] = sv;
1515 }
1515 }
1516 }
1516 }
1517 }
1517 }
1518
1518
1519 done:
1519 done:
1520 free(seen);
1520 free(seen);
1521 return gca;
1521 return gca;
1522 bail:
1522 bail:
1523 free(seen);
1523 free(seen);
1524 Py_XDECREF(gca);
1524 Py_XDECREF(gca);
1525 return NULL;
1525 return NULL;
1526 }
1526 }
1527
1527
1528 /*
1528 /*
1529 * Given a disjoint set of revs, return the subset with the longest
1529 * Given a disjoint set of revs, return the subset with the longest
1530 * path to the root.
1530 * path to the root.
1531 */
1531 */
1532 static PyObject *find_deepest(indexObject *self, PyObject *revs)
1532 static PyObject *find_deepest(indexObject *self, PyObject *revs)
1533 {
1533 {
1534 const Py_ssize_t revcount = PyList_GET_SIZE(revs);
1534 const Py_ssize_t revcount = PyList_GET_SIZE(revs);
1535 static const Py_ssize_t capacity = 24;
1535 static const Py_ssize_t capacity = 24;
1536 int *depth, *interesting = NULL;
1536 int *depth, *interesting = NULL;
1537 int i, j, v, ninteresting;
1537 int i, j, v, ninteresting;
1538 PyObject *dict = NULL, *keys = NULL;
1538 PyObject *dict = NULL, *keys = NULL;
1539 long *seen = NULL;
1539 long *seen = NULL;
1540 int maxrev = -1;
1540 int maxrev = -1;
1541 long final;
1541 long final;
1542
1542
1543 if (revcount > capacity) {
1543 if (revcount > capacity) {
1544 PyErr_Format(PyExc_OverflowError,
1544 PyErr_Format(PyExc_OverflowError,
1545 "bitset size (%ld) > capacity (%ld)",
1545 "bitset size (%ld) > capacity (%ld)",
1546 (long)revcount, (long)capacity);
1546 (long)revcount, (long)capacity);
1547 return NULL;
1547 return NULL;
1548 }
1548 }
1549
1549
1550 for (i = 0; i < revcount; i++) {
1550 for (i = 0; i < revcount; i++) {
1551 int n = (int)PyInt_AsLong(PyList_GET_ITEM(revs, i));
1551 int n = (int)PyInt_AsLong(PyList_GET_ITEM(revs, i));
1552 if (n > maxrev)
1552 if (n > maxrev)
1553 maxrev = n;
1553 maxrev = n;
1554 }
1554 }
1555
1555
1556 depth = calloc(sizeof(*depth), maxrev + 1);
1556 depth = calloc(sizeof(*depth), maxrev + 1);
1557 if (depth == NULL)
1557 if (depth == NULL)
1558 return PyErr_NoMemory();
1558 return PyErr_NoMemory();
1559
1559
1560 seen = calloc(sizeof(*seen), maxrev + 1);
1560 seen = calloc(sizeof(*seen), maxrev + 1);
1561 if (seen == NULL) {
1561 if (seen == NULL) {
1562 PyErr_NoMemory();
1562 PyErr_NoMemory();
1563 goto bail;
1563 goto bail;
1564 }
1564 }
1565
1565
1566 interesting = calloc(sizeof(*interesting), 2 << revcount);
1566 interesting = calloc(sizeof(*interesting), 2 << revcount);
1567 if (interesting == NULL) {
1567 if (interesting == NULL) {
1568 PyErr_NoMemory();
1568 PyErr_NoMemory();
1569 goto bail;
1569 goto bail;
1570 }
1570 }
1571
1571
1572 if (PyList_Sort(revs) == -1)
1572 if (PyList_Sort(revs) == -1)
1573 goto bail;
1573 goto bail;
1574
1574
1575 for (i = 0; i < revcount; i++) {
1575 for (i = 0; i < revcount; i++) {
1576 int n = (int)PyInt_AsLong(PyList_GET_ITEM(revs, i));
1576 int n = (int)PyInt_AsLong(PyList_GET_ITEM(revs, i));
1577 long b = 1l << i;
1577 long b = 1l << i;
1578 depth[n] = 1;
1578 depth[n] = 1;
1579 seen[n] = b;
1579 seen[n] = b;
1580 interesting[b] = 1;
1580 interesting[b] = 1;
1581 }
1581 }
1582
1582
1583 ninteresting = (int)revcount;
1583 ninteresting = (int)revcount;
1584
1584
1585 for (v = maxrev; v >= 0 && ninteresting > 1; v--) {
1585 for (v = maxrev; v >= 0 && ninteresting > 1; v--) {
1586 int dv = depth[v];
1586 int dv = depth[v];
1587 int parents[2];
1587 int parents[2];
1588 long sv;
1588 long sv;
1589
1589
1590 if (dv == 0)
1590 if (dv == 0)
1591 continue;
1591 continue;
1592
1592
1593 sv = seen[v];
1593 sv = seen[v];
1594 index_get_parents(self, v, parents);
1594 index_get_parents(self, v, parents);
1595
1595
1596 for (i = 0; i < 2; i++) {
1596 for (i = 0; i < 2; i++) {
1597 int p = parents[i];
1597 int p = parents[i];
1598 long nsp, sp;
1598 long nsp, sp;
1599 int dp;
1599 int dp;
1600
1600
1601 if (p == -1)
1601 if (p == -1)
1602 continue;
1602 continue;
1603
1603
1604 dp = depth[p];
1604 dp = depth[p];
1605 nsp = sp = seen[p];
1605 nsp = sp = seen[p];
1606 if (dp <= dv) {
1606 if (dp <= dv) {
1607 depth[p] = dv + 1;
1607 depth[p] = dv + 1;
1608 if (sp != sv) {
1608 if (sp != sv) {
1609 interesting[sv] += 1;
1609 interesting[sv] += 1;
1610 nsp = seen[p] = sv;
1610 nsp = seen[p] = sv;
1611 if (sp) {
1611 if (sp) {
1612 interesting[sp] -= 1;
1612 interesting[sp] -= 1;
1613 if (interesting[sp] == 0)
1613 if (interesting[sp] == 0)
1614 ninteresting -= 1;
1614 ninteresting -= 1;
1615 }
1615 }
1616 }
1616 }
1617 }
1617 }
1618 else if (dv == dp - 1) {
1618 else if (dv == dp - 1) {
1619 nsp = sp | sv;
1619 nsp = sp | sv;
1620 if (nsp == sp)
1620 if (nsp == sp)
1621 continue;
1621 continue;
1622 seen[p] = nsp;
1622 seen[p] = nsp;
1623 interesting[sp] -= 1;
1623 interesting[sp] -= 1;
1624 if (interesting[sp] == 0 && interesting[nsp] > 0)
1624 if (interesting[sp] == 0 && interesting[nsp] > 0)
1625 ninteresting -= 1;
1625 ninteresting -= 1;
1626 interesting[nsp] += 1;
1626 interesting[nsp] += 1;
1627 }
1627 }
1628 }
1628 }
1629 interesting[sv] -= 1;
1629 interesting[sv] -= 1;
1630 if (interesting[sv] == 0)
1630 if (interesting[sv] == 0)
1631 ninteresting -= 1;
1631 ninteresting -= 1;
1632 }
1632 }
1633
1633
1634 final = 0;
1634 final = 0;
1635 j = ninteresting;
1635 j = ninteresting;
1636 for (i = 0; i < (int)(2 << revcount) && j > 0; i++) {
1636 for (i = 0; i < (int)(2 << revcount) && j > 0; i++) {
1637 if (interesting[i] == 0)
1637 if (interesting[i] == 0)
1638 continue;
1638 continue;
1639 final |= i;
1639 final |= i;
1640 j -= 1;
1640 j -= 1;
1641 }
1641 }
1642 if (final == 0) {
1642 if (final == 0) {
1643 keys = PyList_New(0);
1643 keys = PyList_New(0);
1644 goto bail;
1644 goto bail;
1645 }
1645 }
1646
1646
1647 dict = PyDict_New();
1647 dict = PyDict_New();
1648 if (dict == NULL)
1648 if (dict == NULL)
1649 goto bail;
1649 goto bail;
1650
1650
1651 for (i = 0; i < revcount; i++) {
1651 for (i = 0; i < revcount; i++) {
1652 PyObject *key;
1652 PyObject *key;
1653
1653
1654 if ((final & (1 << i)) == 0)
1654 if ((final & (1 << i)) == 0)
1655 continue;
1655 continue;
1656
1656
1657 key = PyList_GET_ITEM(revs, i);
1657 key = PyList_GET_ITEM(revs, i);
1658 Py_INCREF(key);
1658 Py_INCREF(key);
1659 Py_INCREF(Py_None);
1659 Py_INCREF(Py_None);
1660 if (PyDict_SetItem(dict, key, Py_None) == -1) {
1660 if (PyDict_SetItem(dict, key, Py_None) == -1) {
1661 Py_DECREF(key);
1661 Py_DECREF(key);
1662 Py_DECREF(Py_None);
1662 Py_DECREF(Py_None);
1663 goto bail;
1663 goto bail;
1664 }
1664 }
1665 }
1665 }
1666
1666
1667 keys = PyDict_Keys(dict);
1667 keys = PyDict_Keys(dict);
1668
1668
1669 bail:
1669 bail:
1670 free(depth);
1670 free(depth);
1671 free(seen);
1671 free(seen);
1672 free(interesting);
1672 free(interesting);
1673 Py_XDECREF(dict);
1673 Py_XDECREF(dict);
1674
1674
1675 return keys;
1675 return keys;
1676 }
1676 }
1677
1677
1678 /*
1678 /*
1679 * Given a (possibly overlapping) set of revs, return all the
1679 * Given a (possibly overlapping) set of revs, return all the
1680 * common ancestors heads: heads(::args[0] and ::a[1] and ...)
1680 * common ancestors heads: heads(::args[0] and ::a[1] and ...)
1681 */
1681 */
1682 static PyObject *index_commonancestorsheads(indexObject *self, PyObject *args)
1682 static PyObject *index_commonancestorsheads(indexObject *self, PyObject *args)
1683 {
1683 {
1684 PyObject *ret = NULL;
1684 PyObject *ret = NULL;
1685 Py_ssize_t argcount, i, len;
1685 Py_ssize_t argcount, i, len;
1686 bitmask repeat = 0;
1686 bitmask repeat = 0;
1687 int revcount = 0;
1687 int revcount = 0;
1688 int *revs;
1688 int *revs;
1689
1689
1690 argcount = PySequence_Length(args);
1690 argcount = PySequence_Length(args);
1691 revs = malloc(argcount * sizeof(*revs));
1691 revs = malloc(argcount * sizeof(*revs));
1692 if (argcount > 0 && revs == NULL)
1692 if (argcount > 0 && revs == NULL)
1693 return PyErr_NoMemory();
1693 return PyErr_NoMemory();
1694 len = index_length(self) - 1;
1694 len = index_length(self) - 1;
1695
1695
1696 for (i = 0; i < argcount; i++) {
1696 for (i = 0; i < argcount; i++) {
1697 static const int capacity = 24;
1697 static const int capacity = 24;
1698 PyObject *obj = PySequence_GetItem(args, i);
1698 PyObject *obj = PySequence_GetItem(args, i);
1699 bitmask x;
1699 bitmask x;
1700 long val;
1700 long val;
1701
1701
1702 if (!PyInt_Check(obj)) {
1702 if (!PyInt_Check(obj)) {
1703 PyErr_SetString(PyExc_TypeError,
1703 PyErr_SetString(PyExc_TypeError,
1704 "arguments must all be ints");
1704 "arguments must all be ints");
1705 Py_DECREF(obj);
1705 Py_DECREF(obj);
1706 goto bail;
1706 goto bail;
1707 }
1707 }
1708 val = PyInt_AsLong(obj);
1708 val = PyInt_AsLong(obj);
1709 Py_DECREF(obj);
1709 Py_DECREF(obj);
1710 if (val == -1) {
1710 if (val == -1) {
1711 ret = PyList_New(0);
1711 ret = PyList_New(0);
1712 goto done;
1712 goto done;
1713 }
1713 }
1714 if (val < 0 || val >= len) {
1714 if (val < 0 || val >= len) {
1715 PyErr_SetString(PyExc_IndexError,
1715 PyErr_SetString(PyExc_IndexError,
1716 "index out of range");
1716 "index out of range");
1717 goto bail;
1717 goto bail;
1718 }
1718 }
1719 /* this cheesy bloom filter lets us avoid some more
1719 /* this cheesy bloom filter lets us avoid some more
1720 * expensive duplicate checks in the common set-is-disjoint
1720 * expensive duplicate checks in the common set-is-disjoint
1721 * case */
1721 * case */
1722 x = 1ull << (val & 0x3f);
1722 x = 1ull << (val & 0x3f);
1723 if (repeat & x) {
1723 if (repeat & x) {
1724 int k;
1724 int k;
1725 for (k = 0; k < revcount; k++) {
1725 for (k = 0; k < revcount; k++) {
1726 if (val == revs[k])
1726 if (val == revs[k])
1727 goto duplicate;
1727 goto duplicate;
1728 }
1728 }
1729 }
1729 }
1730 else repeat |= x;
1730 else repeat |= x;
1731 if (revcount >= capacity) {
1731 if (revcount >= capacity) {
1732 PyErr_Format(PyExc_OverflowError,
1732 PyErr_Format(PyExc_OverflowError,
1733 "bitset size (%d) > capacity (%d)",
1733 "bitset size (%d) > capacity (%d)",
1734 revcount, capacity);
1734 revcount, capacity);
1735 goto bail;
1735 goto bail;
1736 }
1736 }
1737 revs[revcount++] = (int)val;
1737 revs[revcount++] = (int)val;
1738 duplicate:;
1738 duplicate:;
1739 }
1739 }
1740
1740
1741 if (revcount == 0) {
1741 if (revcount == 0) {
1742 ret = PyList_New(0);
1742 ret = PyList_New(0);
1743 goto done;
1743 goto done;
1744 }
1744 }
1745 if (revcount == 1) {
1745 if (revcount == 1) {
1746 PyObject *obj;
1746 PyObject *obj;
1747 ret = PyList_New(1);
1747 ret = PyList_New(1);
1748 if (ret == NULL)
1748 if (ret == NULL)
1749 goto bail;
1749 goto bail;
1750 obj = PyInt_FromLong(revs[0]);
1750 obj = PyInt_FromLong(revs[0]);
1751 if (obj == NULL)
1751 if (obj == NULL)
1752 goto bail;
1752 goto bail;
1753 PyList_SET_ITEM(ret, 0, obj);
1753 PyList_SET_ITEM(ret, 0, obj);
1754 goto done;
1754 goto done;
1755 }
1755 }
1756
1756
1757 ret = find_gca_candidates(self, revs, revcount);
1757 ret = find_gca_candidates(self, revs, revcount);
1758 if (ret == NULL)
1758 if (ret == NULL)
1759 goto bail;
1759 goto bail;
1760
1760
1761 done:
1761 done:
1762 free(revs);
1762 free(revs);
1763 return ret;
1763 return ret;
1764
1764
1765 bail:
1765 bail:
1766 free(revs);
1766 free(revs);
1767 Py_XDECREF(ret);
1767 Py_XDECREF(ret);
1768 return NULL;
1768 return NULL;
1769 }
1769 }
1770
1770
1771 /*
1771 /*
1772 * Given a (possibly overlapping) set of revs, return the greatest
1772 * Given a (possibly overlapping) set of revs, return the greatest
1773 * common ancestors: those with the longest path to the root.
1773 * common ancestors: those with the longest path to the root.
1774 */
1774 */
1775 static PyObject *index_ancestors(indexObject *self, PyObject *args)
1775 static PyObject *index_ancestors(indexObject *self, PyObject *args)
1776 {
1776 {
1777 PyObject *gca = index_commonancestorsheads(self, args);
1777 PyObject *gca = index_commonancestorsheads(self, args);
1778 if (gca == NULL)
1778 if (gca == NULL)
1779 return NULL;
1779 return NULL;
1780
1780
1781 if (PyList_GET_SIZE(gca) <= 1) {
1781 if (PyList_GET_SIZE(gca) <= 1) {
1782 Py_INCREF(gca);
1782 Py_INCREF(gca);
1783 return gca;
1783 return gca;
1784 }
1784 }
1785
1785
1786 return find_deepest(self, gca);
1786 return find_deepest(self, gca);
1787 }
1787 }
1788
1788
1789 /*
1789 /*
1790 * Invalidate any trie entries introduced by added revs.
1790 * Invalidate any trie entries introduced by added revs.
1791 */
1791 */
1792 static void nt_invalidate_added(indexObject *self, Py_ssize_t start)
1792 static void nt_invalidate_added(indexObject *self, Py_ssize_t start)
1793 {
1793 {
1794 Py_ssize_t i, len = PyList_GET_SIZE(self->added);
1794 Py_ssize_t i, len = PyList_GET_SIZE(self->added);
1795
1795
1796 for (i = start; i < len; i++) {
1796 for (i = start; i < len; i++) {
1797 PyObject *tuple = PyList_GET_ITEM(self->added, i);
1797 PyObject *tuple = PyList_GET_ITEM(self->added, i);
1798 PyObject *node = PyTuple_GET_ITEM(tuple, 7);
1798 PyObject *node = PyTuple_GET_ITEM(tuple, 7);
1799
1799
1800 nt_insert(self, PyString_AS_STRING(node), -1);
1800 nt_insert(self, PyString_AS_STRING(node), -1);
1801 }
1801 }
1802
1802
1803 if (start == 0)
1803 if (start == 0)
1804 Py_CLEAR(self->added);
1804 Py_CLEAR(self->added);
1805 }
1805 }
1806
1806
1807 /*
1807 /*
1808 * Delete a numeric range of revs, which must be at the end of the
1808 * Delete a numeric range of revs, which must be at the end of the
1809 * range, but exclude the sentinel nullid entry.
1809 * range, but exclude the sentinel nullid entry.
1810 */
1810 */
1811 static int index_slice_del(indexObject *self, PyObject *item)
1811 static int index_slice_del(indexObject *self, PyObject *item)
1812 {
1812 {
1813 Py_ssize_t start, stop, step, slicelength;
1813 Py_ssize_t start, stop, step, slicelength;
1814 Py_ssize_t length = index_length(self);
1814 Py_ssize_t length = index_length(self);
1815 int ret = 0;
1815 int ret = 0;
1816
1816
1817 if (PySlice_GetIndicesEx((PySliceObject*)item, length,
1817 if (PySlice_GetIndicesEx((PySliceObject*)item, length,
1818 &start, &stop, &step, &slicelength) < 0)
1818 &start, &stop, &step, &slicelength) < 0)
1819 return -1;
1819 return -1;
1820
1820
1821 if (slicelength <= 0)
1821 if (slicelength <= 0)
1822 return 0;
1822 return 0;
1823
1823
1824 if ((step < 0 && start < stop) || (step > 0 && start > stop))
1824 if ((step < 0 && start < stop) || (step > 0 && start > stop))
1825 stop = start;
1825 stop = start;
1826
1826
1827 if (step < 0) {
1827 if (step < 0) {
1828 stop = start + 1;
1828 stop = start + 1;
1829 start = stop + step*(slicelength - 1) - 1;
1829 start = stop + step*(slicelength - 1) - 1;
1830 step = -step;
1830 step = -step;
1831 }
1831 }
1832
1832
1833 if (step != 1) {
1833 if (step != 1) {
1834 PyErr_SetString(PyExc_ValueError,
1834 PyErr_SetString(PyExc_ValueError,
1835 "revlog index delete requires step size of 1");
1835 "revlog index delete requires step size of 1");
1836 return -1;
1836 return -1;
1837 }
1837 }
1838
1838
1839 if (stop != length - 1) {
1839 if (stop != length - 1) {
1840 PyErr_SetString(PyExc_IndexError,
1840 PyErr_SetString(PyExc_IndexError,
1841 "revlog index deletion indices are invalid");
1841 "revlog index deletion indices are invalid");
1842 return -1;
1842 return -1;
1843 }
1843 }
1844
1844
1845 if (start < self->length - 1) {
1845 if (start < self->length - 1) {
1846 if (self->nt) {
1846 if (self->nt) {
1847 Py_ssize_t i;
1847 Py_ssize_t i;
1848
1848
1849 for (i = start + 1; i < self->length - 1; i++) {
1849 for (i = start + 1; i < self->length - 1; i++) {
1850 const char *node = index_node(self, i);
1850 const char *node = index_node(self, i);
1851
1851
1852 if (node)
1852 if (node)
1853 nt_insert(self, node, -1);
1853 nt_insert(self, node, -1);
1854 }
1854 }
1855 if (self->added)
1855 if (self->added)
1856 nt_invalidate_added(self, 0);
1856 nt_invalidate_added(self, 0);
1857 if (self->ntrev > start)
1857 if (self->ntrev > start)
1858 self->ntrev = (int)start;
1858 self->ntrev = (int)start;
1859 }
1859 }
1860 self->length = start + 1;
1860 self->length = start + 1;
1861 if (start < self->raw_length) {
1861 if (start < self->raw_length) {
1862 if (self->cache) {
1862 if (self->cache) {
1863 Py_ssize_t i;
1863 Py_ssize_t i;
1864 for (i = start; i < self->raw_length; i++)
1864 for (i = start; i < self->raw_length; i++)
1865 Py_CLEAR(self->cache[i]);
1865 Py_CLEAR(self->cache[i]);
1866 }
1866 }
1867 self->raw_length = start;
1867 self->raw_length = start;
1868 }
1868 }
1869 goto done;
1869 goto done;
1870 }
1870 }
1871
1871
1872 if (self->nt) {
1872 if (self->nt) {
1873 nt_invalidate_added(self, start - self->length + 1);
1873 nt_invalidate_added(self, start - self->length + 1);
1874 if (self->ntrev > start)
1874 if (self->ntrev > start)
1875 self->ntrev = (int)start;
1875 self->ntrev = (int)start;
1876 }
1876 }
1877 if (self->added)
1877 if (self->added)
1878 ret = PyList_SetSlice(self->added, start - self->length + 1,
1878 ret = PyList_SetSlice(self->added, start - self->length + 1,
1879 PyList_GET_SIZE(self->added), NULL);
1879 PyList_GET_SIZE(self->added), NULL);
1880 done:
1880 done:
1881 Py_CLEAR(self->headrevs);
1881 Py_CLEAR(self->headrevs);
1882 return ret;
1882 return ret;
1883 }
1883 }
1884
1884
1885 /*
1885 /*
1886 * Supported ops:
1886 * Supported ops:
1887 *
1887 *
1888 * slice deletion
1888 * slice deletion
1889 * string assignment (extend node->rev mapping)
1889 * string assignment (extend node->rev mapping)
1890 * string deletion (shrink node->rev mapping)
1890 * string deletion (shrink node->rev mapping)
1891 */
1891 */
1892 static int index_assign_subscript(indexObject *self, PyObject *item,
1892 static int index_assign_subscript(indexObject *self, PyObject *item,
1893 PyObject *value)
1893 PyObject *value)
1894 {
1894 {
1895 char *node;
1895 char *node;
1896 Py_ssize_t nodelen;
1896 Py_ssize_t nodelen;
1897 long rev;
1897 long rev;
1898
1898
1899 if (PySlice_Check(item) && value == NULL)
1899 if (PySlice_Check(item) && value == NULL)
1900 return index_slice_del(self, item);
1900 return index_slice_del(self, item);
1901
1901
1902 if (node_check(item, &node, &nodelen) == -1)
1902 if (node_check(item, &node, &nodelen) == -1)
1903 return -1;
1903 return -1;
1904
1904
1905 if (value == NULL)
1905 if (value == NULL)
1906 return self->nt ? nt_insert(self, node, -1) : 0;
1906 return self->nt ? nt_insert(self, node, -1) : 0;
1907 rev = PyInt_AsLong(value);
1907 rev = PyInt_AsLong(value);
1908 if (rev > INT_MAX || rev < 0) {
1908 if (rev > INT_MAX || rev < 0) {
1909 if (!PyErr_Occurred())
1909 if (!PyErr_Occurred())
1910 PyErr_SetString(PyExc_ValueError, "rev out of range");
1910 PyErr_SetString(PyExc_ValueError, "rev out of range");
1911 return -1;
1911 return -1;
1912 }
1912 }
1913
1913
1914 if (nt_init(self) == -1)
1914 if (nt_init(self) == -1)
1915 return -1;
1915 return -1;
1916 return nt_insert(self, node, (int)rev);
1916 return nt_insert(self, node, (int)rev);
1917 }
1917 }
1918
1918
1919 /*
1919 /*
1920 * Find all RevlogNG entries in an index that has inline data. Update
1920 * Find all RevlogNG entries in an index that has inline data. Update
1921 * the optional "offsets" table with those entries.
1921 * the optional "offsets" table with those entries.
1922 */
1922 */
1923 static Py_ssize_t inline_scan(indexObject *self, const char **offsets)
1923 static Py_ssize_t inline_scan(indexObject *self, const char **offsets)
1924 {
1924 {
1925 const char *data = PyString_AS_STRING(self->data);
1925 const char *data = PyString_AS_STRING(self->data);
1926 Py_ssize_t pos = 0;
1926 Py_ssize_t pos = 0;
1927 Py_ssize_t end = PyString_GET_SIZE(self->data);
1927 Py_ssize_t end = PyString_GET_SIZE(self->data);
1928 long incr = v1_hdrsize;
1928 long incr = v1_hdrsize;
1929 Py_ssize_t len = 0;
1929 Py_ssize_t len = 0;
1930
1930
1931 while (pos + v1_hdrsize <= end && pos >= 0) {
1931 while (pos + v1_hdrsize <= end && pos >= 0) {
1932 uint32_t comp_len;
1932 uint32_t comp_len;
1933 /* 3rd element of header is length of compressed inline data */
1933 /* 3rd element of header is length of compressed inline data */
1934 comp_len = getbe32(data + pos + 8);
1934 comp_len = getbe32(data + pos + 8);
1935 incr = v1_hdrsize + comp_len;
1935 incr = v1_hdrsize + comp_len;
1936 if (offsets)
1936 if (offsets)
1937 offsets[len] = data + pos;
1937 offsets[len] = data + pos;
1938 len++;
1938 len++;
1939 pos += incr;
1939 pos += incr;
1940 }
1940 }
1941
1941
1942 if (pos != end) {
1942 if (pos != end) {
1943 if (!PyErr_Occurred())
1943 if (!PyErr_Occurred())
1944 PyErr_SetString(PyExc_ValueError, "corrupt index file");
1944 PyErr_SetString(PyExc_ValueError, "corrupt index file");
1945 return -1;
1945 return -1;
1946 }
1946 }
1947
1947
1948 return len;
1948 return len;
1949 }
1949 }
1950
1950
1951 static int index_init(indexObject *self, PyObject *args)
1951 static int index_init(indexObject *self, PyObject *args)
1952 {
1952 {
1953 PyObject *data_obj, *inlined_obj;
1953 PyObject *data_obj, *inlined_obj;
1954 Py_ssize_t size;
1954 Py_ssize_t size;
1955
1955
1956 /* Initialize before argument-checking to avoid index_dealloc() crash. */
1956 /* Initialize before argument-checking to avoid index_dealloc() crash. */
1957 self->raw_length = 0;
1957 self->raw_length = 0;
1958 self->added = NULL;
1958 self->added = NULL;
1959 self->cache = NULL;
1959 self->cache = NULL;
1960 self->data = NULL;
1960 self->data = NULL;
1961 self->headrevs = NULL;
1961 self->headrevs = NULL;
1962 self->filteredrevs = Py_None;
1962 self->filteredrevs = Py_None;
1963 Py_INCREF(Py_None);
1963 Py_INCREF(Py_None);
1964 self->nt = NULL;
1964 self->nt = NULL;
1965 self->offsets = NULL;
1965 self->offsets = NULL;
1966
1966
1967 if (!PyArg_ParseTuple(args, "OO", &data_obj, &inlined_obj))
1967 if (!PyArg_ParseTuple(args, "OO", &data_obj, &inlined_obj))
1968 return -1;
1968 return -1;
1969 if (!PyString_Check(data_obj)) {
1969 if (!PyString_Check(data_obj)) {
1970 PyErr_SetString(PyExc_TypeError, "data is not a string");
1970 PyErr_SetString(PyExc_TypeError, "data is not a string");
1971 return -1;
1971 return -1;
1972 }
1972 }
1973 size = PyString_GET_SIZE(data_obj);
1973 size = PyString_GET_SIZE(data_obj);
1974
1974
1975 self->inlined = inlined_obj && PyObject_IsTrue(inlined_obj);
1975 self->inlined = inlined_obj && PyObject_IsTrue(inlined_obj);
1976 self->data = data_obj;
1976 self->data = data_obj;
1977
1977
1978 self->ntlength = self->ntcapacity = 0;
1978 self->ntlength = self->ntcapacity = 0;
1979 self->ntdepth = self->ntsplits = 0;
1979 self->ntdepth = self->ntsplits = 0;
1980 self->ntlookups = self->ntmisses = 0;
1980 self->ntlookups = self->ntmisses = 0;
1981 self->ntrev = -1;
1981 self->ntrev = -1;
1982 Py_INCREF(self->data);
1982 Py_INCREF(self->data);
1983
1983
1984 if (self->inlined) {
1984 if (self->inlined) {
1985 Py_ssize_t len = inline_scan(self, NULL);
1985 Py_ssize_t len = inline_scan(self, NULL);
1986 if (len == -1)
1986 if (len == -1)
1987 goto bail;
1987 goto bail;
1988 self->raw_length = len;
1988 self->raw_length = len;
1989 self->length = len + 1;
1989 self->length = len + 1;
1990 } else {
1990 } else {
1991 if (size % v1_hdrsize) {
1991 if (size % v1_hdrsize) {
1992 PyErr_SetString(PyExc_ValueError, "corrupt index file");
1992 PyErr_SetString(PyExc_ValueError, "corrupt index file");
1993 goto bail;
1993 goto bail;
1994 }
1994 }
1995 self->raw_length = size / v1_hdrsize;
1995 self->raw_length = size / v1_hdrsize;
1996 self->length = self->raw_length + 1;
1996 self->length = self->raw_length + 1;
1997 }
1997 }
1998
1998
1999 return 0;
1999 return 0;
2000 bail:
2000 bail:
2001 return -1;
2001 return -1;
2002 }
2002 }
2003
2003
2004 static PyObject *index_nodemap(indexObject *self)
2004 static PyObject *index_nodemap(indexObject *self)
2005 {
2005 {
2006 Py_INCREF(self);
2006 Py_INCREF(self);
2007 return (PyObject *)self;
2007 return (PyObject *)self;
2008 }
2008 }
2009
2009
2010 static void index_dealloc(indexObject *self)
2010 static void index_dealloc(indexObject *self)
2011 {
2011 {
2012 _index_clearcaches(self);
2012 _index_clearcaches(self);
2013 Py_XDECREF(self->filteredrevs);
2013 Py_XDECREF(self->filteredrevs);
2014 Py_XDECREF(self->data);
2014 Py_XDECREF(self->data);
2015 Py_XDECREF(self->added);
2015 Py_XDECREF(self->added);
2016 PyObject_Del(self);
2016 PyObject_Del(self);
2017 }
2017 }
2018
2018
2019 static PySequenceMethods index_sequence_methods = {
2019 static PySequenceMethods index_sequence_methods = {
2020 (lenfunc)index_length, /* sq_length */
2020 (lenfunc)index_length, /* sq_length */
2021 0, /* sq_concat */
2021 0, /* sq_concat */
2022 0, /* sq_repeat */
2022 0, /* sq_repeat */
2023 (ssizeargfunc)index_get, /* sq_item */
2023 (ssizeargfunc)index_get, /* sq_item */
2024 0, /* sq_slice */
2024 0, /* sq_slice */
2025 0, /* sq_ass_item */
2025 0, /* sq_ass_item */
2026 0, /* sq_ass_slice */
2026 0, /* sq_ass_slice */
2027 (objobjproc)index_contains, /* sq_contains */
2027 (objobjproc)index_contains, /* sq_contains */
2028 };
2028 };
2029
2029
2030 static PyMappingMethods index_mapping_methods = {
2030 static PyMappingMethods index_mapping_methods = {
2031 (lenfunc)index_length, /* mp_length */
2031 (lenfunc)index_length, /* mp_length */
2032 (binaryfunc)index_getitem, /* mp_subscript */
2032 (binaryfunc)index_getitem, /* mp_subscript */
2033 (objobjargproc)index_assign_subscript, /* mp_ass_subscript */
2033 (objobjargproc)index_assign_subscript, /* mp_ass_subscript */
2034 };
2034 };
2035
2035
2036 static PyMethodDef index_methods[] = {
2036 static PyMethodDef index_methods[] = {
2037 {"ancestors", (PyCFunction)index_ancestors, METH_VARARGS,
2037 {"ancestors", (PyCFunction)index_ancestors, METH_VARARGS,
2038 "return the gca set of the given revs"},
2038 "return the gca set of the given revs"},
2039 {"commonancestorsheads", (PyCFunction)index_commonancestorsheads,
2039 {"commonancestorsheads", (PyCFunction)index_commonancestorsheads,
2040 METH_VARARGS,
2040 METH_VARARGS,
2041 "return the heads of the common ancestors of the given revs"},
2041 "return the heads of the common ancestors of the given revs"},
2042 {"clearcaches", (PyCFunction)index_clearcaches, METH_NOARGS,
2042 {"clearcaches", (PyCFunction)index_clearcaches, METH_NOARGS,
2043 "clear the index caches"},
2043 "clear the index caches"},
2044 {"get", (PyCFunction)index_m_get, METH_VARARGS,
2044 {"get", (PyCFunction)index_m_get, METH_VARARGS,
2045 "get an index entry"},
2045 "get an index entry"},
2046 {"headrevs", (PyCFunction)index_headrevs, METH_VARARGS,
2046 {"headrevs", (PyCFunction)index_headrevs, METH_VARARGS,
2047 "get head revisions"}, /* Can do filtering since 3.2 */
2047 "get head revisions"}, /* Can do filtering since 3.2 */
2048 {"headrevsfiltered", (PyCFunction)index_headrevs, METH_VARARGS,
2048 {"headrevsfiltered", (PyCFunction)index_headrevs, METH_VARARGS,
2049 "get filtered head revisions"}, /* Can always do filtering */
2049 "get filtered head revisions"}, /* Can always do filtering */
2050 {"insert", (PyCFunction)index_insert, METH_VARARGS,
2050 {"insert", (PyCFunction)index_insert, METH_VARARGS,
2051 "insert an index entry"},
2051 "insert an index entry"},
2052 {"partialmatch", (PyCFunction)index_partialmatch, METH_VARARGS,
2052 {"partialmatch", (PyCFunction)index_partialmatch, METH_VARARGS,
2053 "match a potentially ambiguous node ID"},
2053 "match a potentially ambiguous node ID"},
2054 {"stats", (PyCFunction)index_stats, METH_NOARGS,
2054 {"stats", (PyCFunction)index_stats, METH_NOARGS,
2055 "stats for the index"},
2055 "stats for the index"},
2056 {NULL} /* Sentinel */
2056 {NULL} /* Sentinel */
2057 };
2057 };
2058
2058
2059 static PyGetSetDef index_getset[] = {
2059 static PyGetSetDef index_getset[] = {
2060 {"nodemap", (getter)index_nodemap, NULL, "nodemap", NULL},
2060 {"nodemap", (getter)index_nodemap, NULL, "nodemap", NULL},
2061 {NULL} /* Sentinel */
2061 {NULL} /* Sentinel */
2062 };
2062 };
2063
2063
2064 static PyTypeObject indexType = {
2064 static PyTypeObject indexType = {
2065 PyObject_HEAD_INIT(NULL)
2065 PyObject_HEAD_INIT(NULL)
2066 0, /* ob_size */
2066 0, /* ob_size */
2067 "parsers.index", /* tp_name */
2067 "parsers.index", /* tp_name */
2068 sizeof(indexObject), /* tp_basicsize */
2068 sizeof(indexObject), /* tp_basicsize */
2069 0, /* tp_itemsize */
2069 0, /* tp_itemsize */
2070 (destructor)index_dealloc, /* tp_dealloc */
2070 (destructor)index_dealloc, /* tp_dealloc */
2071 0, /* tp_print */
2071 0, /* tp_print */
2072 0, /* tp_getattr */
2072 0, /* tp_getattr */
2073 0, /* tp_setattr */
2073 0, /* tp_setattr */
2074 0, /* tp_compare */
2074 0, /* tp_compare */
2075 0, /* tp_repr */
2075 0, /* tp_repr */
2076 0, /* tp_as_number */
2076 0, /* tp_as_number */
2077 &index_sequence_methods, /* tp_as_sequence */
2077 &index_sequence_methods, /* tp_as_sequence */
2078 &index_mapping_methods, /* tp_as_mapping */
2078 &index_mapping_methods, /* tp_as_mapping */
2079 0, /* tp_hash */
2079 0, /* tp_hash */
2080 0, /* tp_call */
2080 0, /* tp_call */
2081 0, /* tp_str */
2081 0, /* tp_str */
2082 0, /* tp_getattro */
2082 0, /* tp_getattro */
2083 0, /* tp_setattro */
2083 0, /* tp_setattro */
2084 0, /* tp_as_buffer */
2084 0, /* tp_as_buffer */
2085 Py_TPFLAGS_DEFAULT, /* tp_flags */
2085 Py_TPFLAGS_DEFAULT, /* tp_flags */
2086 "revlog index", /* tp_doc */
2086 "revlog index", /* tp_doc */
2087 0, /* tp_traverse */
2087 0, /* tp_traverse */
2088 0, /* tp_clear */
2088 0, /* tp_clear */
2089 0, /* tp_richcompare */
2089 0, /* tp_richcompare */
2090 0, /* tp_weaklistoffset */
2090 0, /* tp_weaklistoffset */
2091 0, /* tp_iter */
2091 0, /* tp_iter */
2092 0, /* tp_iternext */
2092 0, /* tp_iternext */
2093 index_methods, /* tp_methods */
2093 index_methods, /* tp_methods */
2094 0, /* tp_members */
2094 0, /* tp_members */
2095 index_getset, /* tp_getset */
2095 index_getset, /* tp_getset */
2096 0, /* tp_base */
2096 0, /* tp_base */
2097 0, /* tp_dict */
2097 0, /* tp_dict */
2098 0, /* tp_descr_get */
2098 0, /* tp_descr_get */
2099 0, /* tp_descr_set */
2099 0, /* tp_descr_set */
2100 0, /* tp_dictoffset */
2100 0, /* tp_dictoffset */
2101 (initproc)index_init, /* tp_init */
2101 (initproc)index_init, /* tp_init */
2102 0, /* tp_alloc */
2102 0, /* tp_alloc */
2103 };
2103 };
2104
2104
2105 /*
2105 /*
2106 * returns a tuple of the form (index, index, cache) with elements as
2106 * returns a tuple of the form (index, index, cache) with elements as
2107 * follows:
2107 * follows:
2108 *
2108 *
2109 * index: an index object that lazily parses RevlogNG records
2109 * index: an index object that lazily parses RevlogNG records
2110 * cache: if data is inlined, a tuple (index_file_content, 0), else None
2110 * cache: if data is inlined, a tuple (index_file_content, 0), else None
2111 *
2111 *
2112 * added complications are for backwards compatibility
2112 * added complications are for backwards compatibility
2113 */
2113 */
2114 static PyObject *parse_index2(PyObject *self, PyObject *args)
2114 static PyObject *parse_index2(PyObject *self, PyObject *args)
2115 {
2115 {
2116 PyObject *tuple = NULL, *cache = NULL;
2116 PyObject *tuple = NULL, *cache = NULL;
2117 indexObject *idx;
2117 indexObject *idx;
2118 int ret;
2118 int ret;
2119
2119
2120 idx = PyObject_New(indexObject, &indexType);
2120 idx = PyObject_New(indexObject, &indexType);
2121 if (idx == NULL)
2121 if (idx == NULL)
2122 goto bail;
2122 goto bail;
2123
2123
2124 ret = index_init(idx, args);
2124 ret = index_init(idx, args);
2125 if (ret == -1)
2125 if (ret == -1)
2126 goto bail;
2126 goto bail;
2127
2127
2128 if (idx->inlined) {
2128 if (idx->inlined) {
2129 cache = Py_BuildValue("iO", 0, idx->data);
2129 cache = Py_BuildValue("iO", 0, idx->data);
2130 if (cache == NULL)
2130 if (cache == NULL)
2131 goto bail;
2131 goto bail;
2132 } else {
2132 } else {
2133 cache = Py_None;
2133 cache = Py_None;
2134 Py_INCREF(cache);
2134 Py_INCREF(cache);
2135 }
2135 }
2136
2136
2137 tuple = Py_BuildValue("NN", idx, cache);
2137 tuple = Py_BuildValue("NN", idx, cache);
2138 if (!tuple)
2138 if (!tuple)
2139 goto bail;
2139 goto bail;
2140 return tuple;
2140 return tuple;
2141
2141
2142 bail:
2142 bail:
2143 Py_XDECREF(idx);
2143 Py_XDECREF(idx);
2144 Py_XDECREF(cache);
2144 Py_XDECREF(cache);
2145 Py_XDECREF(tuple);
2145 Py_XDECREF(tuple);
2146 return NULL;
2146 return NULL;
2147 }
2147 }
2148
2148
2149 #define BUMPED_FIX 1
2149 #define BUMPED_FIX 1
2150 #define USING_SHA_256 2
2150 #define USING_SHA_256 2
2151
2151
2152 static PyObject *readshas(
2152 static PyObject *readshas(
2153 const char *source, unsigned char num, Py_ssize_t hashwidth)
2153 const char *source, unsigned char num, Py_ssize_t hashwidth)
2154 {
2154 {
2155 int i;
2155 int i;
2156 PyObject *list = PyTuple_New(num);
2156 PyObject *list = PyTuple_New(num);
2157 if (list == NULL) {
2157 if (list == NULL) {
2158 return NULL;
2158 return NULL;
2159 }
2159 }
2160 for (i = 0; i < num; i++) {
2160 for (i = 0; i < num; i++) {
2161 PyObject *hash = PyString_FromStringAndSize(source, hashwidth);
2161 PyObject *hash = PyString_FromStringAndSize(source, hashwidth);
2162 if (hash == NULL) {
2162 if (hash == NULL) {
2163 Py_DECREF(list);
2163 Py_DECREF(list);
2164 return NULL;
2164 return NULL;
2165 }
2165 }
2166 PyTuple_SetItem(list, i, hash);
2166 PyTuple_SetItem(list, i, hash);
2167 source += hashwidth;
2167 source += hashwidth;
2168 }
2168 }
2169 return list;
2169 return list;
2170 }
2170 }
2171
2171
2172 static PyObject *fm1readmarker(const char *data, uint32_t *msize)
2172 static PyObject *fm1readmarker(const char *data, uint32_t *msize)
2173 {
2173 {
2174 const char *meta;
2174 const char *meta;
2175
2175
2176 double mtime;
2176 double mtime;
2177 int16_t tz;
2177 int16_t tz;
2178 uint16_t flags;
2178 uint16_t flags;
2179 unsigned char nsuccs, nparents, nmetadata;
2179 unsigned char nsuccs, nparents, nmetadata;
2180 Py_ssize_t hashwidth = 20;
2180 Py_ssize_t hashwidth = 20;
2181
2181
2182 PyObject *prec = NULL, *parents = NULL, *succs = NULL;
2182 PyObject *prec = NULL, *parents = NULL, *succs = NULL;
2183 PyObject *metadata = NULL, *ret = NULL;
2183 PyObject *metadata = NULL, *ret = NULL;
2184 int i;
2184 int i;
2185
2185
2186 *msize = getbe32(data);
2186 *msize = getbe32(data);
2187 data += 4;
2187 data += 4;
2188 mtime = getbefloat64(data);
2188 mtime = getbefloat64(data);
2189 data += 8;
2189 data += 8;
2190 tz = getbeint16(data);
2190 tz = getbeint16(data);
2191 data += 2;
2191 data += 2;
2192 flags = getbeuint16(data);
2192 flags = getbeuint16(data);
2193 data += 2;
2193 data += 2;
2194
2194
2195 if (flags & USING_SHA_256) {
2195 if (flags & USING_SHA_256) {
2196 hashwidth = 32;
2196 hashwidth = 32;
2197 }
2197 }
2198
2198
2199 nsuccs = (unsigned char)(*data++);
2199 nsuccs = (unsigned char)(*data++);
2200 nparents = (unsigned char)(*data++);
2200 nparents = (unsigned char)(*data++);
2201 nmetadata = (unsigned char)(*data++);
2201 nmetadata = (unsigned char)(*data++);
2202
2202
2203 prec = PyString_FromStringAndSize(data, hashwidth);
2203 prec = PyString_FromStringAndSize(data, hashwidth);
2204 data += hashwidth;
2204 data += hashwidth;
2205 if (prec == NULL) {
2205 if (prec == NULL) {
2206 goto bail;
2206 goto bail;
2207 }
2207 }
2208
2208
2209 succs = readshas(data, nsuccs, hashwidth);
2209 succs = readshas(data, nsuccs, hashwidth);
2210 if (succs == NULL) {
2210 if (succs == NULL) {
2211 goto bail;
2211 goto bail;
2212 }
2212 }
2213 data += nsuccs * hashwidth;
2213 data += nsuccs * hashwidth;
2214
2214
2215 if (nparents == 1 || nparents == 2) {
2215 if (nparents == 1 || nparents == 2) {
2216 parents = readshas(data, nparents, hashwidth);
2216 parents = readshas(data, nparents, hashwidth);
2217 if (parents == NULL) {
2217 if (parents == NULL) {
2218 goto bail;
2218 goto bail;
2219 }
2219 }
2220 data += nparents * hashwidth;
2220 data += nparents * hashwidth;
2221 } else {
2221 } else {
2222 parents = Py_None;
2222 parents = Py_None;
2223 }
2223 }
2224
2224
2225 meta = data + (2 * nmetadata);
2225 meta = data + (2 * nmetadata);
2226 metadata = PyTuple_New(nmetadata);
2226 metadata = PyTuple_New(nmetadata);
2227 if (metadata == NULL) {
2227 if (metadata == NULL) {
2228 goto bail;
2228 goto bail;
2229 }
2229 }
2230 for (i = 0; i < nmetadata; i++) {
2230 for (i = 0; i < nmetadata; i++) {
2231 PyObject *tmp, *left = NULL, *right = NULL;
2231 PyObject *tmp, *left = NULL, *right = NULL;
2232 Py_ssize_t metasize = (unsigned char)(*data++);
2232 Py_ssize_t metasize = (unsigned char)(*data++);
2233 left = PyString_FromStringAndSize(meta, metasize);
2233 left = PyString_FromStringAndSize(meta, metasize);
2234 meta += metasize;
2234 meta += metasize;
2235 metasize = (unsigned char)(*data++);
2235 metasize = (unsigned char)(*data++);
2236 right = PyString_FromStringAndSize(meta, metasize);
2236 right = PyString_FromStringAndSize(meta, metasize);
2237 meta += metasize;
2237 meta += metasize;
2238 if (!left || !right) {
2238 if (!left || !right) {
2239 Py_XDECREF(left);
2239 Py_XDECREF(left);
2240 Py_XDECREF(right);
2240 Py_XDECREF(right);
2241 goto bail;
2241 goto bail;
2242 }
2242 }
2243 tmp = PyTuple_Pack(2, left, right);
2243 tmp = PyTuple_Pack(2, left, right);
2244 Py_DECREF(left);
2244 Py_DECREF(left);
2245 Py_DECREF(right);
2245 Py_DECREF(right);
2246 if (!tmp) {
2246 if (!tmp) {
2247 goto bail;
2247 goto bail;
2248 }
2248 }
2249 PyTuple_SetItem(metadata, i, tmp);
2249 PyTuple_SetItem(metadata, i, tmp);
2250 }
2250 }
2251 ret = Py_BuildValue("(OOHO(di)O)", prec, succs, flags,
2251 ret = Py_BuildValue("(OOHO(di)O)", prec, succs, flags,
2252 metadata, mtime, (int)tz * 60, parents);
2252 metadata, mtime, (int)tz * 60, parents);
2253 bail:
2253 bail:
2254 Py_XDECREF(prec);
2254 Py_XDECREF(prec);
2255 Py_XDECREF(succs);
2255 Py_XDECREF(succs);
2256 Py_XDECREF(metadata);
2256 Py_XDECREF(metadata);
2257 if (parents != Py_None)
2257 if (parents != Py_None)
2258 Py_XDECREF(parents);
2258 Py_XDECREF(parents);
2259 return ret;
2259 return ret;
2260 }
2260 }
2261
2261
2262
2262
2263 static PyObject *fm1readmarkers(PyObject *self, PyObject *args) {
2263 static PyObject *fm1readmarkers(PyObject *self, PyObject *args) {
2264 const char *data;
2264 const char *data;
2265 Py_ssize_t datalen, offset, stop;
2265 Py_ssize_t datalen;
2266 /* only unsigned long because python 2.4, should be Py_ssize_t */
2267 unsigned long offset, stop;
2266 PyObject *markers = NULL;
2268 PyObject *markers = NULL;
2267
2269
2268 if (!PyArg_ParseTuple(args, "s#nn", &data, &datalen, &offset, &stop)) {
2270 /* replace kk with nn when we drop Python 2.4 */
2271 if (!PyArg_ParseTuple(args, "s#kk", &data, &datalen, &offset, &stop)) {
2269 return NULL;
2272 return NULL;
2270 }
2273 }
2271 data += offset;
2274 data += offset;
2272 markers = PyList_New(0);
2275 markers = PyList_New(0);
2273 if (!markers) {
2276 if (!markers) {
2274 return NULL;
2277 return NULL;
2275 }
2278 }
2276 while (offset < stop) {
2279 while (offset < stop) {
2277 uint32_t msize;
2280 uint32_t msize;
2278 int error;
2281 int error;
2279 PyObject *record = fm1readmarker(data, &msize);
2282 PyObject *record = fm1readmarker(data, &msize);
2280 if (!record) {
2283 if (!record) {
2281 goto bail;
2284 goto bail;
2282 }
2285 }
2283 error = PyList_Append(markers, record);
2286 error = PyList_Append(markers, record);
2284 Py_DECREF(record);
2287 Py_DECREF(record);
2285 if (error) {
2288 if (error) {
2286 goto bail;
2289 goto bail;
2287 }
2290 }
2288 data += msize;
2291 data += msize;
2289 offset += msize;
2292 offset += msize;
2290 }
2293 }
2291 return markers;
2294 return markers;
2292 bail:
2295 bail:
2293 Py_DECREF(markers);
2296 Py_DECREF(markers);
2294 return NULL;
2297 return NULL;
2295 }
2298 }
2296
2299
2297 static char parsers_doc[] = "Efficient content parsing.";
2300 static char parsers_doc[] = "Efficient content parsing.";
2298
2301
2299 PyObject *encodedir(PyObject *self, PyObject *args);
2302 PyObject *encodedir(PyObject *self, PyObject *args);
2300 PyObject *pathencode(PyObject *self, PyObject *args);
2303 PyObject *pathencode(PyObject *self, PyObject *args);
2301 PyObject *lowerencode(PyObject *self, PyObject *args);
2304 PyObject *lowerencode(PyObject *self, PyObject *args);
2302
2305
2303 static PyMethodDef methods[] = {
2306 static PyMethodDef methods[] = {
2304 {"pack_dirstate", pack_dirstate, METH_VARARGS, "pack a dirstate\n"},
2307 {"pack_dirstate", pack_dirstate, METH_VARARGS, "pack a dirstate\n"},
2305 {"parse_manifest", parse_manifest, METH_VARARGS, "parse a manifest\n"},
2308 {"parse_manifest", parse_manifest, METH_VARARGS, "parse a manifest\n"},
2306 {"parse_dirstate", parse_dirstate, METH_VARARGS, "parse a dirstate\n"},
2309 {"parse_dirstate", parse_dirstate, METH_VARARGS, "parse a dirstate\n"},
2307 {"parse_index2", parse_index2, METH_VARARGS, "parse a revlog index\n"},
2310 {"parse_index2", parse_index2, METH_VARARGS, "parse a revlog index\n"},
2308 {"asciilower", asciilower, METH_VARARGS, "lowercase an ASCII string\n"},
2311 {"asciilower", asciilower, METH_VARARGS, "lowercase an ASCII string\n"},
2309 {"encodedir", encodedir, METH_VARARGS, "encodedir a path\n"},
2312 {"encodedir", encodedir, METH_VARARGS, "encodedir a path\n"},
2310 {"pathencode", pathencode, METH_VARARGS, "fncache-encode a path\n"},
2313 {"pathencode", pathencode, METH_VARARGS, "fncache-encode a path\n"},
2311 {"lowerencode", lowerencode, METH_VARARGS, "lower-encode a path\n"},
2314 {"lowerencode", lowerencode, METH_VARARGS, "lower-encode a path\n"},
2312 {"fm1readmarkers", fm1readmarkers, METH_VARARGS,
2315 {"fm1readmarkers", fm1readmarkers, METH_VARARGS,
2313 "parse v1 obsolete markers\n"},
2316 "parse v1 obsolete markers\n"},
2314 {NULL, NULL}
2317 {NULL, NULL}
2315 };
2318 };
2316
2319
2317 void dirs_module_init(PyObject *mod);
2320 void dirs_module_init(PyObject *mod);
2318
2321
2319 static void module_init(PyObject *mod)
2322 static void module_init(PyObject *mod)
2320 {
2323 {
2321 /* This module constant has two purposes. First, it lets us unit test
2324 /* This module constant has two purposes. First, it lets us unit test
2322 * the ImportError raised without hard-coding any error text. This
2325 * the ImportError raised without hard-coding any error text. This
2323 * means we can change the text in the future without breaking tests,
2326 * means we can change the text in the future without breaking tests,
2324 * even across changesets without a recompile. Second, its presence
2327 * even across changesets without a recompile. Second, its presence
2325 * can be used to determine whether the version-checking logic is
2328 * can be used to determine whether the version-checking logic is
2326 * present, which also helps in testing across changesets without a
2329 * present, which also helps in testing across changesets without a
2327 * recompile. Note that this means the pure-Python version of parsers
2330 * recompile. Note that this means the pure-Python version of parsers
2328 * should not have this module constant. */
2331 * should not have this module constant. */
2329 PyModule_AddStringConstant(mod, "versionerrortext", versionerrortext);
2332 PyModule_AddStringConstant(mod, "versionerrortext", versionerrortext);
2330
2333
2331 dirs_module_init(mod);
2334 dirs_module_init(mod);
2332
2335
2333 indexType.tp_new = PyType_GenericNew;
2336 indexType.tp_new = PyType_GenericNew;
2334 if (PyType_Ready(&indexType) < 0 ||
2337 if (PyType_Ready(&indexType) < 0 ||
2335 PyType_Ready(&dirstateTupleType) < 0)
2338 PyType_Ready(&dirstateTupleType) < 0)
2336 return;
2339 return;
2337 Py_INCREF(&indexType);
2340 Py_INCREF(&indexType);
2338 PyModule_AddObject(mod, "index", (PyObject *)&indexType);
2341 PyModule_AddObject(mod, "index", (PyObject *)&indexType);
2339 Py_INCREF(&dirstateTupleType);
2342 Py_INCREF(&dirstateTupleType);
2340 PyModule_AddObject(mod, "dirstatetuple",
2343 PyModule_AddObject(mod, "dirstatetuple",
2341 (PyObject *)&dirstateTupleType);
2344 (PyObject *)&dirstateTupleType);
2342
2345
2343 nullentry = Py_BuildValue("iiiiiiis#", 0, 0, 0,
2346 nullentry = Py_BuildValue("iiiiiiis#", 0, 0, 0,
2344 -1, -1, -1, -1, nullid, 20);
2347 -1, -1, -1, -1, nullid, 20);
2345 if (nullentry)
2348 if (nullentry)
2346 PyObject_GC_UnTrack(nullentry);
2349 PyObject_GC_UnTrack(nullentry);
2347 }
2350 }
2348
2351
2349 static int check_python_version(void)
2352 static int check_python_version(void)
2350 {
2353 {
2351 PyObject *sys = PyImport_ImportModule("sys"), *ver;
2354 PyObject *sys = PyImport_ImportModule("sys"), *ver;
2352 long hexversion;
2355 long hexversion;
2353 if (!sys)
2356 if (!sys)
2354 return -1;
2357 return -1;
2355 ver = PyObject_GetAttrString(sys, "hexversion");
2358 ver = PyObject_GetAttrString(sys, "hexversion");
2356 Py_DECREF(sys);
2359 Py_DECREF(sys);
2357 if (!ver)
2360 if (!ver)
2358 return -1;
2361 return -1;
2359 hexversion = PyInt_AsLong(ver);
2362 hexversion = PyInt_AsLong(ver);
2360 Py_DECREF(ver);
2363 Py_DECREF(ver);
2361 /* sys.hexversion is a 32-bit number by default, so the -1 case
2364 /* sys.hexversion is a 32-bit number by default, so the -1 case
2362 * should only occur in unusual circumstances (e.g. if sys.hexversion
2365 * should only occur in unusual circumstances (e.g. if sys.hexversion
2363 * is manually set to an invalid value). */
2366 * is manually set to an invalid value). */
2364 if ((hexversion == -1) || (hexversion >> 16 != PY_VERSION_HEX >> 16)) {
2367 if ((hexversion == -1) || (hexversion >> 16 != PY_VERSION_HEX >> 16)) {
2365 PyErr_Format(PyExc_ImportError, "%s: The Mercurial extension "
2368 PyErr_Format(PyExc_ImportError, "%s: The Mercurial extension "
2366 "modules were compiled with Python " PY_VERSION ", but "
2369 "modules were compiled with Python " PY_VERSION ", but "
2367 "Mercurial is currently using Python with sys.hexversion=%ld: "
2370 "Mercurial is currently using Python with sys.hexversion=%ld: "
2368 "Python %s\n at: %s", versionerrortext, hexversion,
2371 "Python %s\n at: %s", versionerrortext, hexversion,
2369 Py_GetVersion(), Py_GetProgramFullPath());
2372 Py_GetVersion(), Py_GetProgramFullPath());
2370 return -1;
2373 return -1;
2371 }
2374 }
2372 return 0;
2375 return 0;
2373 }
2376 }
2374
2377
2375 #ifdef IS_PY3K
2378 #ifdef IS_PY3K
2376 static struct PyModuleDef parsers_module = {
2379 static struct PyModuleDef parsers_module = {
2377 PyModuleDef_HEAD_INIT,
2380 PyModuleDef_HEAD_INIT,
2378 "parsers",
2381 "parsers",
2379 parsers_doc,
2382 parsers_doc,
2380 -1,
2383 -1,
2381 methods
2384 methods
2382 };
2385 };
2383
2386
2384 PyMODINIT_FUNC PyInit_parsers(void)
2387 PyMODINIT_FUNC PyInit_parsers(void)
2385 {
2388 {
2386 PyObject *mod;
2389 PyObject *mod;
2387
2390
2388 if (check_python_version() == -1)
2391 if (check_python_version() == -1)
2389 return;
2392 return;
2390 mod = PyModule_Create(&parsers_module);
2393 mod = PyModule_Create(&parsers_module);
2391 module_init(mod);
2394 module_init(mod);
2392 return mod;
2395 return mod;
2393 }
2396 }
2394 #else
2397 #else
2395 PyMODINIT_FUNC initparsers(void)
2398 PyMODINIT_FUNC initparsers(void)
2396 {
2399 {
2397 PyObject *mod;
2400 PyObject *mod;
2398
2401
2399 if (check_python_version() == -1)
2402 if (check_python_version() == -1)
2400 return;
2403 return;
2401 mod = Py_InitModule3("parsers", methods, parsers_doc);
2404 mod = Py_InitModule3("parsers", methods, parsers_doc);
2402 module_init(mod);
2405 module_init(mod);
2403 }
2406 }
2404 #endif
2407 #endif
General Comments 0
You need to be logged in to leave comments. Login now