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