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