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