Mercurial > hg
annotate mercurial/cext/revlog.c @ 40742:8edca70dc951
revlog: update the documentation for `trim_endidx`
The function role drifted since the function was commented.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Mon, 26 Nov 2018 00:23:12 +0100 |
parents | 959130631de3 |
children | c85964d715fd |
rev | line source |
---|---|
6389
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 /* |
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 parsers.c - efficient content parsing |
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 |
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 Copyright 2008 Matt Mackall <mpm@selenic.com> and others |
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 |
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 This software may be used and distributed according to the terms of |
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 the GNU General Public License, incorporated herein by reference. |
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 */ |
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 |
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 #include <Python.h> |
33174
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
11 #include <assert.h> |
6389
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 #include <ctype.h> |
40704
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
13 #include <limits.h> |
17356
511dfb34b412
parsers: fix an integer size warning issued by clang
Bryan O'Sullivan <bryano@fb.com>
parents:
17353
diff
changeset
|
14 #include <stddef.h> |
40707
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
15 #include <stdlib.h> |
6389
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 #include <string.h> |
0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 |
34438
b90e8da190da
cext: reorder #include
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34437
diff
changeset
|
18 #include "bitmanipulation.h" |
33758
0f4ac3b6dee4
cext: factor out header for charencode.c
Yuya Nishihara <yuya@tcha.org>
parents:
33475
diff
changeset
|
19 #include "charencode.h" |
11361
3de3d670d2b6
parsers.c: Added support for py3k.
Renato Cunha <renatoc@gmail.com>
parents:
10449
diff
changeset
|
20 #include "util.h" |
3de3d670d2b6
parsers.c: Added support for py3k.
Renato Cunha <renatoc@gmail.com>
parents:
10449
diff
changeset
|
21 |
30112
9b6ff0f940ed
parsers: move PyInt aliasing out of util.h
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30103
diff
changeset
|
22 #ifdef IS_PY3K |
9b6ff0f940ed
parsers: move PyInt aliasing out of util.h
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30103
diff
changeset
|
23 /* The mapping of Python types is meant to be temporary to get Python |
9b6ff0f940ed
parsers: move PyInt aliasing out of util.h
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30103
diff
changeset
|
24 * 3 to compile. We should remove this once Python 3 support is fully |
9b6ff0f940ed
parsers: move PyInt aliasing out of util.h
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30103
diff
changeset
|
25 * supported and proper types are used in the extensions themselves. */ |
30169
5f7151e6de85
parsers: alias more PyInt* symbols on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30112
diff
changeset
|
26 #define PyInt_Check PyLong_Check |
30112
9b6ff0f940ed
parsers: move PyInt aliasing out of util.h
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30103
diff
changeset
|
27 #define PyInt_FromLong PyLong_FromLong |
30169
5f7151e6de85
parsers: alias more PyInt* symbols on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30112
diff
changeset
|
28 #define PyInt_FromSsize_t PyLong_FromSsize_t |
30112
9b6ff0f940ed
parsers: move PyInt aliasing out of util.h
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30103
diff
changeset
|
29 #define PyInt_AsLong PyLong_AsLong |
9b6ff0f940ed
parsers: move PyInt aliasing out of util.h
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30103
diff
changeset
|
30 #endif |
9b6ff0f940ed
parsers: move PyInt aliasing out of util.h
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30103
diff
changeset
|
31 |
38939
53bc73fae1a3
index: add pointer from nodetree back to index
Martin von Zweigbergk <martinvonz@google.com>
parents:
38938
diff
changeset
|
32 typedef struct indexObjectStruct indexObject; |
53bc73fae1a3
index: add pointer from nodetree back to index
Martin von Zweigbergk <martinvonz@google.com>
parents:
38938
diff
changeset
|
33 |
38912
d1bc0e7c862b
index: extract a type for the nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38911
diff
changeset
|
34 typedef struct { |
d1bc0e7c862b
index: extract a type for the nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38911
diff
changeset
|
35 int children[16]; |
d1bc0e7c862b
index: extract a type for the nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38911
diff
changeset
|
36 } nodetreenode; |
d1bc0e7c862b
index: extract a type for the nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38911
diff
changeset
|
37 |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
38 /* |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
39 * A base-16 trie for fast node->rev mapping. |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
40 * |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
41 * Positive value is index of the next node in the trie |
38846
f738c502e43b
index: store nullrev as -1 in nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38845
diff
changeset
|
42 * Negative value is a leaf: -(rev + 2) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
43 * Zero is empty |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
44 */ |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
45 typedef struct { |
38939
53bc73fae1a3
index: add pointer from nodetree back to index
Martin von Zweigbergk <martinvonz@google.com>
parents:
38938
diff
changeset
|
46 indexObject *index; |
38912
d1bc0e7c862b
index: extract a type for the nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38911
diff
changeset
|
47 nodetreenode *nodes; |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
48 unsigned length; /* # nodes in use */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
49 unsigned capacity; /* # nodes allocated */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
50 int depth; /* maximum depth of tree */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
51 int splits; /* # splits performed */ |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
52 } nodetree; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
53 |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
54 typedef struct { |
40560
8c1f36bf2d3e
revlog: add a comment to help clang-format produce less-awful results
Augie Fackler <augie@google.com>
parents:
40460
diff
changeset
|
55 PyObject_HEAD /* ; */ |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
56 nodetree nt; |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
57 } nodetreeObject; |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
58 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
59 /* |
26098 | 60 * This class has two behaviors. |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
61 * |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
62 * When used in a list-like way (with integer keys), we decode an |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
63 * entry in a RevlogNG index file on demand. Our last entry is a |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
64 * sentinel, always a nullid. We have limited support for |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
65 * integer-keyed insert and delete, only at elements right before the |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
66 * sentinel. |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
67 * |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
68 * With string keys, we lazily perform a reverse mapping from node to |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
69 * rev, using a base-16 trie. |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
70 */ |
38939
53bc73fae1a3
index: add pointer from nodetree back to index
Martin von Zweigbergk <martinvonz@google.com>
parents:
38938
diff
changeset
|
71 struct indexObjectStruct { |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
72 PyObject_HEAD |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
73 /* Type-specific fields go here. */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
74 PyObject *data; /* raw bytes of index */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
75 Py_buffer buf; /* buffer of data */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
76 PyObject **cache; /* cached tuples */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
77 const char **offsets; /* populated on demand */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
78 Py_ssize_t raw_length; /* original number of elements */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
79 Py_ssize_t length; /* current number of elements */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
80 PyObject *added; /* populated on demand */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
81 PyObject *headrevs; /* cache, invalidated on changes */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
82 PyObject *filteredrevs; /* filtered revs set */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
83 nodetree nt; /* base-16 trie */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
84 int ntinitialized; /* 0 or 1 */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
85 int ntrev; /* last rev scanned */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
86 int ntlookups; /* # lookups */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
87 int ntmisses; /* # lookups that miss the cache */ |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
88 int inlined; |
38939
53bc73fae1a3
index: add pointer from nodetree back to index
Martin von Zweigbergk <martinvonz@google.com>
parents:
38938
diff
changeset
|
89 }; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
90 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
91 static Py_ssize_t index_length(const indexObject *self) |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
92 { |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
93 if (self->added == NULL) |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
94 return self->length; |
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
95 return self->length + PyList_GET_SIZE(self->added); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
96 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
97 |
40099
994010b87534
revlog: explicitly initialize static variables
Yuya Nishihara <yuya@tcha.org>
parents:
40088
diff
changeset
|
98 static PyObject *nullentry = NULL; |
994010b87534
revlog: explicitly initialize static variables
Yuya Nishihara <yuya@tcha.org>
parents:
40088
diff
changeset
|
99 static const char nullid[20] = {0}; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
100 |
22401
9ba8a93e55f5
parsers: ensure correct return type for inline_scan
Henrik Stuart <hg@hstuart.dk>
parents:
22400
diff
changeset
|
101 static Py_ssize_t inline_scan(indexObject *self, const char **offsets); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
102 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
103 #if LONG_MAX == 0x7fffffffL |
36621
4015b9248da0
cext: mark tuple_format as a constant
Yuya Nishihara <yuya@tcha.org>
parents:
36620
diff
changeset
|
104 static const char *const tuple_format = PY23("Kiiiiiis#", "Kiiiiiiy#"); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
105 #else |
36621
4015b9248da0
cext: mark tuple_format as a constant
Yuya Nishihara <yuya@tcha.org>
parents:
36620
diff
changeset
|
106 static const char *const tuple_format = PY23("kiiiiiis#", "kiiiiiiy#"); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
107 #endif |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
108 |
16863
bbedef66c6f3
parsers: replace magic number 64 with symbolic constant
Bryan O'Sullivan <bryano@fb.com>
parents:
16787
diff
changeset
|
109 /* A RevlogNG v1 index entry is 64 bytes long. */ |
bbedef66c6f3
parsers: replace magic number 64 with symbolic constant
Bryan O'Sullivan <bryano@fb.com>
parents:
16787
diff
changeset
|
110 static const long v1_hdrsize = 64; |
bbedef66c6f3
parsers: replace magic number 64 with symbolic constant
Bryan O'Sullivan <bryano@fb.com>
parents:
16787
diff
changeset
|
111 |
39219
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
112 static void raise_revlog_error(void) |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
113 { |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
114 PyObject *mod = NULL, *dict = NULL, *errclass = NULL; |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
115 |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
116 mod = PyImport_ImportModule("mercurial.error"); |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
117 if (mod == NULL) { |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
118 goto cleanup; |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
119 } |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
120 |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
121 dict = PyModule_GetDict(mod); |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
122 if (dict == NULL) { |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
123 goto cleanup; |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
124 } |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
125 Py_INCREF(dict); |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
126 |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
127 errclass = PyDict_GetItemString(dict, "RevlogError"); |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
128 if (errclass == NULL) { |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
129 PyErr_SetString(PyExc_SystemError, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
130 "could not find RevlogError"); |
39219
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
131 goto cleanup; |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
132 } |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
133 |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
134 /* value of exception is ignored by callers */ |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
135 PyErr_SetString(errclass, "RevlogError"); |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
136 |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
137 cleanup: |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
138 Py_XDECREF(dict); |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
139 Py_XDECREF(mod); |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
140 } |
f85b25608252
index: move raise_revlog_error() further up
Martin von Zweigbergk <martinvonz@google.com>
parents:
39218
diff
changeset
|
141 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
142 /* |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
143 * Return a pointer to the beginning of a RevlogNG record. |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
144 */ |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
145 static const char *index_deref(indexObject *self, Py_ssize_t pos) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
146 { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
147 if (self->inlined && pos > 0) { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
148 if (self->offsets == NULL) { |
31470
bc445c556d3c
parsers: use Python memory allocator for indexObject->offsets
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31469
diff
changeset
|
149 self->offsets = PyMem_Malloc(self->raw_length * |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
150 sizeof(*self->offsets)); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
151 if (self->offsets == NULL) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
152 return (const char *)PyErr_NoMemory(); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
153 inline_scan(self, self->offsets); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
154 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
155 return self->offsets[pos]; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
156 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
157 |
30577
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
158 return (const char *)(self->buf.buf) + pos * v1_hdrsize; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
159 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
160 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
161 static inline int index_get_parents(indexObject *self, Py_ssize_t rev, int *ps, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
162 int maxrev) |
25311
d2e88f960d1a
parsers: move index_get_parents's declaration higher
Laurent Charignon <lcharignon@fb.com>
parents:
25297
diff
changeset
|
163 { |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
164 if (rev >= self->length) { |
40598
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
165 long tmp; |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
166 PyObject *tuple = |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
167 PyList_GET_ITEM(self->added, rev - self->length); |
40598
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
168 if (!pylong_to_long(PyTuple_GET_ITEM(tuple, 5), &tmp)) { |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
169 return -1; |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
170 } |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
171 ps[0] = (int)tmp; |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
172 if (!pylong_to_long(PyTuple_GET_ITEM(tuple, 6), &tmp)) { |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
173 return -1; |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
174 } |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
175 ps[1] = (int)tmp; |
25311
d2e88f960d1a
parsers: move index_get_parents's declaration higher
Laurent Charignon <lcharignon@fb.com>
parents:
25297
diff
changeset
|
176 } else { |
d2e88f960d1a
parsers: move index_get_parents's declaration higher
Laurent Charignon <lcharignon@fb.com>
parents:
25297
diff
changeset
|
177 const char *data = index_deref(self, rev); |
d2e88f960d1a
parsers: move index_get_parents's declaration higher
Laurent Charignon <lcharignon@fb.com>
parents:
25297
diff
changeset
|
178 ps[0] = getbe32(data + 24); |
d2e88f960d1a
parsers: move index_get_parents's declaration higher
Laurent Charignon <lcharignon@fb.com>
parents:
25297
diff
changeset
|
179 ps[1] = getbe32(data + 28); |
d2e88f960d1a
parsers: move index_get_parents's declaration higher
Laurent Charignon <lcharignon@fb.com>
parents:
25297
diff
changeset
|
180 } |
25810
82d6a35cf432
parsers: fix buffer overflow by invalid parent revision read from revlog
Yuya Nishihara <yuya@tcha.org>
parents:
25584
diff
changeset
|
181 /* If index file is corrupted, ps[] may point to invalid revisions. So |
82d6a35cf432
parsers: fix buffer overflow by invalid parent revision read from revlog
Yuya Nishihara <yuya@tcha.org>
parents:
25584
diff
changeset
|
182 * there is a risk of buffer overflow to trust them unconditionally. */ |
82d6a35cf432
parsers: fix buffer overflow by invalid parent revision read from revlog
Yuya Nishihara <yuya@tcha.org>
parents:
25584
diff
changeset
|
183 if (ps[0] > maxrev || ps[1] > maxrev) { |
82d6a35cf432
parsers: fix buffer overflow by invalid parent revision read from revlog
Yuya Nishihara <yuya@tcha.org>
parents:
25584
diff
changeset
|
184 PyErr_SetString(PyExc_ValueError, "parent out of range"); |
82d6a35cf432
parsers: fix buffer overflow by invalid parent revision read from revlog
Yuya Nishihara <yuya@tcha.org>
parents:
25584
diff
changeset
|
185 return -1; |
82d6a35cf432
parsers: fix buffer overflow by invalid parent revision read from revlog
Yuya Nishihara <yuya@tcha.org>
parents:
25584
diff
changeset
|
186 } |
82d6a35cf432
parsers: fix buffer overflow by invalid parent revision read from revlog
Yuya Nishihara <yuya@tcha.org>
parents:
25584
diff
changeset
|
187 return 0; |
25311
d2e88f960d1a
parsers: move index_get_parents's declaration higher
Laurent Charignon <lcharignon@fb.com>
parents:
25297
diff
changeset
|
188 } |
d2e88f960d1a
parsers: move index_get_parents's declaration higher
Laurent Charignon <lcharignon@fb.com>
parents:
25297
diff
changeset
|
189 |
40703
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
190 static inline int64_t index_get_start(indexObject *self, Py_ssize_t rev) |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
191 { |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
192 uint64_t offset; |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
193 if (rev >= self->length) { |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
194 PyObject *tuple; |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
195 PyObject *pylong; |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
196 PY_LONG_LONG tmp; |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
197 tuple = PyList_GET_ITEM(self->added, rev - self->length); |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
198 pylong = PyTuple_GET_ITEM(tuple, 0); |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
199 tmp = PyLong_AsLongLong(pylong); |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
200 if (tmp == -1 && PyErr_Occurred()) { |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
201 return -1; |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
202 } |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
203 if (tmp < 0) { |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
204 PyErr_Format(PyExc_OverflowError, |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
205 "revlog entry size out of bound (%lld)", |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
206 (long long)tmp); |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
207 return -1; |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
208 } |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
209 offset = (uint64_t)tmp; |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
210 } else { |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
211 const char *data = index_deref(self, rev); |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
212 offset = getbe32(data + 4); |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
213 if (rev == 0) { |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
214 /* mask out version number for the first entry */ |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
215 offset &= 0xFFFF; |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
216 } else { |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
217 uint32_t offset_high = getbe32(data); |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
218 offset |= ((uint64_t)offset_high) << 32; |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
219 } |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
220 } |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
221 return (int64_t)(offset >> 16); |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
222 } |
d5b300ec2e89
sparse-revlog: add a `index_get_start` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40598
diff
changeset
|
223 |
40704
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
224 static inline int index_get_length(indexObject *self, Py_ssize_t rev) |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
225 { |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
226 if (rev >= self->length) { |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
227 PyObject *tuple; |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
228 PyObject *pylong; |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
229 long ret; |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
230 tuple = PyList_GET_ITEM(self->added, rev - self->length); |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
231 pylong = PyTuple_GET_ITEM(tuple, 1); |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
232 ret = PyInt_AsLong(pylong); |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
233 if (ret == -1 && PyErr_Occurred()) { |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
234 return -1; |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
235 } |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
236 if (ret < 0 || ret > (long)INT_MAX) { |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
237 PyErr_Format(PyExc_OverflowError, |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
238 "revlog entry size out of bound (%ld)", |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
239 ret); |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
240 return -1; |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
241 } |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
242 return (int)ret; |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
243 } else { |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
244 const char *data = index_deref(self, rev); |
40741
959130631de3
revlog: properly detect corrupted revlog in `index_get_length`
Boris Feld <boris.feld@octobus.net>
parents:
40707
diff
changeset
|
245 int tmp = (int)getbe32(data + 8); |
959130631de3
revlog: properly detect corrupted revlog in `index_get_length`
Boris Feld <boris.feld@octobus.net>
parents:
40707
diff
changeset
|
246 if (tmp < 0) { |
959130631de3
revlog: properly detect corrupted revlog in `index_get_length`
Boris Feld <boris.feld@octobus.net>
parents:
40707
diff
changeset
|
247 PyErr_Format(PyExc_OverflowError, |
959130631de3
revlog: properly detect corrupted revlog in `index_get_length`
Boris Feld <boris.feld@octobus.net>
parents:
40707
diff
changeset
|
248 "revlog entry size out of bound (%d)", |
959130631de3
revlog: properly detect corrupted revlog in `index_get_length`
Boris Feld <boris.feld@octobus.net>
parents:
40707
diff
changeset
|
249 tmp); |
959130631de3
revlog: properly detect corrupted revlog in `index_get_length`
Boris Feld <boris.feld@octobus.net>
parents:
40707
diff
changeset
|
250 return -1; |
959130631de3
revlog: properly detect corrupted revlog in `index_get_length`
Boris Feld <boris.feld@octobus.net>
parents:
40707
diff
changeset
|
251 } |
959130631de3
revlog: properly detect corrupted revlog in `index_get_length`
Boris Feld <boris.feld@octobus.net>
parents:
40707
diff
changeset
|
252 return tmp; |
40704
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
253 } |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
254 } |
7da3729d4b45
sparse-revlog: add a `index_get_length` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40703
diff
changeset
|
255 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
256 /* |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
257 * RevlogNG format (all in big endian, data may be inlined): |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
258 * 6 bytes: offset |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
259 * 2 bytes: flags |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
260 * 4 bytes: compressed length |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
261 * 4 bytes: uncompressed length |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
262 * 4 bytes: base revision |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
263 * 4 bytes: link revision |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
264 * 4 bytes: parent 1 revision |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
265 * 4 bytes: parent 2 revision |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
266 * 32 bytes: nodeid (only 20 bytes used) |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
267 */ |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
268 static PyObject *index_get(indexObject *self, Py_ssize_t pos) |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
269 { |
7154
7fdf7a0a41b7
index parser: fix refcounting in case of errors, refactor
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7135
diff
changeset
|
270 uint64_t offset_flags; |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
271 int comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2; |
7154
7fdf7a0a41b7
index parser: fix refcounting in case of errors, refactor
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7135
diff
changeset
|
272 const char *c_node_id; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
273 const char *data; |
38868
0db50770f388
index: don't add 1 to length variables
Martin von Zweigbergk <martinvonz@google.com>
parents:
38867
diff
changeset
|
274 Py_ssize_t length = index_length(self); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
275 PyObject *entry; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
276 |
38852
a3dacabd476b
index: don't allow index[len(index)] to mean nullid
Martin von Zweigbergk <martinvonz@google.com>
parents:
38851
diff
changeset
|
277 if (pos == -1) { |
38847
f3d394ea17db
index: handle index[-1] as nullid more explicitly
Martin von Zweigbergk <martinvonz@google.com>
parents:
38846
diff
changeset
|
278 Py_INCREF(nullentry); |
f3d394ea17db
index: handle index[-1] as nullid more explicitly
Martin von Zweigbergk <martinvonz@google.com>
parents:
38846
diff
changeset
|
279 return nullentry; |
f3d394ea17db
index: handle index[-1] as nullid more explicitly
Martin von Zweigbergk <martinvonz@google.com>
parents:
38846
diff
changeset
|
280 } |
f3d394ea17db
index: handle index[-1] as nullid more explicitly
Martin von Zweigbergk <martinvonz@google.com>
parents:
38846
diff
changeset
|
281 |
38868
0db50770f388
index: don't add 1 to length variables
Martin von Zweigbergk <martinvonz@google.com>
parents:
38867
diff
changeset
|
282 if (pos < 0 || pos >= length) { |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
283 PyErr_SetString(PyExc_IndexError, "revlog index out of range"); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
284 return NULL; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
285 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
286 |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
287 if (pos >= self->length) { |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
288 PyObject *obj; |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
289 obj = PyList_GET_ITEM(self->added, pos - self->length); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
290 Py_INCREF(obj); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
291 return obj; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
292 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
293 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
294 if (self->cache) { |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
295 if (self->cache[pos]) { |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
296 Py_INCREF(self->cache[pos]); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
297 return self->cache[pos]; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
298 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
299 } else { |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
300 self->cache = calloc(self->raw_length, sizeof(PyObject *)); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
301 if (self->cache == NULL) |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
302 return PyErr_NoMemory(); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
303 } |
7190
aecea6934fdd
Some additional space/tab cleanups
Thomas Arendsen Hein <thomas@intevation.de>
parents:
7186
diff
changeset
|
304 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
305 data = index_deref(self, pos); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
306 if (data == NULL) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
307 return NULL; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
308 |
16437
d126a0d16856
util.h: replace ntohl/htonl with get/putbe32
Matt Mackall <mpm@selenic.com>
parents:
16414
diff
changeset
|
309 offset_flags = getbe32(data + 4); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
310 if (pos == 0) /* mask out version number for the first entry */ |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
311 offset_flags &= 0xFFFF; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
312 else { |
16437
d126a0d16856
util.h: replace ntohl/htonl with get/putbe32
Matt Mackall <mpm@selenic.com>
parents:
16414
diff
changeset
|
313 uint32_t offset_high = getbe32(data); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
314 offset_flags |= ((uint64_t)offset_high) << 32; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
315 } |
7154
7fdf7a0a41b7
index parser: fix refcounting in case of errors, refactor
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7135
diff
changeset
|
316 |
16437
d126a0d16856
util.h: replace ntohl/htonl with get/putbe32
Matt Mackall <mpm@selenic.com>
parents:
16414
diff
changeset
|
317 comp_len = getbe32(data + 8); |
d126a0d16856
util.h: replace ntohl/htonl with get/putbe32
Matt Mackall <mpm@selenic.com>
parents:
16414
diff
changeset
|
318 uncomp_len = getbe32(data + 12); |
d126a0d16856
util.h: replace ntohl/htonl with get/putbe32
Matt Mackall <mpm@selenic.com>
parents:
16414
diff
changeset
|
319 base_rev = getbe32(data + 16); |
d126a0d16856
util.h: replace ntohl/htonl with get/putbe32
Matt Mackall <mpm@selenic.com>
parents:
16414
diff
changeset
|
320 link_rev = getbe32(data + 20); |
d126a0d16856
util.h: replace ntohl/htonl with get/putbe32
Matt Mackall <mpm@selenic.com>
parents:
16414
diff
changeset
|
321 parent_1 = getbe32(data + 24); |
d126a0d16856
util.h: replace ntohl/htonl with get/putbe32
Matt Mackall <mpm@selenic.com>
parents:
16414
diff
changeset
|
322 parent_2 = getbe32(data + 28); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
323 c_node_id = data + 32; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
324 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
325 entry = Py_BuildValue(tuple_format, offset_flags, comp_len, uncomp_len, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
326 base_rev, link_rev, parent_1, parent_2, c_node_id, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
327 20); |
13254
5ef5eb1f3515
revlog: only build the nodemap on demand
Matt Mackall <mpm@selenic.com>
parents:
11361
diff
changeset
|
328 |
19726
b3c8c6f2b5c1
parsers: use Py_INCREF safely
Bryan O'Sullivan <bryano@fb.com>
parents:
19725
diff
changeset
|
329 if (entry) { |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
330 PyObject_GC_UnTrack(entry); |
19726
b3c8c6f2b5c1
parsers: use Py_INCREF safely
Bryan O'Sullivan <bryano@fb.com>
parents:
19725
diff
changeset
|
331 Py_INCREF(entry); |
b3c8c6f2b5c1
parsers: use Py_INCREF safely
Bryan O'Sullivan <bryano@fb.com>
parents:
19725
diff
changeset
|
332 } |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
333 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
334 self->cache[pos] = entry; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
335 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
336 return entry; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
337 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
338 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
339 /* |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
340 * Return the 20-byte SHA of the node corresponding to the given rev. |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
341 */ |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
342 static const char *index_node(indexObject *self, Py_ssize_t pos) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
343 { |
38868
0db50770f388
index: don't add 1 to length variables
Martin von Zweigbergk <martinvonz@google.com>
parents:
38867
diff
changeset
|
344 Py_ssize_t length = index_length(self); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
345 const char *data; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
346 |
38867
4c0fd3f0a15d
index: drop support for nullid at position len(index) in index_node
Martin von Zweigbergk <martinvonz@google.com>
parents:
38866
diff
changeset
|
347 if (pos == -1) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
348 return nullid; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
349 |
38868
0db50770f388
index: don't add 1 to length variables
Martin von Zweigbergk <martinvonz@google.com>
parents:
38867
diff
changeset
|
350 if (pos >= length) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
351 return NULL; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
352 |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
353 if (pos >= self->length) { |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
354 PyObject *tuple, *str; |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
355 tuple = PyList_GET_ITEM(self->added, pos - self->length); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
356 str = PyTuple_GetItem(tuple, 7); |
30100
c5afe5531709
parsers: convert PyString* to PyBytes*
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30090
diff
changeset
|
357 return str ? PyBytes_AS_STRING(str) : NULL; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
358 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
359 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
360 data = index_deref(self, pos); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
361 return data ? data + 32 : NULL; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
362 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
363 |
37860
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
364 /* |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
365 * Return the 20-byte SHA of the node corresponding to the given rev. The |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
366 * rev is assumed to be existing. If not, an exception is set. |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
367 */ |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
368 static const char *index_node_existing(indexObject *self, Py_ssize_t pos) |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
369 { |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
370 const char *node = index_node(self, pos); |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
371 if (node == NULL) { |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
372 PyErr_Format(PyExc_IndexError, "could not access rev %d", |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
373 (int)pos); |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
374 } |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
375 return node; |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
376 } |
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
377 |
38940
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
378 static int nt_insert(nodetree *self, const char *node, int rev); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
379 |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
380 static int node_check(PyObject *obj, char **node) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
381 { |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
382 Py_ssize_t nodelen; |
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
383 if (PyBytes_AsStringAndSize(obj, node, &nodelen) == -1) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
384 return -1; |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
385 if (nodelen == 20) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
386 return 0; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
387 PyErr_SetString(PyExc_ValueError, "20-byte hash required"); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
388 return -1; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
389 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
390 |
38850
6104b203bec8
index: replace insert(-1, e) method by append(e) method
Martin von Zweigbergk <martinvonz@google.com>
parents:
38848
diff
changeset
|
391 static PyObject *index_append(indexObject *self, PyObject *obj) |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
392 { |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
393 char *node; |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
394 Py_ssize_t len; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
395 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
396 if (!PyTuple_Check(obj) || PyTuple_GET_SIZE(obj) != 8) { |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
397 PyErr_SetString(PyExc_TypeError, "8-tuple required"); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
398 return NULL; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
399 } |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
400 |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
401 if (node_check(PyTuple_GET_ITEM(obj, 7), &node) == -1) |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
402 return NULL; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
403 |
38868
0db50770f388
index: don't add 1 to length variables
Martin von Zweigbergk <martinvonz@google.com>
parents:
38867
diff
changeset
|
404 len = index_length(self); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
405 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
406 if (self->added == NULL) { |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
407 self->added = PyList_New(0); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
408 if (self->added == NULL) |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
409 return NULL; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
410 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
411 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
412 if (PyList_Append(self->added, obj) == -1) |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
413 return NULL; |
13254
5ef5eb1f3515
revlog: only build the nodemap on demand
Matt Mackall <mpm@selenic.com>
parents:
11361
diff
changeset
|
414 |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
415 if (self->ntinitialized) |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
416 nt_insert(&self->nt, node, (int)len); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
417 |
16787
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
418 Py_CLEAR(self->headrevs); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
419 Py_RETURN_NONE; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
420 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
421 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
422 static PyObject *index_stats(indexObject *self) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
423 { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
424 PyObject *obj = PyDict_New(); |
40455
88702fd208ce
py3: convert revlog stats to a dict of (bytes, int) pairs
Yuya Nishihara <yuya@tcha.org>
parents:
40300
diff
changeset
|
425 PyObject *s = NULL; |
23948
bd307b462ce2
parsers: avoid leaking several PyObjects in index_stats
Augie Fackler <augie@google.com>
parents:
23947
diff
changeset
|
426 PyObject *t = NULL; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
427 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
428 if (obj == NULL) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
429 return NULL; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
430 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
431 #define istat(__n, __d) \ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
432 do { \ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
433 s = PyBytes_FromString(__d); \ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
434 t = PyInt_FromSsize_t(self->__n); \ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
435 if (!s || !t) \ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
436 goto bail; \ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
437 if (PyDict_SetItem(obj, s, t) == -1) \ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
438 goto bail; \ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
439 Py_CLEAR(s); \ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
440 Py_CLEAR(t); \ |
28792
507136150d2b
parsers: fix istat macro to work with single line if statement
Matt Fowles <matt.fowles@gmail.com>
parents:
28386
diff
changeset
|
441 } while (0) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
442 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
443 if (self->added) { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
444 Py_ssize_t len = PyList_GET_SIZE(self->added); |
40455
88702fd208ce
py3: convert revlog stats to a dict of (bytes, int) pairs
Yuya Nishihara <yuya@tcha.org>
parents:
40300
diff
changeset
|
445 s = PyBytes_FromString("index entries added"); |
23948
bd307b462ce2
parsers: avoid leaking several PyObjects in index_stats
Augie Fackler <augie@google.com>
parents:
23947
diff
changeset
|
446 t = PyInt_FromSsize_t(len); |
40455
88702fd208ce
py3: convert revlog stats to a dict of (bytes, int) pairs
Yuya Nishihara <yuya@tcha.org>
parents:
40300
diff
changeset
|
447 if (!s || !t) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
448 goto bail; |
40455
88702fd208ce
py3: convert revlog stats to a dict of (bytes, int) pairs
Yuya Nishihara <yuya@tcha.org>
parents:
40300
diff
changeset
|
449 if (PyDict_SetItem(obj, s, t) == -1) |
23948
bd307b462ce2
parsers: avoid leaking several PyObjects in index_stats
Augie Fackler <augie@google.com>
parents:
23947
diff
changeset
|
450 goto bail; |
40455
88702fd208ce
py3: convert revlog stats to a dict of (bytes, int) pairs
Yuya Nishihara <yuya@tcha.org>
parents:
40300
diff
changeset
|
451 Py_CLEAR(s); |
88702fd208ce
py3: convert revlog stats to a dict of (bytes, int) pairs
Yuya Nishihara <yuya@tcha.org>
parents:
40300
diff
changeset
|
452 Py_CLEAR(t); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
453 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
454 |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
455 if (self->raw_length != self->length) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
456 istat(raw_length, "revs on disk"); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
457 istat(length, "revs in memory"); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
458 istat(ntlookups, "node trie lookups"); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
459 istat(ntmisses, "node trie misses"); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
460 istat(ntrev, "node trie last rev scanned"); |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
461 if (self->ntinitialized) { |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
462 istat(nt.capacity, "node trie capacity"); |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
463 istat(nt.depth, "node trie depth"); |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
464 istat(nt.length, "node trie count"); |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
465 istat(nt.splits, "node trie splits"); |
38913
c2c253558e3c
index: move more fields onto nodetree type
Martin von Zweigbergk <martinvonz@google.com>
parents:
38912
diff
changeset
|
466 } |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
467 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
468 #undef istat |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
469 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
470 return obj; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
471 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
472 bail: |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
473 Py_XDECREF(obj); |
40455
88702fd208ce
py3: convert revlog stats to a dict of (bytes, int) pairs
Yuya Nishihara <yuya@tcha.org>
parents:
40300
diff
changeset
|
474 Py_XDECREF(s); |
23948
bd307b462ce2
parsers: avoid leaking several PyObjects in index_stats
Augie Fackler <augie@google.com>
parents:
23947
diff
changeset
|
475 Py_XDECREF(t); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
476 return NULL; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
477 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
478 |
16787
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
479 /* |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
480 * When we cache a list, we want to be sure the caller can't mutate |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
481 * the cached copy. |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
482 */ |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
483 static PyObject *list_copy(PyObject *list) |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
484 { |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
485 Py_ssize_t len = PyList_GET_SIZE(list); |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
486 PyObject *newlist = PyList_New(len); |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
487 Py_ssize_t i; |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
488 |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
489 if (newlist == NULL) |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
490 return NULL; |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
491 |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
492 for (i = 0; i < len; i++) { |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
493 PyObject *obj = PyList_GET_ITEM(list, i); |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
494 Py_INCREF(obj); |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
495 PyList_SET_ITEM(newlist, i, obj); |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
496 } |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
497 |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
498 return newlist; |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
499 } |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
500 |
34440
7ed0750c71a1
cext: wrap before brace for functions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34438
diff
changeset
|
501 static int check_filter(PyObject *filter, Py_ssize_t arg) |
7ed0750c71a1
cext: wrap before brace for functions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34438
diff
changeset
|
502 { |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
503 if (filter) { |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
504 PyObject *arglist, *result; |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
505 int isfiltered; |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
506 |
26107
50582df9d7a7
parsers: fix two cases of unsigned long instead of Py_ssize_t
Augie Fackler <augie@google.com>
parents:
26098
diff
changeset
|
507 arglist = Py_BuildValue("(n)", arg); |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
508 if (!arglist) { |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
509 return -1; |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
510 } |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
511 |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
512 result = PyEval_CallObject(filter, arglist); |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
513 Py_DECREF(arglist); |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
514 if (!result) { |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
515 return -1; |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
516 } |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
517 |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
518 /* PyObject_IsTrue returns 1 if true, 0 if false, -1 if error, |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
519 * same as this function, so we can just return it directly.*/ |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
520 isfiltered = PyObject_IsTrue(result); |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
521 Py_DECREF(result); |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
522 return isfiltered; |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
523 } else { |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
524 return 0; |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
525 } |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
526 } |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
527 |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
528 static Py_ssize_t add_roots_get_min(indexObject *self, PyObject *list, |
24499
90db70de6f9c
parsers.c: avoid implicit conversion loses integer warnings
André Sintzoff <andre.sintzoff@gmail.com>
parents:
24443
diff
changeset
|
529 Py_ssize_t marker, char *phases) |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
530 { |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
531 PyObject *iter = NULL; |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
532 PyObject *iter_item = NULL; |
38851
781b2720d2ac
index: don't include nullid in len()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38850
diff
changeset
|
533 Py_ssize_t min_idx = index_length(self) + 2; |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
534 long iter_item_long; |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
535 |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
536 if (PyList_GET_SIZE(list) != 0) { |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
537 iter = PyObject_GetIter(list); |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
538 if (iter == NULL) |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
539 return -2; |
34437
ce26a13869fb
cext: move braces for control statements to same line
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33758
diff
changeset
|
540 while ((iter_item = PyIter_Next(iter))) { |
40598
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
541 if (!pylong_to_long(iter_item, &iter_item_long)) { |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
542 Py_DECREF(iter_item); |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
543 return -2; |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
544 } |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
545 Py_DECREF(iter_item); |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
546 if (iter_item_long < min_idx) |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
547 min_idx = iter_item_long; |
39228
66f046116105
cext: fix truncation warnings in revlog on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39227
diff
changeset
|
548 phases[iter_item_long] = (char)marker; |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
549 } |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
550 Py_DECREF(iter); |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
551 } |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
552 |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
553 return min_idx; |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
554 } |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
555 |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
556 static inline void set_phase_from_parents(char *phases, int parent_1, |
24499
90db70de6f9c
parsers.c: avoid implicit conversion loses integer warnings
André Sintzoff <andre.sintzoff@gmail.com>
parents:
24443
diff
changeset
|
557 int parent_2, Py_ssize_t i) |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
558 { |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
559 if (parent_1 >= 0 && phases[parent_1] > phases[i]) |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
560 phases[i] = phases[parent_1]; |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
561 if (parent_2 >= 0 && phases[parent_2] > phases[i]) |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
562 phases[i] = phases[parent_2]; |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
563 } |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
564 |
26053
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
565 static PyObject *reachableroots2(indexObject *self, PyObject *args) |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
566 { |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
567 |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
568 /* Input */ |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
569 long minroot; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
570 PyObject *includepatharg = NULL; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
571 int includepath = 0; |
26053
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
572 /* heads and roots are lists */ |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
573 PyObject *heads = NULL; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
574 PyObject *roots = NULL; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
575 PyObject *reachable = NULL; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
576 |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
577 PyObject *val; |
38851
781b2720d2ac
index: don't include nullid in len()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38850
diff
changeset
|
578 Py_ssize_t len = index_length(self); |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
579 long revnum; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
580 Py_ssize_t k; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
581 Py_ssize_t i; |
26042
2a3010ba6f52
reachableroots: give anonymous name to short-lived "numheads" variable
Yuya Nishihara <yuya@tcha.org>
parents:
26041
diff
changeset
|
582 Py_ssize_t l; |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
583 int r; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
584 int parents[2]; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
585 |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
586 /* Internal data structure: |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
587 * tovisit: array of length len+1 (all revs + nullrev), filled upto |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
588 * lentovisit |
40561
5c14bf0c5be3
revlog: add blank line in comment to help clang-format
Augie Fackler <augie@google.com>
parents:
40560
diff
changeset
|
589 * |
26044
b3ad349d0e50
reachableroots: extend "revstates" to array of bit flags
Yuya Nishihara <yuya@tcha.org>
parents:
26043
diff
changeset
|
590 * revstates: array of length len+1 (all revs + nullrev) */ |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
591 int *tovisit = NULL; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
592 long lentovisit = 0; |
26054
5049e10fed14
reachableroots: use internal "revstates" array to test if rev is reachable
Yuya Nishihara <yuya@tcha.org>
parents:
26053
diff
changeset
|
593 enum { RS_SEEN = 1, RS_ROOT = 2, RS_REACHABLE = 4 }; |
26043
f2f0a3ab6e41
reachableroots: rename "seen" array to "revstates" for future extension
Yuya Nishihara <yuya@tcha.org>
parents:
26042
diff
changeset
|
594 char *revstates = NULL; |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
595 |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
596 /* Get arguments */ |
26009
bbb698697efc
reachableroots: fix transposition of set and list types in PyArg_ParseTuple
Augie Fackler <augie@google.com>
parents:
26008
diff
changeset
|
597 if (!PyArg_ParseTuple(args, "lO!O!O!", &minroot, &PyList_Type, &heads, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
598 &PyList_Type, &roots, &PyBool_Type, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
599 &includepatharg)) |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
600 goto bail; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
601 |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
602 if (includepatharg == Py_True) |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
603 includepath = 1; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
604 |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
605 /* Initialize return set */ |
26055
607868eccaa7
reachableroots: return list of revisions instead of set
Yuya Nishihara <yuya@tcha.org>
parents:
26054
diff
changeset
|
606 reachable = PyList_New(0); |
607868eccaa7
reachableroots: return list of revisions instead of set
Yuya Nishihara <yuya@tcha.org>
parents:
26054
diff
changeset
|
607 if (reachable == NULL) |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
608 goto bail; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
609 |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
610 /* Initialize internal datastructures */ |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
611 tovisit = (int *)malloc((len + 1) * sizeof(int)); |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
612 if (tovisit == NULL) { |
26008
59d57ea69ae6
reachableroots: consistently use short-form of PyErr_NoMemory()
Augie Fackler <augie@google.com>
parents:
26007
diff
changeset
|
613 PyErr_NoMemory(); |
26016
c8d41c9c23c7
reachableroots: unify bail cases to raise exception correctly
Yuya Nishihara <yuya@tcha.org>
parents:
26015
diff
changeset
|
614 goto bail; |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
615 } |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
616 |
26043
f2f0a3ab6e41
reachableroots: rename "seen" array to "revstates" for future extension
Yuya Nishihara <yuya@tcha.org>
parents:
26042
diff
changeset
|
617 revstates = (char *)calloc(len + 1, 1); |
f2f0a3ab6e41
reachableroots: rename "seen" array to "revstates" for future extension
Yuya Nishihara <yuya@tcha.org>
parents:
26042
diff
changeset
|
618 if (revstates == NULL) { |
26008
59d57ea69ae6
reachableroots: consistently use short-form of PyErr_NoMemory()
Augie Fackler <augie@google.com>
parents:
26007
diff
changeset
|
619 PyErr_NoMemory(); |
26016
c8d41c9c23c7
reachableroots: unify bail cases to raise exception correctly
Yuya Nishihara <yuya@tcha.org>
parents:
26015
diff
changeset
|
620 goto bail; |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
621 } |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
622 |
26053
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
623 l = PyList_GET_SIZE(roots); |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
624 for (i = 0; i < l; i++) { |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
625 revnum = PyInt_AsLong(PyList_GET_ITEM(roots, i)); |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
626 if (revnum == -1 && PyErr_Occurred()) |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
627 goto bail; |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
628 /* If root is out of range, e.g. wdir(), it must be unreachable |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
629 * from heads. So we can just ignore it. */ |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
630 if (revnum + 1 < 0 || revnum + 1 >= len + 1) |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
631 continue; |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
632 revstates[revnum + 1] |= RS_ROOT; |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
633 } |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
634 |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
635 /* Populate tovisit with all the heads */ |
26042
2a3010ba6f52
reachableroots: give anonymous name to short-lived "numheads" variable
Yuya Nishihara <yuya@tcha.org>
parents:
26041
diff
changeset
|
636 l = PyList_GET_SIZE(heads); |
2a3010ba6f52
reachableroots: give anonymous name to short-lived "numheads" variable
Yuya Nishihara <yuya@tcha.org>
parents:
26041
diff
changeset
|
637 for (i = 0; i < l; i++) { |
26018
c6115c30a376
reachableroots: verify type of each item of heads argument
Yuya Nishihara <yuya@tcha.org>
parents:
26017
diff
changeset
|
638 revnum = PyInt_AsLong(PyList_GET_ITEM(heads, i)); |
c6115c30a376
reachableroots: verify type of each item of heads argument
Yuya Nishihara <yuya@tcha.org>
parents:
26017
diff
changeset
|
639 if (revnum == -1 && PyErr_Occurred()) |
c6115c30a376
reachableroots: verify type of each item of heads argument
Yuya Nishihara <yuya@tcha.org>
parents:
26017
diff
changeset
|
640 goto bail; |
26017
44705659da94
reachableroots: verify integer range of heads argument (issue4775)
Yuya Nishihara <yuya@tcha.org>
parents:
26016
diff
changeset
|
641 if (revnum + 1 < 0 || revnum + 1 >= len + 1) { |
44705659da94
reachableroots: verify integer range of heads argument (issue4775)
Yuya Nishihara <yuya@tcha.org>
parents:
26016
diff
changeset
|
642 PyErr_SetString(PyExc_IndexError, "head out of range"); |
44705659da94
reachableroots: verify integer range of heads argument (issue4775)
Yuya Nishihara <yuya@tcha.org>
parents:
26016
diff
changeset
|
643 goto bail; |
44705659da94
reachableroots: verify integer range of heads argument (issue4775)
Yuya Nishihara <yuya@tcha.org>
parents:
26016
diff
changeset
|
644 } |
26044
b3ad349d0e50
reachableroots: extend "revstates" to array of bit flags
Yuya Nishihara <yuya@tcha.org>
parents:
26043
diff
changeset
|
645 if (!(revstates[revnum + 1] & RS_SEEN)) { |
26080
83c9edcac05c
reachableroots: silence warning of implicit integer narrowing issued by clang
Yuya Nishihara <yuya@tcha.org>
parents:
26079
diff
changeset
|
646 tovisit[lentovisit++] = (int)revnum; |
26044
b3ad349d0e50
reachableroots: extend "revstates" to array of bit flags
Yuya Nishihara <yuya@tcha.org>
parents:
26043
diff
changeset
|
647 revstates[revnum + 1] |= RS_SEEN; |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
648 } |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
649 } |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
650 |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
651 /* Visit the tovisit list and find the reachable roots */ |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
652 k = 0; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
653 while (k < lentovisit) { |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
654 /* Add the node to reachable if it is a root*/ |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
655 revnum = tovisit[k++]; |
26053
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
656 if (revstates[revnum + 1] & RS_ROOT) { |
26054
5049e10fed14
reachableroots: use internal "revstates" array to test if rev is reachable
Yuya Nishihara <yuya@tcha.org>
parents:
26053
diff
changeset
|
657 revstates[revnum + 1] |= RS_REACHABLE; |
26053
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
658 val = PyInt_FromLong(revnum); |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
659 if (val == NULL) |
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
660 goto bail; |
26058
e7fe0a12376c
reachableroots: handle error of PyList_Append()
Yuya Nishihara <yuya@tcha.org>
parents:
26055
diff
changeset
|
661 r = PyList_Append(reachable, val); |
26053
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
662 Py_DECREF(val); |
26058
e7fe0a12376c
reachableroots: handle error of PyList_Append()
Yuya Nishihara <yuya@tcha.org>
parents:
26055
diff
changeset
|
663 if (r < 0) |
e7fe0a12376c
reachableroots: handle error of PyList_Append()
Yuya Nishihara <yuya@tcha.org>
parents:
26055
diff
changeset
|
664 goto bail; |
26053
b68c9d232db6
reachableroots: use internal "revstates" array to test if rev is a root
Yuya Nishihara <yuya@tcha.org>
parents:
26052
diff
changeset
|
665 if (includepath == 0) |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
666 continue; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
667 } |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
668 |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
669 /* Add its parents to the list of nodes to visit */ |
26041
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
670 if (revnum == -1) |
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
671 continue; |
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
672 r = index_get_parents(self, revnum, parents, (int)len - 1); |
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
673 if (r < 0) |
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
674 goto bail; |
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
675 for (i = 0; i < 2; i++) { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
676 if (!(revstates[parents[i] + 1] & RS_SEEN) && |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
677 parents[i] >= minroot) { |
26041
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
678 tovisit[lentovisit++] = parents[i]; |
26044
b3ad349d0e50
reachableroots: extend "revstates" to array of bit flags
Yuya Nishihara <yuya@tcha.org>
parents:
26043
diff
changeset
|
679 revstates[parents[i] + 1] |= RS_SEEN; |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
680 } |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
681 } |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
682 } |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
683 |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
684 /* Find all the nodes in between the roots we found and the heads |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
685 * and add them to the reachable set */ |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
686 if (includepath == 1) { |
26080
83c9edcac05c
reachableroots: silence warning of implicit integer narrowing issued by clang
Yuya Nishihara <yuya@tcha.org>
parents:
26079
diff
changeset
|
687 long minidx = minroot; |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
688 if (minidx < 0) |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
689 minidx = 0; |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
690 for (i = minidx; i < len; i++) { |
26044
b3ad349d0e50
reachableroots: extend "revstates" to array of bit flags
Yuya Nishihara <yuya@tcha.org>
parents:
26043
diff
changeset
|
691 if (!(revstates[i + 1] & RS_SEEN)) |
26041
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
692 continue; |
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
693 r = index_get_parents(self, i, parents, (int)len - 1); |
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
694 /* Corrupted index file, error is set from |
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
695 * index_get_parents */ |
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
696 if (r < 0) |
8da628be211b
reachableroots: reduce nesting level by jumping to next iteration by continue
Yuya Nishihara <yuya@tcha.org>
parents:
26033
diff
changeset
|
697 goto bail; |
26059
8779ce81ea80
reachableroots: unroll loop that checks if one of parents is reachable
Yuya Nishihara <yuya@tcha.org>
parents:
26058
diff
changeset
|
698 if (((revstates[parents[0] + 1] | |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
699 revstates[parents[1] + 1]) & |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
700 RS_REACHABLE) && |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
701 !(revstates[i + 1] & RS_REACHABLE)) { |
26059
8779ce81ea80
reachableroots: unroll loop that checks if one of parents is reachable
Yuya Nishihara <yuya@tcha.org>
parents:
26058
diff
changeset
|
702 revstates[i + 1] |= RS_REACHABLE; |
39074
acd23830bcd6
cext: fix most truncation warnings in revlog on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39073
diff
changeset
|
703 val = PyInt_FromSsize_t(i); |
26059
8779ce81ea80
reachableroots: unroll loop that checks if one of parents is reachable
Yuya Nishihara <yuya@tcha.org>
parents:
26058
diff
changeset
|
704 if (val == NULL) |
8779ce81ea80
reachableroots: unroll loop that checks if one of parents is reachable
Yuya Nishihara <yuya@tcha.org>
parents:
26058
diff
changeset
|
705 goto bail; |
8779ce81ea80
reachableroots: unroll loop that checks if one of parents is reachable
Yuya Nishihara <yuya@tcha.org>
parents:
26058
diff
changeset
|
706 r = PyList_Append(reachable, val); |
8779ce81ea80
reachableroots: unroll loop that checks if one of parents is reachable
Yuya Nishihara <yuya@tcha.org>
parents:
26058
diff
changeset
|
707 Py_DECREF(val); |
8779ce81ea80
reachableroots: unroll loop that checks if one of parents is reachable
Yuya Nishihara <yuya@tcha.org>
parents:
26058
diff
changeset
|
708 if (r < 0) |
8779ce81ea80
reachableroots: unroll loop that checks if one of parents is reachable
Yuya Nishihara <yuya@tcha.org>
parents:
26058
diff
changeset
|
709 goto bail; |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
710 } |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
711 } |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
712 } |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
713 |
26043
f2f0a3ab6e41
reachableroots: rename "seen" array to "revstates" for future extension
Yuya Nishihara <yuya@tcha.org>
parents:
26042
diff
changeset
|
714 free(revstates); |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
715 free(tovisit); |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
716 return reachable; |
26016
c8d41c9c23c7
reachableroots: unify bail cases to raise exception correctly
Yuya Nishihara <yuya@tcha.org>
parents:
26015
diff
changeset
|
717 bail: |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
718 Py_XDECREF(reachable); |
26043
f2f0a3ab6e41
reachableroots: rename "seen" array to "revstates" for future extension
Yuya Nishihara <yuya@tcha.org>
parents:
26042
diff
changeset
|
719 free(revstates); |
26016
c8d41c9c23c7
reachableroots: unify bail cases to raise exception correctly
Yuya Nishihara <yuya@tcha.org>
parents:
26015
diff
changeset
|
720 free(tovisit); |
26010
2c03e521a0c5
reachableroots: return NULL if we're throwing an exception
Augie Fackler <augie@google.com>
parents:
26009
diff
changeset
|
721 return NULL; |
26004
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
722 } |
ff89383a97db
reachableroots: add a C implementation
Laurent Charignon <lcharignon@fb.com>
parents:
25911
diff
changeset
|
723 |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
724 static PyObject *compute_phases_map_sets(indexObject *self, PyObject *args) |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
725 { |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
726 PyObject *roots = Py_None; |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
727 PyObject *ret = NULL; |
35309
d13526333835
phases: drop the list with phase of each rev, always comput phase sets
Joerg Sonnenberger <joerg@bec.de>
parents:
34861
diff
changeset
|
728 PyObject *phasessize = NULL; |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
729 PyObject *phaseroots = NULL; |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
730 PyObject *phaseset = NULL; |
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
731 PyObject *phasessetlist = NULL; |
25911
f4386cb3252e
parsers: fix memory leak in compute_phases_map_sets
Laurent Charignon <lcharignon@fb.com>
parents:
25860
diff
changeset
|
732 PyObject *rev = NULL; |
38851
781b2720d2ac
index: don't include nullid in len()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38850
diff
changeset
|
733 Py_ssize_t len = index_length(self); |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
734 Py_ssize_t numphase = 0; |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
735 Py_ssize_t minrevallphases = 0; |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
736 Py_ssize_t minrevphase = 0; |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
737 Py_ssize_t i = 0; |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
738 char *phases = NULL; |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
739 long phase; |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
740 |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
741 if (!PyArg_ParseTuple(args, "O", &roots)) |
27364
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
742 goto done; |
36623
a472a897c340
cext: fix computephasesmapsets() not to return without setting an exception
Yuya Nishihara <yuya@tcha.org>
parents:
36621
diff
changeset
|
743 if (roots == NULL || !PyList_Check(roots)) { |
a472a897c340
cext: fix computephasesmapsets() not to return without setting an exception
Yuya Nishihara <yuya@tcha.org>
parents:
36621
diff
changeset
|
744 PyErr_SetString(PyExc_TypeError, "roots must be a list"); |
27364
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
745 goto done; |
36623
a472a897c340
cext: fix computephasesmapsets() not to return without setting an exception
Yuya Nishihara <yuya@tcha.org>
parents:
36621
diff
changeset
|
746 } |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
747 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
748 phases = calloc( |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
749 len, 1); /* phase per rev: {0: public, 1: draft, 2: secret} */ |
27364
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
750 if (phases == NULL) { |
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
751 PyErr_NoMemory(); |
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
752 goto done; |
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
753 } |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
754 /* Put the phase information of all the roots in phases */ |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
755 numphase = PyList_GET_SIZE(roots) + 1; |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
756 minrevallphases = len + 1; |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
757 phasessetlist = PyList_New(numphase); |
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
758 if (phasessetlist == NULL) |
27364
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
759 goto done; |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
760 |
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
761 PyList_SET_ITEM(phasessetlist, 0, Py_None); |
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
762 Py_INCREF(Py_None); |
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
763 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
764 for (i = 0; i < numphase - 1; i++) { |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
765 phaseroots = PyList_GET_ITEM(roots, i); |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
766 phaseset = PySet_New(NULL); |
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
767 if (phaseset == NULL) |
27364
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
768 goto release; |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
769 PyList_SET_ITEM(phasessetlist, i + 1, phaseset); |
36623
a472a897c340
cext: fix computephasesmapsets() not to return without setting an exception
Yuya Nishihara <yuya@tcha.org>
parents:
36621
diff
changeset
|
770 if (!PyList_Check(phaseroots)) { |
a472a897c340
cext: fix computephasesmapsets() not to return without setting an exception
Yuya Nishihara <yuya@tcha.org>
parents:
36621
diff
changeset
|
771 PyErr_SetString(PyExc_TypeError, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
772 "roots item must be a list"); |
27364
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
773 goto release; |
36623
a472a897c340
cext: fix computephasesmapsets() not to return without setting an exception
Yuya Nishihara <yuya@tcha.org>
parents:
36621
diff
changeset
|
774 } |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
775 minrevphase = |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
776 add_roots_get_min(self, phaseroots, i + 1, phases); |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
777 if (minrevphase == -2) /* Error from add_roots_get_min */ |
27364
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
778 goto release; |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
779 minrevallphases = MIN(minrevallphases, minrevphase); |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
780 } |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
781 /* Propagate the phase information from the roots to the revs */ |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
782 if (minrevallphases != -1) { |
25312
ee02728dd5f9
parsers: simplify the code computing the phases
Laurent Charignon <lcharignon@fb.com>
parents:
25311
diff
changeset
|
783 int parents[2]; |
ee02728dd5f9
parsers: simplify the code computing the phases
Laurent Charignon <lcharignon@fb.com>
parents:
25311
diff
changeset
|
784 for (i = minrevallphases; i < len; i++) { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
785 if (index_get_parents(self, i, parents, (int)len - 1) < |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
786 0) |
27364
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
787 goto release; |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
788 set_phase_from_parents(phases, parents[0], parents[1], |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
789 i); |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
790 } |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
791 } |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
792 /* Transform phase list to a python list */ |
39074
acd23830bcd6
cext: fix most truncation warnings in revlog on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39073
diff
changeset
|
793 phasessize = PyInt_FromSsize_t(len); |
35309
d13526333835
phases: drop the list with phase of each rev, always comput phase sets
Joerg Sonnenberger <joerg@bec.de>
parents:
34861
diff
changeset
|
794 if (phasessize == NULL) |
27364
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
795 goto release; |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
796 for (i = 0; i < len; i++) { |
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
797 phase = phases[i]; |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
798 /* We only store the sets of phase for non public phase, the |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
799 * public phase is computed as a difference */ |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
800 if (phase != 0) { |
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
801 phaseset = PyList_GET_ITEM(phasessetlist, phase); |
39074
acd23830bcd6
cext: fix most truncation warnings in revlog on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39073
diff
changeset
|
802 rev = PyInt_FromSsize_t(i); |
27365
ec04370bdfaf
parsers: check results of PyInt_FromLong (issue4771)
Bryan O'Sullivan <bos@serpentine.com>
parents:
27364
diff
changeset
|
803 if (rev == NULL) |
ec04370bdfaf
parsers: check results of PyInt_FromLong (issue4771)
Bryan O'Sullivan <bos@serpentine.com>
parents:
27364
diff
changeset
|
804 goto release; |
25911
f4386cb3252e
parsers: fix memory leak in compute_phases_map_sets
Laurent Charignon <lcharignon@fb.com>
parents:
25860
diff
changeset
|
805 PySet_Add(phaseset, rev); |
f4386cb3252e
parsers: fix memory leak in compute_phases_map_sets
Laurent Charignon <lcharignon@fb.com>
parents:
25860
diff
changeset
|
806 Py_XDECREF(rev); |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
807 } |
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
808 } |
35309
d13526333835
phases: drop the list with phase of each rev, always comput phase sets
Joerg Sonnenberger <joerg@bec.de>
parents:
34861
diff
changeset
|
809 ret = PyTuple_Pack(2, phasessize, phasessetlist); |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
810 |
27364
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
811 release: |
35309
d13526333835
phases: drop the list with phase of each rev, always comput phase sets
Joerg Sonnenberger <joerg@bec.de>
parents:
34861
diff
changeset
|
812 Py_XDECREF(phasessize); |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
813 Py_XDECREF(phasessetlist); |
27364
ad1cc1435b13
parsers: simplify error logic in compute_phases_map_sets
Bryan O'Sullivan <bos@serpentine.com>
parents:
27341
diff
changeset
|
814 done: |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
815 free(phases); |
25190
22438cfd11b5
phases: add set per phase in C phase computation
Laurent Charignon <lcharignon@fb.com>
parents:
24879
diff
changeset
|
816 return ret; |
24443
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
817 } |
539b3c7eea44
phase: compute phases in C
Laurent Charignon <lcharignon@fb.com>
parents:
24214
diff
changeset
|
818 |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
819 static PyObject *index_headrevs(indexObject *self, PyObject *args) |
16786
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
820 { |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25296
diff
changeset
|
821 Py_ssize_t i, j, len; |
16786
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
822 char *nothead = NULL; |
22540
9a860ac8c216
parsers: fix uninitialize variable warning
David Soria Parra <davidsp@fb.com>
parents:
22484
diff
changeset
|
823 PyObject *heads = NULL; |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
824 PyObject *filter = NULL; |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
825 PyObject *filteredrevs = Py_None; |
16786
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
826 |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
827 if (!PyArg_ParseTuple(args, "|O", &filteredrevs)) { |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
828 return NULL; |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
829 } |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
830 |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
831 if (self->headrevs && filteredrevs == self->filteredrevs) |
16787
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
832 return list_copy(self->headrevs); |
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
833 |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
834 Py_DECREF(self->filteredrevs); |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
835 self->filteredrevs = filteredrevs; |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
836 Py_INCREF(filteredrevs); |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
837 |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
838 if (filteredrevs != Py_None) { |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
839 filter = PyObject_GetAttrString(filteredrevs, "__contains__"); |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
840 if (!filter) { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
841 PyErr_SetString( |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
842 PyExc_TypeError, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
843 "filteredrevs has no attribute __contains__"); |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
844 goto bail; |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
845 } |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
846 } |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
847 |
38851
781b2720d2ac
index: don't include nullid in len()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38850
diff
changeset
|
848 len = index_length(self); |
16786
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
849 heads = PyList_New(0); |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
850 if (heads == NULL) |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
851 goto bail; |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
852 if (len == 0) { |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
853 PyObject *nullid = PyInt_FromLong(-1); |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
854 if (nullid == NULL || PyList_Append(heads, nullid) == -1) { |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
855 Py_XDECREF(nullid); |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
856 goto bail; |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
857 } |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
858 goto done; |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
859 } |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
860 |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
861 nothead = calloc(len, 1); |
27366
7e8a883da171
parsers: add a missed PyErr_NoMemory
Bryan O'Sullivan <bos@serpentine.com>
parents:
27365
diff
changeset
|
862 if (nothead == NULL) { |
7e8a883da171
parsers: add a missed PyErr_NoMemory
Bryan O'Sullivan <bos@serpentine.com>
parents:
27365
diff
changeset
|
863 PyErr_NoMemory(); |
16786
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
864 goto bail; |
27366
7e8a883da171
parsers: add a missed PyErr_NoMemory
Bryan O'Sullivan <bos@serpentine.com>
parents:
27365
diff
changeset
|
865 } |
16786
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
866 |
28386
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
867 for (i = len - 1; i >= 0; i--) { |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25296
diff
changeset
|
868 int isfiltered; |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25296
diff
changeset
|
869 int parents[2]; |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
870 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
871 /* If nothead[i] == 1, it means we've seen an unfiltered child |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
872 * of this node already, and therefore this node is not |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
873 * filtered. So we can skip the expensive check_filter step. |
28386
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
874 */ |
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
875 if (nothead[i] != 1) { |
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
876 isfiltered = check_filter(filter, i); |
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
877 if (isfiltered == -1) { |
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
878 PyErr_SetString(PyExc_TypeError, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
879 "unable to check filter"); |
28386
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
880 goto bail; |
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
881 } |
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
882 |
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
883 if (isfiltered) { |
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
884 nothead[i] = 1; |
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
885 continue; |
1c658391b22f
parsers: optimize filtered headrevs logic
Durham Goode <durham@fb.com>
parents:
27638
diff
changeset
|
886 } |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
887 } |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
888 |
25860
895f04955a49
parsers: silence warning of implicit integer conversion issued by clang
Yuya Nishihara <yuya@tcha.org>
parents:
25810
diff
changeset
|
889 if (index_get_parents(self, i, parents, (int)len - 1) < 0) |
25810
82d6a35cf432
parsers: fix buffer overflow by invalid parent revision read from revlog
Yuya Nishihara <yuya@tcha.org>
parents:
25584
diff
changeset
|
890 goto bail; |
25297
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25296
diff
changeset
|
891 for (j = 0; j < 2; j++) { |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25296
diff
changeset
|
892 if (parents[j] >= 0) |
3966e39fea98
changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents:
25296
diff
changeset
|
893 nothead[parents[j]] = 1; |
16786
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
894 } |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
895 } |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
896 |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
897 for (i = 0; i < len; i++) { |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
898 PyObject *head; |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
899 |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
900 if (nothead[i]) |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
901 continue; |
22400
888bc106de83
parsers: fix typing issue when constructing Python integer object
Henrik Stuart <hg@hstuart.dk>
parents:
22399
diff
changeset
|
902 head = PyInt_FromSsize_t(i); |
16786
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
903 if (head == NULL || PyList_Append(heads, head) == -1) { |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
904 Py_XDECREF(head); |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
905 goto bail; |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
906 } |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
907 } |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
908 |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
909 done: |
16787
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
910 self->headrevs = heads; |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
911 Py_XDECREF(filter); |
16786
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
912 free(nothead); |
16787
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
913 return list_copy(self->headrevs); |
16786
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
914 bail: |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
915 Py_XDECREF(filter); |
16786
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
916 Py_XDECREF(heads); |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
917 free(nothead); |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
918 return NULL; |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
919 } |
2631cd5dd244
revlog: switch to a C version of headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16784
diff
changeset
|
920 |
33174
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
921 /** |
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
922 * Obtain the base revision index entry. |
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
923 * |
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
924 * Callers must ensure that rev >= 0 or illegal memory access may occur. |
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
925 */ |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
926 static inline int index_baserev(indexObject *self, int rev) |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
927 { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
928 const char *data; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
929 |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
930 if (rev >= self->length) { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
931 PyObject *tuple = |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
932 PyList_GET_ITEM(self->added, rev - self->length); |
40598
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
933 long ret; |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
934 if (!pylong_to_long(PyTuple_GET_ITEM(tuple, 3), &ret)) { |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
935 return -2; |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
936 } |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
937 return (int)ret; |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
938 } else { |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
939 data = index_deref(self, rev); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
940 if (data == NULL) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
941 return -2; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
942 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
943 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
944 return getbe32(data + 16); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
945 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
946 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
947 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
948 static PyObject *index_deltachain(indexObject *self, PyObject *args) |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
949 { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
950 int rev, generaldelta; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
951 PyObject *stoparg; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
952 int stoprev, iterrev, baserev = -1; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
953 int stopped; |
33174
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
954 PyObject *chain = NULL, *result = NULL; |
38868
0db50770f388
index: don't add 1 to length variables
Martin von Zweigbergk <martinvonz@google.com>
parents:
38867
diff
changeset
|
955 const Py_ssize_t length = index_length(self); |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
956 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
957 if (!PyArg_ParseTuple(args, "iOi", &rev, &stoparg, &generaldelta)) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
958 return NULL; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
959 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
960 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
961 if (PyInt_Check(stoparg)) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
962 stoprev = (int)PyInt_AsLong(stoparg); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
963 if (stoprev == -1 && PyErr_Occurred()) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
964 return NULL; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
965 } |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
966 } else if (stoparg == Py_None) { |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
967 stoprev = -2; |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
968 } else { |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
969 PyErr_SetString(PyExc_ValueError, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
970 "stoprev must be integer or None"); |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
971 return NULL; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
972 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
973 |
38868
0db50770f388
index: don't add 1 to length variables
Martin von Zweigbergk <martinvonz@google.com>
parents:
38867
diff
changeset
|
974 if (rev < 0 || rev >= length) { |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
975 PyErr_SetString(PyExc_ValueError, "revlog index out of range"); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
976 return NULL; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
977 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
978 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
979 chain = PyList_New(0); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
980 if (chain == NULL) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
981 return NULL; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
982 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
983 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
984 baserev = index_baserev(self, rev); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
985 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
986 /* This should never happen. */ |
33174
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
987 if (baserev <= -2) { |
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
988 /* Error should be set by index_deref() */ |
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
989 assert(PyErr_Occurred()); |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
990 goto bail; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
991 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
992 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
993 iterrev = rev; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
994 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
995 while (iterrev != baserev && iterrev != stoprev) { |
33174
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
996 PyObject *value = PyInt_FromLong(iterrev); |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
997 if (value == NULL) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
998 goto bail; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
999 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1000 if (PyList_Append(chain, value)) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1001 Py_DECREF(value); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1002 goto bail; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1003 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1004 Py_DECREF(value); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1005 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1006 if (generaldelta) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1007 iterrev = baserev; |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1008 } else { |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1009 iterrev--; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1010 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1011 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1012 if (iterrev < 0) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1013 break; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1014 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1015 |
38868
0db50770f388
index: don't add 1 to length variables
Martin von Zweigbergk <martinvonz@google.com>
parents:
38867
diff
changeset
|
1016 if (iterrev >= length) { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1017 PyErr_SetString(PyExc_IndexError, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1018 "revision outside index"); |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1019 return NULL; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1020 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1021 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1022 baserev = index_baserev(self, iterrev); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1023 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1024 /* This should never happen. */ |
33174
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
1025 if (baserev <= -2) { |
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
1026 /* Error should be set by index_deref() */ |
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
1027 assert(PyErr_Occurred()); |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1028 goto bail; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1029 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1030 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1031 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1032 if (iterrev == stoprev) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1033 stopped = 1; |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1034 } else { |
33174
f4f52bb362e6
revlog: address review feedback for deltachain C implementation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
33171
diff
changeset
|
1035 PyObject *value = PyInt_FromLong(iterrev); |
33171
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1036 if (value == NULL) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1037 goto bail; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1038 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1039 if (PyList_Append(chain, value)) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1040 Py_DECREF(value); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1041 goto bail; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1042 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1043 Py_DECREF(value); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1044 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1045 stopped = 0; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1046 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1047 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1048 if (PyList_Reverse(chain)) { |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1049 goto bail; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1050 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1051 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1052 result = Py_BuildValue("OO", chain, stopped ? Py_True : Py_False); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1053 Py_DECREF(chain); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1054 return result; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1055 |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1056 bail: |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1057 Py_DECREF(chain); |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1058 return NULL; |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1059 } |
6d678ab1b10d
revlog: C implementation of delta chain resolution
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32384
diff
changeset
|
1060 |
40705
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1061 static inline int64_t |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1062 index_segment_span(indexObject *self, Py_ssize_t start_rev, Py_ssize_t end_rev) |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1063 { |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1064 int64_t start_offset; |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1065 int64_t end_offset; |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1066 int end_size; |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1067 start_offset = index_get_start(self, start_rev); |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1068 if (start_offset < 0) { |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1069 return -1; |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1070 } |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1071 end_offset = index_get_start(self, end_rev); |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1072 if (end_offset < 0) { |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1073 return -1; |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1074 } |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1075 end_size = index_get_length(self, end_rev); |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1076 if (end_size < 0) { |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1077 return -1; |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1078 } |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1079 if (end_offset < start_offset) { |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1080 PyErr_Format(PyExc_ValueError, |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1081 "corrupted revlog index: inconsistent offset " |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1082 "between revisions (%zd) and (%zd)", |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1083 start_rev, end_rev); |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1084 return -1; |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1085 } |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1086 return (end_offset - start_offset) + (int64_t)end_size; |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1087 } |
4ec6a24029d2
sparse-revlog: add a `index_segment_span` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40704
diff
changeset
|
1088 |
40742
8edca70dc951
revlog: update the documentation for `trim_endidx`
Boris Feld <boris.feld@octobus.net>
parents:
40741
diff
changeset
|
1089 /* returns endidx so that revs[startidx:endidx] has no empty trailing revs */ |
40706
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1090 static Py_ssize_t trim_endidx(indexObject *self, const Py_ssize_t *revs, |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1091 Py_ssize_t startidx, Py_ssize_t endidx) |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1092 { |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1093 int length; |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1094 while (endidx > 1 && endidx > startidx) { |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1095 length = index_get_length(self, revs[endidx - 1]); |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1096 if (length < 0) { |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1097 return -1; |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1098 } |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1099 if (length != 0) { |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1100 break; |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1101 } |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1102 endidx -= 1; |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1103 } |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1104 return endidx; |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1105 } |
0650be877a37
sparse-revlog: add a `trim_endidx` function in C
Boris Feld <boris.feld@octobus.net>
parents:
40705
diff
changeset
|
1106 |
40707
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1107 struct Gap { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1108 int64_t size; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1109 Py_ssize_t idx; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1110 }; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1111 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1112 static int gap_compare(const void *left, const void *right) |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1113 { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1114 const struct Gap *l_left = ((const struct Gap *)left); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1115 const struct Gap *l_right = ((const struct Gap *)right); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1116 if (l_left->size < l_right->size) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1117 return -1; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1118 } else if (l_left->size > l_right->size) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1119 return 1; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1120 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1121 return 0; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1122 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1123 static int Py_ssize_t_compare(const void *left, const void *right) |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1124 { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1125 const Py_ssize_t l_left = *(const Py_ssize_t *)left; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1126 const Py_ssize_t l_right = *(const Py_ssize_t *)right; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1127 if (l_left < l_right) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1128 return -1; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1129 } else if (l_left > l_right) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1130 return 1; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1131 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1132 return 0; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1133 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1134 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1135 static PyObject *index_slicechunktodensity(indexObject *self, PyObject *args) |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1136 { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1137 /* method arguments */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1138 PyObject *list_revs = NULL; /* revisions in the chain */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1139 double targetdensity = 0; /* min density to achieve */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1140 Py_ssize_t mingapsize = 0; /* threshold to ignore gaps */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1141 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1142 /* other core variables */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1143 Py_ssize_t idxlen = index_length(self); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1144 Py_ssize_t i; /* used for various iteration */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1145 PyObject *result = NULL; /* the final return of the function */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1146 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1147 /* generic information about the delta chain being slice */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1148 Py_ssize_t num_revs = 0; /* size of the full delta chain */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1149 Py_ssize_t *revs = NULL; /* native array of revision in the chain */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1150 int64_t chainpayload = 0; /* sum of all delta in the chain */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1151 int64_t deltachainspan = 0; /* distance from first byte to last byte */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1152 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1153 /* variable used for slicing the delta chain */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1154 int64_t readdata = 0; /* amount of data currently planned to be read */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1155 double density = 0; /* ration of payload data compared to read ones */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1156 int64_t previous_end; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1157 struct Gap *gaps = NULL; /* array of notable gap in the chain */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1158 Py_ssize_t num_gaps = |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1159 0; /* total number of notable gap recorded so far */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1160 Py_ssize_t *selected_indices = NULL; /* indices of gap skipped over */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1161 Py_ssize_t num_selected = 0; /* number of gaps skipped */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1162 PyObject *chunk = NULL; /* individual slice */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1163 PyObject *allchunks = NULL; /* all slices */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1164 Py_ssize_t previdx; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1165 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1166 /* parsing argument */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1167 if (!PyArg_ParseTuple(args, "O!dn", &PyList_Type, &list_revs, |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1168 &targetdensity, &mingapsize)) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1169 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1170 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1171 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1172 /* If the delta chain contains a single element, we do not need slicing |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1173 */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1174 num_revs = PyList_GET_SIZE(list_revs); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1175 if (num_revs <= 1) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1176 result = PyTuple_Pack(1, list_revs); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1177 goto done; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1178 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1179 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1180 /* Turn the python list into a native integer array (for efficiency) */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1181 revs = (Py_ssize_t *)calloc(num_revs, sizeof(Py_ssize_t)); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1182 if (revs == NULL) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1183 PyErr_NoMemory(); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1184 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1185 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1186 for (i = 0; i < num_revs; i++) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1187 Py_ssize_t revnum = PyInt_AsLong(PyList_GET_ITEM(list_revs, i)); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1188 if (revnum == -1 && PyErr_Occurred()) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1189 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1190 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1191 if (revnum < 0 || revnum >= idxlen) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1192 PyErr_SetString(PyExc_IndexError, "index out of range"); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1193 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1194 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1195 revs[i] = revnum; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1196 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1197 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1198 /* Compute and check various property of the unsliced delta chain */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1199 deltachainspan = index_segment_span(self, revs[0], revs[num_revs - 1]); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1200 if (deltachainspan < 0) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1201 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1202 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1203 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1204 if (deltachainspan <= mingapsize) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1205 result = PyTuple_Pack(1, list_revs); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1206 goto done; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1207 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1208 chainpayload = 0; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1209 for (i = 0; i < num_revs; i++) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1210 int tmp = index_get_length(self, revs[i]); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1211 if (tmp < 0) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1212 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1213 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1214 chainpayload += tmp; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1215 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1216 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1217 readdata = deltachainspan; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1218 density = 1.0; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1219 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1220 if (0 < deltachainspan) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1221 density = (double)chainpayload / (double)deltachainspan; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1222 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1223 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1224 if (density >= targetdensity) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1225 result = PyTuple_Pack(1, list_revs); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1226 goto done; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1227 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1228 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1229 /* if chain is too sparse, look for relevant gaps */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1230 gaps = (struct Gap *)calloc(num_revs, sizeof(struct Gap)); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1231 if (gaps == NULL) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1232 PyErr_NoMemory(); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1233 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1234 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1235 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1236 previous_end = -1; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1237 for (i = 0; i < num_revs; i++) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1238 int64_t revstart; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1239 int revsize; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1240 revstart = index_get_start(self, revs[i]); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1241 if (revstart < 0) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1242 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1243 }; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1244 revsize = index_get_length(self, revs[i]); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1245 if (revsize < 0) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1246 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1247 }; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1248 if (revsize == 0) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1249 continue; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1250 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1251 if (previous_end >= 0) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1252 int64_t gapsize = revstart - previous_end; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1253 if (gapsize > mingapsize) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1254 gaps[num_gaps].size = gapsize; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1255 gaps[num_gaps].idx = i; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1256 num_gaps += 1; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1257 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1258 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1259 previous_end = revstart + revsize; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1260 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1261 if (num_gaps == 0) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1262 result = PyTuple_Pack(1, list_revs); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1263 goto done; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1264 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1265 qsort(gaps, num_gaps, sizeof(struct Gap), &gap_compare); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1266 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1267 /* Slice the largest gap first, they improve the density the most */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1268 selected_indices = |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1269 (Py_ssize_t *)malloc((num_gaps + 1) * sizeof(Py_ssize_t)); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1270 if (selected_indices == NULL) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1271 PyErr_NoMemory(); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1272 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1273 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1274 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1275 for (i = num_gaps - 1; i >= 0; i--) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1276 selected_indices[num_selected] = gaps[i].idx; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1277 readdata -= gaps[i].size; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1278 num_selected += 1; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1279 if (readdata <= 0) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1280 density = 1.0; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1281 } else { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1282 density = (double)chainpayload / (double)readdata; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1283 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1284 if (density >= targetdensity) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1285 break; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1286 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1287 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1288 qsort(selected_indices, num_selected, sizeof(Py_ssize_t), |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1289 &Py_ssize_t_compare); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1290 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1291 /* create the resulting slice */ |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1292 allchunks = PyList_New(0); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1293 if (allchunks == NULL) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1294 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1295 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1296 previdx = 0; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1297 selected_indices[num_selected] = num_revs; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1298 for (i = 0; i <= num_selected; i++) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1299 Py_ssize_t idx = selected_indices[i]; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1300 Py_ssize_t endidx = trim_endidx(self, revs, previdx, idx); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1301 if (endidx < 0) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1302 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1303 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1304 if (previdx < endidx) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1305 chunk = PyList_GetSlice(list_revs, previdx, endidx); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1306 if (chunk == NULL) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1307 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1308 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1309 if (PyList_Append(allchunks, chunk) == -1) { |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1310 goto bail; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1311 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1312 Py_DECREF(chunk); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1313 chunk = NULL; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1314 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1315 previdx = idx; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1316 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1317 result = allchunks; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1318 goto done; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1319 |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1320 bail: |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1321 Py_XDECREF(allchunks); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1322 Py_XDECREF(chunk); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1323 done: |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1324 free(revs); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1325 free(gaps); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1326 free(selected_indices); |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1327 return result; |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1328 } |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
1329 |
16618
6bae941b58ad
parsers: change the type of nt_level
Bryan O'Sullivan <bryano@fb.com>
parents:
16617
diff
changeset
|
1330 static inline int nt_level(const char *node, Py_ssize_t level) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1331 { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1332 int v = node[level >> 1]; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1333 if (!(level & 1)) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1334 v >>= 4; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1335 return v & 0xf; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1336 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1337 |
16616
8f79aabd96f6
parsers: allow nt_find to signal an ambiguous match
Bryan O'Sullivan <bryano@fb.com>
parents:
16615
diff
changeset
|
1338 /* |
8f79aabd96f6
parsers: allow nt_find to signal an ambiguous match
Bryan O'Sullivan <bryano@fb.com>
parents:
16615
diff
changeset
|
1339 * Return values: |
8f79aabd96f6
parsers: allow nt_find to signal an ambiguous match
Bryan O'Sullivan <bryano@fb.com>
parents:
16615
diff
changeset
|
1340 * |
8f79aabd96f6
parsers: allow nt_find to signal an ambiguous match
Bryan O'Sullivan <bryano@fb.com>
parents:
16615
diff
changeset
|
1341 * -4: match is ambiguous (multiple candidates) |
8f79aabd96f6
parsers: allow nt_find to signal an ambiguous match
Bryan O'Sullivan <bryano@fb.com>
parents:
16615
diff
changeset
|
1342 * -2: not found |
8f79aabd96f6
parsers: allow nt_find to signal an ambiguous match
Bryan O'Sullivan <bryano@fb.com>
parents:
16615
diff
changeset
|
1343 * rest: valid rev |
8f79aabd96f6
parsers: allow nt_find to signal an ambiguous match
Bryan O'Sullivan <bryano@fb.com>
parents:
16615
diff
changeset
|
1344 */ |
38940
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1345 static int nt_find(nodetree *self, const char *node, Py_ssize_t nodelen, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1346 int hex) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1347 { |
16663 | 1348 int (*getnybble)(const char *, Py_ssize_t) = hex ? hexdigit : nt_level; |
16641
e6dfbc5df76f
parsers: use the correct maximum radix tree depth
Bryan O'Sullivan <bryano@fb.com>
parents:
16604
diff
changeset
|
1349 int level, maxlevel, off; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1350 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1351 if (nodelen == 20 && node[0] == '\0' && memcmp(node, nullid, 20) == 0) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1352 return -1; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1353 |
16663 | 1354 if (hex) |
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1355 maxlevel = nodelen > 40 ? 40 : (int)nodelen; |
16663 | 1356 else |
1357 maxlevel = nodelen > 20 ? 40 : ((int)nodelen * 2); | |
16641
e6dfbc5df76f
parsers: use the correct maximum radix tree depth
Bryan O'Sullivan <bryano@fb.com>
parents:
16604
diff
changeset
|
1358 |
e6dfbc5df76f
parsers: use the correct maximum radix tree depth
Bryan O'Sullivan <bryano@fb.com>
parents:
16604
diff
changeset
|
1359 for (level = off = 0; level < maxlevel; level++) { |
16663 | 1360 int k = getnybble(node, level); |
38940
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1361 nodetreenode *n = &self->nodes[off]; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1362 int v = n->children[k]; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1363 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1364 if (v < 0) { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1365 const char *n; |
16663 | 1366 Py_ssize_t i; |
1367 | |
38846
f738c502e43b
index: store nullrev as -1 in nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38845
diff
changeset
|
1368 v = -(v + 2); |
38940
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1369 n = index_node(self->index, v); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1370 if (n == NULL) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1371 return -2; |
16663 | 1372 for (i = level; i < maxlevel; i++) |
1373 if (getnybble(node, i) != nt_level(n, i)) | |
1374 return -2; | |
1375 return v; | |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1376 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1377 if (v == 0) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1378 return -2; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1379 off = v; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1380 } |
16616
8f79aabd96f6
parsers: allow nt_find to signal an ambiguous match
Bryan O'Sullivan <bryano@fb.com>
parents:
16615
diff
changeset
|
1381 /* multiple matches against an ambiguous prefix */ |
8f79aabd96f6
parsers: allow nt_find to signal an ambiguous match
Bryan O'Sullivan <bryano@fb.com>
parents:
16615
diff
changeset
|
1382 return -4; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1383 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1384 |
38915
fff675dfb80b
index: pass only nodetree to nt_new()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38914
diff
changeset
|
1385 static int nt_new(nodetree *self) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1386 { |
38915
fff675dfb80b
index: pass only nodetree to nt_new()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38914
diff
changeset
|
1387 if (self->length == self->capacity) { |
38938
dcd395dc98d8
index: remove side-effect from failed nt_new()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38937
diff
changeset
|
1388 unsigned newcapacity; |
dcd395dc98d8
index: remove side-effect from failed nt_new()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38937
diff
changeset
|
1389 nodetreenode *newnodes; |
39071
06ff7ea4f440
index: avoid duplicating capacity-growth expression
Martin von Zweigbergk <martinvonz@google.com>
parents:
39070
diff
changeset
|
1390 newcapacity = self->capacity * 2; |
06ff7ea4f440
index: avoid duplicating capacity-growth expression
Martin von Zweigbergk <martinvonz@google.com>
parents:
39070
diff
changeset
|
1391 if (newcapacity >= INT_MAX / sizeof(nodetreenode)) { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1392 PyErr_SetString(PyExc_MemoryError, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1393 "overflow in nt_new"); |
24623
2262d7bc469e
parsers: check for memory allocation overflows more carefully
Bryan O'Sullivan <bryano@fb.com>
parents:
24622
diff
changeset
|
1394 return -1; |
2262d7bc469e
parsers: check for memory allocation overflows more carefully
Bryan O'Sullivan <bryano@fb.com>
parents:
24622
diff
changeset
|
1395 } |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1396 newnodes = |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1397 realloc(self->nodes, newcapacity * sizeof(nodetreenode)); |
38938
dcd395dc98d8
index: remove side-effect from failed nt_new()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38937
diff
changeset
|
1398 if (newnodes == NULL) { |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1399 PyErr_SetString(PyExc_MemoryError, "out of memory"); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1400 return -1; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1401 } |
38938
dcd395dc98d8
index: remove side-effect from failed nt_new()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38937
diff
changeset
|
1402 self->capacity = newcapacity; |
dcd395dc98d8
index: remove side-effect from failed nt_new()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38937
diff
changeset
|
1403 self->nodes = newnodes; |
38915
fff675dfb80b
index: pass only nodetree to nt_new()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38914
diff
changeset
|
1404 memset(&self->nodes[self->length], 0, |
fff675dfb80b
index: pass only nodetree to nt_new()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38914
diff
changeset
|
1405 sizeof(nodetreenode) * (self->capacity - self->length)); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1406 } |
38915
fff675dfb80b
index: pass only nodetree to nt_new()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38914
diff
changeset
|
1407 return self->length++; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1408 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1409 |
38940
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1410 static int nt_insert(nodetree *self, const char *node, int rev) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1411 { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1412 int level = 0; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1413 int off = 0; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1414 |
16641
e6dfbc5df76f
parsers: use the correct maximum radix tree depth
Bryan O'Sullivan <bryano@fb.com>
parents:
16604
diff
changeset
|
1415 while (level < 40) { |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1416 int k = nt_level(node, level); |
38912
d1bc0e7c862b
index: extract a type for the nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38911
diff
changeset
|
1417 nodetreenode *n; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1418 int v; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1419 |
38940
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1420 n = &self->nodes[off]; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1421 v = n->children[k]; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1422 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1423 if (v == 0) { |
38846
f738c502e43b
index: store nullrev as -1 in nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38845
diff
changeset
|
1424 n->children[k] = -rev - 2; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1425 return 0; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1426 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1427 if (v < 0) { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1428 const char *oldnode = |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1429 index_node_existing(self->index, -(v + 2)); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1430 int noff; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1431 |
37999
514605777244
revlog: handle errors from index_node() in nt_insert() and index_slice_del()
Martin von Zweigbergk <martinvonz@google.com>
parents:
37978
diff
changeset
|
1432 if (oldnode == NULL) |
514605777244
revlog: handle errors from index_node() in nt_insert() and index_slice_del()
Martin von Zweigbergk <martinvonz@google.com>
parents:
37978
diff
changeset
|
1433 return -1; |
514605777244
revlog: handle errors from index_node() in nt_insert() and index_slice_del()
Martin von Zweigbergk <martinvonz@google.com>
parents:
37978
diff
changeset
|
1434 if (!memcmp(oldnode, node, 20)) { |
38846
f738c502e43b
index: store nullrev as -1 in nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38845
diff
changeset
|
1435 n->children[k] = -rev - 2; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1436 return 0; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1437 } |
38940
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1438 noff = nt_new(self); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1439 if (noff == -1) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1440 return -1; |
38940
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1441 /* self->nodes may have been changed by realloc */ |
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1442 self->nodes[off].children[k] = noff; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1443 off = noff; |
38940
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1444 n = &self->nodes[off]; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1445 n->children[nt_level(oldnode, ++level)] = v; |
38940
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1446 if (level > self->depth) |
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1447 self->depth = level; |
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1448 self->splits += 1; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1449 } else { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1450 level += 1; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1451 off = v; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1452 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1453 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1454 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1455 return -1; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1456 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1457 |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1458 static PyObject *ntobj_insert(nodetreeObject *self, PyObject *args) |
39226
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1459 { |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1460 Py_ssize_t rev; |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1461 const char *node; |
39227
42cc76d0f836
cext: fix revlog compiler error on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39226
diff
changeset
|
1462 Py_ssize_t length; |
39226
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1463 if (!PyArg_ParseTuple(args, "n", &rev)) |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1464 return NULL; |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1465 length = index_length(self->nt.index); |
39226
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1466 if (rev < 0 || rev >= length) { |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1467 PyErr_SetString(PyExc_ValueError, "revlog index out of range"); |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1468 return NULL; |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1469 } |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1470 node = index_node_existing(self->nt.index, rev); |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1471 if (nt_insert(&self->nt, node, (int)rev) == -1) |
39226
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1472 return NULL; |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1473 Py_RETURN_NONE; |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1474 } |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1475 |
38940
b6fb71a0a005
index: make most "nt_*" functions take a nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38939
diff
changeset
|
1476 static int nt_delete_node(nodetree *self, const char *node) |
38845
f9fc59ea3135
index: create function for deleting node from nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38821
diff
changeset
|
1477 { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1478 /* rev==-2 happens to get encoded as 0, which is interpreted as not set |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1479 */ |
38846
f738c502e43b
index: store nullrev as -1 in nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38845
diff
changeset
|
1480 return nt_insert(self, node, -2); |
38845
f9fc59ea3135
index: create function for deleting node from nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38821
diff
changeset
|
1481 } |
f9fc59ea3135
index: create function for deleting node from nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38821
diff
changeset
|
1482 |
38941
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1483 static int nt_init(nodetree *self, indexObject *index, unsigned capacity) |
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1484 { |
39225
fcaffbd7e635
index: fix a comment about overflow-checking
Martin von Zweigbergk <martinvonz@google.com>
parents:
39219
diff
changeset
|
1485 /* Initialize before overflow-checking to avoid nt_dealloc() crash. */ |
39218
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1486 self->nodes = NULL; |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1487 |
38941
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1488 self->index = index; |
39072
34eb999e29bf
index: make capacity argument to nt_init be measured in revisions
Martin von Zweigbergk <martinvonz@google.com>
parents:
39071
diff
changeset
|
1489 /* The input capacity is in terms of revisions, while the field is in |
34eb999e29bf
index: make capacity argument to nt_init be measured in revisions
Martin von Zweigbergk <martinvonz@google.com>
parents:
39071
diff
changeset
|
1490 * terms of nodetree nodes. */ |
34eb999e29bf
index: make capacity argument to nt_init be measured in revisions
Martin von Zweigbergk <martinvonz@google.com>
parents:
39071
diff
changeset
|
1491 self->capacity = (capacity < 4 ? 4 : capacity / 2); |
38941
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1492 self->depth = 0; |
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1493 self->splits = 0; |
39070
4dd92a15fcca
index: move check for too large capacity into nt_init()
Martin von Zweigbergk <martinvonz@google.com>
parents:
39069
diff
changeset
|
1494 if ((size_t)self->capacity > INT_MAX / sizeof(nodetreenode)) { |
4dd92a15fcca
index: move check for too large capacity into nt_init()
Martin von Zweigbergk <martinvonz@google.com>
parents:
39069
diff
changeset
|
1495 PyErr_SetString(PyExc_ValueError, "overflow in init_nt"); |
4dd92a15fcca
index: move check for too large capacity into nt_init()
Martin von Zweigbergk <martinvonz@google.com>
parents:
39069
diff
changeset
|
1496 return -1; |
4dd92a15fcca
index: move check for too large capacity into nt_init()
Martin von Zweigbergk <martinvonz@google.com>
parents:
39069
diff
changeset
|
1497 } |
38941
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1498 self->nodes = calloc(self->capacity, sizeof(nodetreenode)); |
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1499 if (self->nodes == NULL) { |
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1500 PyErr_NoMemory(); |
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1501 return -1; |
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1502 } |
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1503 self->length = 1; |
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1504 return 0; |
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1505 } |
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1506 |
39218
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1507 static PyTypeObject indexType; |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1508 |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1509 static int ntobj_init(nodetreeObject *self, PyObject *args) |
39218
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1510 { |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1511 PyObject *index; |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1512 unsigned capacity; |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1513 if (!PyArg_ParseTuple(args, "O!I", &indexType, &index, &capacity)) |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1514 return -1; |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1515 Py_INCREF(index); |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1516 return nt_init(&self->nt, (indexObject *)index, capacity); |
39218
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1517 } |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1518 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1519 static int nt_partialmatch(nodetree *self, const char *node, Py_ssize_t nodelen) |
38943
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1520 { |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1521 return nt_find(self, node, nodelen, 1); |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1522 } |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1523 |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1524 /* |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1525 * Find the length of the shortest unique prefix of node. |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1526 * |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1527 * Return values: |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1528 * |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1529 * -3: error (exception set) |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1530 * -2: not found (no exception set) |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1531 * rest: length of shortest prefix |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1532 */ |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1533 static int nt_shortest(nodetree *self, const char *node) |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1534 { |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1535 int level, off; |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1536 |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1537 for (level = off = 0; level < 40; level++) { |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1538 int k, v; |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1539 nodetreenode *n = &self->nodes[off]; |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1540 k = nt_level(node, level); |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1541 v = n->children[k]; |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1542 if (v < 0) { |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1543 const char *n; |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1544 v = -(v + 2); |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1545 n = index_node_existing(self->index, v); |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1546 if (n == NULL) |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1547 return -3; |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1548 if (memcmp(node, n, 20) != 0) |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1549 /* |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1550 * Found a unique prefix, but it wasn't for the |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1551 * requested node (i.e the requested node does |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1552 * not exist). |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1553 */ |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1554 return -2; |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1555 return level + 1; |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1556 } |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1557 if (v == 0) |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1558 return -2; |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1559 off = v; |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1560 } |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1561 /* |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1562 * The node was still not unique after 40 hex digits, so this won't |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1563 * happen. Also, if we get here, then there's a programming error in |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1564 * this file that made us insert a node longer than 40 hex digits. |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1565 */ |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1566 PyErr_SetString(PyExc_Exception, "broken node tree"); |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1567 return -3; |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1568 } |
2b89e20c450c
index: move all "nt_*" functions to one place
Martin von Zweigbergk <martinvonz@google.com>
parents:
38942
diff
changeset
|
1569 |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1570 static PyObject *ntobj_shortest(nodetreeObject *self, PyObject *args) |
39226
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1571 { |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1572 PyObject *val; |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1573 char *node; |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1574 int length; |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1575 |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1576 if (!PyArg_ParseTuple(args, "O", &val)) |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1577 return NULL; |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1578 if (node_check(val, &node) == -1) |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1579 return NULL; |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1580 |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1581 length = nt_shortest(&self->nt, node); |
39226
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1582 if (length == -3) |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1583 return NULL; |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1584 if (length == -2) { |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1585 raise_revlog_error(); |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1586 return NULL; |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1587 } |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1588 return PyInt_FromLong(length); |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1589 } |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1590 |
39218
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1591 static void nt_dealloc(nodetree *self) |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1592 { |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1593 free(self->nodes); |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1594 self->nodes = NULL; |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1595 } |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1596 |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1597 static void ntobj_dealloc(nodetreeObject *self) |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1598 { |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1599 Py_XDECREF(self->nt.index); |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1600 nt_dealloc(&self->nt); |
39218
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1601 PyObject_Del(self); |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1602 } |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1603 |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1604 static PyMethodDef ntobj_methods[] = { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1605 {"insert", (PyCFunction)ntobj_insert, METH_VARARGS, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1606 "insert an index entry"}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1607 {"shortest", (PyCFunction)ntobj_shortest, METH_VARARGS, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1608 "find length of shortest hex nodeid of a binary ID"}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1609 {NULL} /* Sentinel */ |
39226
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1610 }; |
7a759ad2d06d
shortest: use nodetree for finding shortest node within revset
Martin von Zweigbergk <martinvonz@google.com>
parents:
39225
diff
changeset
|
1611 |
39218
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1612 static PyTypeObject nodetreeType = { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1613 PyVarObject_HEAD_INIT(NULL, 0) /* header */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1614 "parsers.nodetree", /* tp_name */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1615 sizeof(nodetreeObject), /* tp_basicsize */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1616 0, /* tp_itemsize */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1617 (destructor)ntobj_dealloc, /* tp_dealloc */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1618 0, /* tp_print */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1619 0, /* tp_getattr */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1620 0, /* tp_setattr */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1621 0, /* tp_compare */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1622 0, /* tp_repr */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1623 0, /* tp_as_number */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1624 0, /* tp_as_sequence */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1625 0, /* tp_as_mapping */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1626 0, /* tp_hash */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1627 0, /* tp_call */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1628 0, /* tp_str */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1629 0, /* tp_getattro */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1630 0, /* tp_setattro */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1631 0, /* tp_as_buffer */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1632 Py_TPFLAGS_DEFAULT, /* tp_flags */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1633 "nodetree", /* tp_doc */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1634 0, /* tp_traverse */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1635 0, /* tp_clear */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1636 0, /* tp_richcompare */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1637 0, /* tp_weaklistoffset */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1638 0, /* tp_iter */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1639 0, /* tp_iternext */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1640 ntobj_methods, /* tp_methods */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1641 0, /* tp_members */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1642 0, /* tp_getset */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1643 0, /* tp_base */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1644 0, /* tp_dict */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1645 0, /* tp_descr_get */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1646 0, /* tp_descr_set */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1647 0, /* tp_dictoffset */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1648 (initproc)ntobj_init, /* tp_init */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1649 0, /* tp_alloc */ |
39218
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1650 }; |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
1651 |
38941
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1652 static int index_init_nt(indexObject *self) |
16615
96fa9dd1db38
parsers: factor out radix tree initialization
Bryan O'Sullivan <bryano@fb.com>
parents:
16614
diff
changeset
|
1653 { |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1654 if (!self->ntinitialized) { |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1655 if (nt_init(&self->nt, self, (int)self->raw_length) == -1) { |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1656 nt_dealloc(&self->nt); |
38912
d1bc0e7c862b
index: extract a type for the nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38911
diff
changeset
|
1657 return -1; |
d1bc0e7c862b
index: extract a type for the nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38911
diff
changeset
|
1658 } |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1659 if (nt_insert(&self->nt, nullid, -1) == -1) { |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1660 nt_dealloc(&self->nt); |
16615
96fa9dd1db38
parsers: factor out radix tree initialization
Bryan O'Sullivan <bryano@fb.com>
parents:
16614
diff
changeset
|
1661 return -1; |
96fa9dd1db38
parsers: factor out radix tree initialization
Bryan O'Sullivan <bryano@fb.com>
parents:
16614
diff
changeset
|
1662 } |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1663 self->ntinitialized = 1; |
38851
781b2720d2ac
index: don't include nullid in len()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38850
diff
changeset
|
1664 self->ntrev = (int)index_length(self); |
16615
96fa9dd1db38
parsers: factor out radix tree initialization
Bryan O'Sullivan <bryano@fb.com>
parents:
16614
diff
changeset
|
1665 self->ntlookups = 1; |
96fa9dd1db38
parsers: factor out radix tree initialization
Bryan O'Sullivan <bryano@fb.com>
parents:
16614
diff
changeset
|
1666 self->ntmisses = 0; |
96fa9dd1db38
parsers: factor out radix tree initialization
Bryan O'Sullivan <bryano@fb.com>
parents:
16614
diff
changeset
|
1667 } |
96fa9dd1db38
parsers: factor out radix tree initialization
Bryan O'Sullivan <bryano@fb.com>
parents:
16614
diff
changeset
|
1668 return 0; |
96fa9dd1db38
parsers: factor out radix tree initialization
Bryan O'Sullivan <bryano@fb.com>
parents:
16614
diff
changeset
|
1669 } |
96fa9dd1db38
parsers: factor out radix tree initialization
Bryan O'Sullivan <bryano@fb.com>
parents:
16614
diff
changeset
|
1670 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1671 /* |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1672 * Return values: |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1673 * |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1674 * -3: error (exception set) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1675 * -2: not found (no exception set) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1676 * rest: valid rev |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1677 */ |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1678 static int index_find_node(indexObject *self, const char *node, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1679 Py_ssize_t nodelen) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1680 { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1681 int rev; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1682 |
38941
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1683 if (index_init_nt(self) == -1) |
38820
44bbc89ec5e0
revlog: remove micro-optimization for looking up only nullid
Martin von Zweigbergk <martinvonz@google.com>
parents:
38819
diff
changeset
|
1684 return -3; |
44bbc89ec5e0
revlog: remove micro-optimization for looking up only nullid
Martin von Zweigbergk <martinvonz@google.com>
parents:
38819
diff
changeset
|
1685 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1686 self->ntlookups++; |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1687 rev = nt_find(&self->nt, node, nodelen, 0); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1688 if (rev >= -1) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1689 return rev; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1690 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1691 /* |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1692 * For the first handful of lookups, we scan the entire index, |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1693 * and cache only the matching nodes. This optimizes for cases |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1694 * like "hg tip", where only a few nodes are accessed. |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1695 * |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1696 * After that, we cache every node we visit, using a single |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1697 * scan amortized over multiple lookups. This gives the best |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1698 * bulk performance, e.g. for "hg log". |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1699 */ |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1700 if (self->ntmisses++ < 4) { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1701 for (rev = self->ntrev - 1; rev >= 0; rev--) { |
37861
a9d9802d577e
revlog: don't say "not found" on internal error
Martin von Zweigbergk <martinvonz@google.com>
parents:
37860
diff
changeset
|
1702 const char *n = index_node_existing(self, rev); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1703 if (n == NULL) |
37861
a9d9802d577e
revlog: don't say "not found" on internal error
Martin von Zweigbergk <martinvonz@google.com>
parents:
37860
diff
changeset
|
1704 return -3; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1705 if (memcmp(node, n, nodelen > 20 ? 20 : nodelen) == 0) { |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1706 if (nt_insert(&self->nt, n, rev) == -1) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1707 return -3; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1708 break; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1709 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1710 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1711 } else { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1712 for (rev = self->ntrev - 1; rev >= 0; rev--) { |
37861
a9d9802d577e
revlog: don't say "not found" on internal error
Martin von Zweigbergk <martinvonz@google.com>
parents:
37860
diff
changeset
|
1713 const char *n = index_node_existing(self, rev); |
a9d9802d577e
revlog: don't say "not found" on internal error
Martin von Zweigbergk <martinvonz@google.com>
parents:
37860
diff
changeset
|
1714 if (n == NULL) |
a9d9802d577e
revlog: don't say "not found" on internal error
Martin von Zweigbergk <martinvonz@google.com>
parents:
37860
diff
changeset
|
1715 return -3; |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1716 if (nt_insert(&self->nt, n, rev) == -1) { |
16614
1d800eb9ba52
parsers: update ntrev when we stop scanning
Bryan O'Sullivan <bryano@fb.com>
parents:
16597
diff
changeset
|
1717 self->ntrev = rev + 1; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1718 return -3; |
16614
1d800eb9ba52
parsers: update ntrev when we stop scanning
Bryan O'Sullivan <bryano@fb.com>
parents:
16597
diff
changeset
|
1719 } |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1720 if (memcmp(node, n, nodelen > 20 ? 20 : nodelen) == 0) { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1721 break; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1722 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1723 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1724 self->ntrev = rev; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1725 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1726 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1727 if (rev >= 0) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1728 return rev; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1729 return -2; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1730 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1731 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1732 static PyObject *index_getitem(indexObject *self, PyObject *value) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1733 { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1734 char *node; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1735 int rev; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1736 |
40598
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
1737 if (PyInt_Check(value)) { |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
1738 long idx; |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
1739 if (!pylong_to_long(value, &idx)) { |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
1740 return NULL; |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
1741 } |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
1742 return index_get(self, idx); |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
1743 } |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1744 |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
1745 if (node_check(value, &node) == -1) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1746 return NULL; |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
1747 rev = index_find_node(self, node, 20); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1748 if (rev >= -1) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1749 return PyInt_FromLong(rev); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1750 if (rev == -2) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1751 raise_revlog_error(); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1752 return NULL; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1753 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1754 |
37929
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1755 /* |
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1756 * Fully populate the radix tree. |
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1757 */ |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1758 static int index_populate_nt(indexObject *self) |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1759 { |
37929
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1760 int rev; |
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1761 if (self->ntrev > 0) { |
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1762 for (rev = self->ntrev - 1; rev >= 0; rev--) { |
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1763 const char *n = index_node_existing(self, rev); |
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1764 if (n == NULL) |
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1765 return -1; |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1766 if (nt_insert(&self->nt, n, rev) == -1) |
37929
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1767 return -1; |
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1768 } |
37930
892592475094
revlog: use literal -1 instead of variable that always has that value
Martin von Zweigbergk <martinvonz@google.com>
parents:
37929
diff
changeset
|
1769 self->ntrev = -1; |
37929
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1770 } |
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1771 return 0; |
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1772 } |
9c6d1d41b3e6
revlog: extract function for fully populating the radix tree
Martin von Zweigbergk <martinvonz@google.com>
parents:
37861
diff
changeset
|
1773 |
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1774 static PyObject *index_partialmatch(indexObject *self, PyObject *args) |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1775 { |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1776 const char *fullnode; |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1777 int nodelen; |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1778 char *node; |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1779 int rev, i; |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1780 |
36620
186c6df3a373
py3: bulk-replace 'const char*' format specifier passed to PyArg_ParseTuple*()
Yuya Nishihara <yuya@tcha.org>
parents:
36619
diff
changeset
|
1781 if (!PyArg_ParseTuple(args, PY23("s#", "y#"), &node, &nodelen)) |
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1782 return NULL; |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1783 |
37858
92ed344a9e64
revlog: use radix tree also for matching keys shorter than 4 hex digits
Martin von Zweigbergk <martinvonz@google.com>
parents:
36623
diff
changeset
|
1784 if (nodelen < 1) { |
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1785 PyErr_SetString(PyExc_ValueError, "key too short"); |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1786 return NULL; |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1787 } |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1788 |
17353
bde1185f406c
revlog: don't try to partialmatch strings those length > 40
sorcerer
parents:
17165
diff
changeset
|
1789 if (nodelen > 40) { |
bde1185f406c
revlog: don't try to partialmatch strings those length > 40
sorcerer
parents:
17165
diff
changeset
|
1790 PyErr_SetString(PyExc_ValueError, "key too long"); |
bde1185f406c
revlog: don't try to partialmatch strings those length > 40
sorcerer
parents:
17165
diff
changeset
|
1791 return NULL; |
bde1185f406c
revlog: don't try to partialmatch strings those length > 40
sorcerer
parents:
17165
diff
changeset
|
1792 } |
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1793 |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1794 for (i = 0; i < nodelen; i++) |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1795 hexdigit(node, i); |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1796 if (PyErr_Occurred()) { |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1797 /* input contains non-hex characters */ |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1798 PyErr_Clear(); |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1799 Py_RETURN_NONE; |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1800 } |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1801 |
38941
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1802 if (index_init_nt(self) == -1) |
38911
2aa4f06c1e91
index: make "nt_*" functions work on an initialized nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38868
diff
changeset
|
1803 return NULL; |
38942
3e74c01102af
index: rename "nt_*(indexObject *self,...)" functions to "index_*"
Martin von Zweigbergk <martinvonz@google.com>
parents:
38941
diff
changeset
|
1804 if (index_populate_nt(self) == -1) |
38911
2aa4f06c1e91
index: make "nt_*" functions work on an initialized nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38868
diff
changeset
|
1805 return NULL; |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1806 rev = nt_partialmatch(&self->nt, node, nodelen); |
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1807 |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1808 switch (rev) { |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1809 case -4: |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1810 raise_revlog_error(); |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1811 return NULL; |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1812 case -2: |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1813 Py_RETURN_NONE; |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1814 case -1: |
30100
c5afe5531709
parsers: convert PyString* to PyBytes*
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30090
diff
changeset
|
1815 return PyBytes_FromStringAndSize(nullid, 20); |
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1816 } |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1817 |
37860
a91f31a1e281
revlog: extract function for getting node from known-to-exist rev
Martin von Zweigbergk <martinvonz@google.com>
parents:
37858
diff
changeset
|
1818 fullnode = index_node_existing(self, rev); |
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1819 if (fullnode == NULL) { |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1820 return NULL; |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1821 } |
30100
c5afe5531709
parsers: convert PyString* to PyBytes*
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30090
diff
changeset
|
1822 return PyBytes_FromStringAndSize(fullnode, 20); |
16665
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1823 } |
e410be860393
revlog: speed up prefix matching against nodes
Bryan O'Sullivan <bryano@fb.com>
parents:
16664
diff
changeset
|
1824 |
37968
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1825 static PyObject *index_shortest(indexObject *self, PyObject *args) |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1826 { |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1827 PyObject *val; |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1828 char *node; |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1829 int length; |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1830 |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1831 if (!PyArg_ParseTuple(args, "O", &val)) |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1832 return NULL; |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
1833 if (node_check(val, &node) == -1) |
37968
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1834 return NULL; |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1835 |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1836 self->ntlookups++; |
38941
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
1837 if (index_init_nt(self) == -1) |
38911
2aa4f06c1e91
index: make "nt_*" functions work on an initialized nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38868
diff
changeset
|
1838 return NULL; |
38942
3e74c01102af
index: rename "nt_*(indexObject *self,...)" functions to "index_*"
Martin von Zweigbergk <martinvonz@google.com>
parents:
38941
diff
changeset
|
1839 if (index_populate_nt(self) == -1) |
38911
2aa4f06c1e91
index: make "nt_*" functions work on an initialized nodetree
Martin von Zweigbergk <martinvonz@google.com>
parents:
38868
diff
changeset
|
1840 return NULL; |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
1841 length = nt_shortest(&self->nt, node); |
37968
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1842 if (length == -3) |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1843 return NULL; |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1844 if (length == -2) { |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1845 raise_revlog_error(); |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1846 return NULL; |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1847 } |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1848 return PyInt_FromLong(length); |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1849 } |
0304f22497fa
revlog: use node tree (native code) for shortest() calculation
Martin von Zweigbergk <martinvonz@google.com>
parents:
37930
diff
changeset
|
1850 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1851 static PyObject *index_m_get(indexObject *self, PyObject *args) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1852 { |
16679
2950d186a927
parsers: strictly check for 20-byte hashes where they're required
Bryan O'Sullivan <bryano@fb.com>
parents:
16641
diff
changeset
|
1853 PyObject *val; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1854 char *node; |
16679
2950d186a927
parsers: strictly check for 20-byte hashes where they're required
Bryan O'Sullivan <bryano@fb.com>
parents:
16641
diff
changeset
|
1855 int rev; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1856 |
16679
2950d186a927
parsers: strictly check for 20-byte hashes where they're required
Bryan O'Sullivan <bryano@fb.com>
parents:
16641
diff
changeset
|
1857 if (!PyArg_ParseTuple(args, "O", &val)) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1858 return NULL; |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
1859 if (node_check(val, &node) == -1) |
16679
2950d186a927
parsers: strictly check for 20-byte hashes where they're required
Bryan O'Sullivan <bryano@fb.com>
parents:
16641
diff
changeset
|
1860 return NULL; |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
1861 rev = index_find_node(self, node, 20); |
27638
90e3c5129226
cleanup: remove superfluous space after space after equals (C)
timeless <timeless@mozdev.org>
parents:
27592
diff
changeset
|
1862 if (rev == -3) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1863 return NULL; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1864 if (rev == -2) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1865 Py_RETURN_NONE; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1866 return PyInt_FromLong(rev); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1867 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1868 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1869 static int index_contains(indexObject *self, PyObject *value) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1870 { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1871 char *node; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1872 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1873 if (PyInt_Check(value)) { |
40598
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
1874 long rev; |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
1875 if (!pylong_to_long(value, &rev)) { |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
1876 return -1; |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
1877 } |
38866
aa33988ad8ab
index: return False for "len(index) in index"
Martin von Zweigbergk <martinvonz@google.com>
parents:
38852
diff
changeset
|
1878 return rev >= -1 && rev < index_length(self); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1879 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1880 |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
1881 if (node_check(value, &node) == -1) |
16679
2950d186a927
parsers: strictly check for 20-byte hashes where they're required
Bryan O'Sullivan <bryano@fb.com>
parents:
16641
diff
changeset
|
1882 return -1; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1883 |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
1884 switch (index_find_node(self, node, 20)) { |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1885 case -3: |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1886 return -1; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1887 case -2: |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1888 return 0; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1889 default: |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1890 return 1; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1891 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1892 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
1893 |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1894 typedef uint64_t bitmask; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1895 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1896 /* |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1897 * Given a disjoint set of revs, return all candidates for the |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1898 * greatest common ancestor. In revset notation, this is the set |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1899 * "heads(::a and ::b and ...)" |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1900 */ |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1901 static PyObject *find_gca_candidates(indexObject *self, const int *revs, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1902 int revcount) |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1903 { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1904 const bitmask allseen = (1ull << revcount) - 1; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1905 const bitmask poison = 1ull << revcount; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1906 PyObject *gca = PyList_New(0); |
20555
4add43865a9b
ancestors: remove unnecessary handling of 'left'
Mads Kiilerich <madski@unity3d.com>
parents:
20554
diff
changeset
|
1907 int i, v, interesting; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1908 int maxrev = -1; |
22399
9f490afcb067
parsers: use bitmask type consistently in find_gca_candidates
Henrik Stuart <hg@hstuart.dk>
parents:
21871
diff
changeset
|
1909 bitmask sp; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1910 bitmask *seen; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1911 |
19727
3d07b4a2f743
parsers: correctly handle a failed allocation
Bryan O'Sullivan <bryano@fb.com>
parents:
19726
diff
changeset
|
1912 if (gca == NULL) |
3d07b4a2f743
parsers: correctly handle a failed allocation
Bryan O'Sullivan <bryano@fb.com>
parents:
19726
diff
changeset
|
1913 return PyErr_NoMemory(); |
3d07b4a2f743
parsers: correctly handle a failed allocation
Bryan O'Sullivan <bryano@fb.com>
parents:
19726
diff
changeset
|
1914 |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1915 for (i = 0; i < revcount; i++) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1916 if (revs[i] > maxrev) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1917 maxrev = revs[i]; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1918 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1919 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1920 seen = calloc(sizeof(*seen), maxrev + 1); |
19727
3d07b4a2f743
parsers: correctly handle a failed allocation
Bryan O'Sullivan <bryano@fb.com>
parents:
19726
diff
changeset
|
1921 if (seen == NULL) { |
3d07b4a2f743
parsers: correctly handle a failed allocation
Bryan O'Sullivan <bryano@fb.com>
parents:
19726
diff
changeset
|
1922 Py_DECREF(gca); |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1923 return PyErr_NoMemory(); |
19727
3d07b4a2f743
parsers: correctly handle a failed allocation
Bryan O'Sullivan <bryano@fb.com>
parents:
19726
diff
changeset
|
1924 } |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1925 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1926 for (i = 0; i < revcount; i++) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1927 seen[revs[i]] = 1ull << i; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1928 |
20555
4add43865a9b
ancestors: remove unnecessary handling of 'left'
Mads Kiilerich <madski@unity3d.com>
parents:
20554
diff
changeset
|
1929 interesting = revcount; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1930 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1931 for (v = maxrev; v >= 0 && interesting; v--) { |
22399
9f490afcb067
parsers: use bitmask type consistently in find_gca_candidates
Henrik Stuart <hg@hstuart.dk>
parents:
21871
diff
changeset
|
1932 bitmask sv = seen[v]; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1933 int parents[2]; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1934 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1935 if (!sv) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1936 continue; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1937 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1938 if (sv < poison) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1939 interesting -= 1; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1940 if (sv == allseen) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1941 PyObject *obj = PyInt_FromLong(v); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1942 if (obj == NULL) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1943 goto bail; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1944 if (PyList_Append(gca, obj) == -1) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1945 Py_DECREF(obj); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1946 goto bail; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1947 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1948 sv |= poison; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1949 for (i = 0; i < revcount; i++) { |
20555
4add43865a9b
ancestors: remove unnecessary handling of 'left'
Mads Kiilerich <madski@unity3d.com>
parents:
20554
diff
changeset
|
1950 if (revs[i] == v) |
4add43865a9b
ancestors: remove unnecessary handling of 'left'
Mads Kiilerich <madski@unity3d.com>
parents:
20554
diff
changeset
|
1951 goto done; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1952 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1953 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1954 } |
25810
82d6a35cf432
parsers: fix buffer overflow by invalid parent revision read from revlog
Yuya Nishihara <yuya@tcha.org>
parents:
25584
diff
changeset
|
1955 if (index_get_parents(self, v, parents, maxrev) < 0) |
82d6a35cf432
parsers: fix buffer overflow by invalid parent revision read from revlog
Yuya Nishihara <yuya@tcha.org>
parents:
25584
diff
changeset
|
1956 goto bail; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1957 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1958 for (i = 0; i < 2; i++) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1959 int p = parents[i]; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1960 if (p == -1) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1961 continue; |
19030
48d6f436363e
parsers: fix variable declaration position issue
Matt Mackall <mpm@selenic.com>
parents:
18988
diff
changeset
|
1962 sp = seen[p]; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1963 if (sv < poison) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1964 if (sp == 0) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1965 seen[p] = sv; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1966 interesting++; |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
1967 } else if (sp != sv) |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1968 seen[p] |= sv; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1969 } else { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1970 if (sp && sp < poison) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1971 interesting--; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1972 seen[p] = sv; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1973 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1974 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1975 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1976 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1977 done: |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1978 free(seen); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1979 return gca; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1980 bail: |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1981 free(seen); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1982 Py_XDECREF(gca); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1983 return NULL; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1984 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1985 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1986 /* |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1987 * Given a disjoint set of revs, return the subset with the longest |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1988 * path to the root. |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1989 */ |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1990 static PyObject *find_deepest(indexObject *self, PyObject *revs) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1991 { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1992 const Py_ssize_t revcount = PyList_GET_SIZE(revs); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1993 static const Py_ssize_t capacity = 24; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1994 int *depth, *interesting = NULL; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1995 int i, j, v, ninteresting; |
21730
8da100383dc3
parsers.c: fix a couple of memory leaks
Danek Duvall <danek.duvall@oracle.com>
parents:
21103
diff
changeset
|
1996 PyObject *dict = NULL, *keys = NULL; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1997 long *seen = NULL; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1998 int maxrev = -1; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
1999 long final; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2000 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2001 if (revcount > capacity) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2002 PyErr_Format(PyExc_OverflowError, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2003 "bitset size (%ld) > capacity (%ld)", |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2004 (long)revcount, (long)capacity); |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2005 return NULL; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2006 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2007 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2008 for (i = 0; i < revcount; i++) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2009 int n = (int)PyInt_AsLong(PyList_GET_ITEM(revs, i)); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2010 if (n > maxrev) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2011 maxrev = n; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2012 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2013 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2014 depth = calloc(sizeof(*depth), maxrev + 1); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2015 if (depth == NULL) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2016 return PyErr_NoMemory(); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2017 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2018 seen = calloc(sizeof(*seen), maxrev + 1); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2019 if (seen == NULL) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2020 PyErr_NoMemory(); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2021 goto bail; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2022 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2023 |
39073
beab6690f202
cext: fix Windows warning about implicit conversion of 32-bit shift to 64 bit
Matt Harbison <matt_harbison@yahoo.com>
parents:
39072
diff
changeset
|
2024 interesting = calloc(sizeof(*interesting), ((size_t)1) << revcount); |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2025 if (interesting == NULL) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2026 PyErr_NoMemory(); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2027 goto bail; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2028 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2029 |
19502
8704477ad3b6
ancestor.deepest: sort revs in C version
Siddharth Agarwal <sid0@fb.com>
parents:
19062
diff
changeset
|
2030 if (PyList_Sort(revs) == -1) |
8704477ad3b6
ancestor.deepest: sort revs in C version
Siddharth Agarwal <sid0@fb.com>
parents:
19062
diff
changeset
|
2031 goto bail; |
8704477ad3b6
ancestor.deepest: sort revs in C version
Siddharth Agarwal <sid0@fb.com>
parents:
19062
diff
changeset
|
2032 |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2033 for (i = 0; i < revcount; i++) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2034 int n = (int)PyInt_AsLong(PyList_GET_ITEM(revs, i)); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2035 long b = 1l << i; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2036 depth[n] = 1; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2037 seen[n] = b; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2038 interesting[b] = 1; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2039 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2040 |
33475
f501322512b6
parsers: fix invariant bug in find_deepest (issue5623)
Sune Foldager <cryo@cyanite.org>
parents:
33174
diff
changeset
|
2041 /* invariant: ninteresting is the number of non-zero entries in |
f501322512b6
parsers: fix invariant bug in find_deepest (issue5623)
Sune Foldager <cryo@cyanite.org>
parents:
33174
diff
changeset
|
2042 * interesting. */ |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2043 ninteresting = (int)revcount; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2044 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2045 for (v = maxrev; v >= 0 && ninteresting > 1; v--) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2046 int dv = depth[v]; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2047 int parents[2]; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2048 long sv; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2049 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2050 if (dv == 0) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2051 continue; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2052 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2053 sv = seen[v]; |
25810
82d6a35cf432
parsers: fix buffer overflow by invalid parent revision read from revlog
Yuya Nishihara <yuya@tcha.org>
parents:
25584
diff
changeset
|
2054 if (index_get_parents(self, v, parents, maxrev) < 0) |
82d6a35cf432
parsers: fix buffer overflow by invalid parent revision read from revlog
Yuya Nishihara <yuya@tcha.org>
parents:
25584
diff
changeset
|
2055 goto bail; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2056 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2057 for (i = 0; i < 2; i++) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2058 int p = parents[i]; |
27341
5042b999ef0a
parsers: narrow scope of a variable to be less confusing
Bryan O'Sullivan <bos@serpentine.com>
parents:
27226
diff
changeset
|
2059 long sp; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2060 int dp; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2061 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2062 if (p == -1) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2063 continue; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2064 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2065 dp = depth[p]; |
27341
5042b999ef0a
parsers: narrow scope of a variable to be less confusing
Bryan O'Sullivan <bos@serpentine.com>
parents:
27226
diff
changeset
|
2066 sp = seen[p]; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2067 if (dp <= dv) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2068 depth[p] = dv + 1; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2069 if (sp != sv) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2070 interesting[sv] += 1; |
27341
5042b999ef0a
parsers: narrow scope of a variable to be less confusing
Bryan O'Sullivan <bos@serpentine.com>
parents:
27226
diff
changeset
|
2071 seen[p] = sv; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2072 if (sp) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2073 interesting[sp] -= 1; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2074 if (interesting[sp] == 0) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2075 ninteresting -= 1; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2076 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2077 } |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2078 } else if (dv == dp - 1) { |
27341
5042b999ef0a
parsers: narrow scope of a variable to be less confusing
Bryan O'Sullivan <bos@serpentine.com>
parents:
27226
diff
changeset
|
2079 long nsp = sp | sv; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2080 if (nsp == sp) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2081 continue; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2082 seen[p] = nsp; |
19503
f2dfda6ac152
ancestor.deepest: decrement ninteresting correctly (issue3984)
Wei, Elson <elson.wei@gmail.com>
parents:
19502
diff
changeset
|
2083 interesting[sp] -= 1; |
33475
f501322512b6
parsers: fix invariant bug in find_deepest (issue5623)
Sune Foldager <cryo@cyanite.org>
parents:
33174
diff
changeset
|
2084 if (interesting[sp] == 0) |
19503
f2dfda6ac152
ancestor.deepest: decrement ninteresting correctly (issue3984)
Wei, Elson <elson.wei@gmail.com>
parents:
19502
diff
changeset
|
2085 ninteresting -= 1; |
33475
f501322512b6
parsers: fix invariant bug in find_deepest (issue5623)
Sune Foldager <cryo@cyanite.org>
parents:
33174
diff
changeset
|
2086 if (interesting[nsp] == 0) |
f501322512b6
parsers: fix invariant bug in find_deepest (issue5623)
Sune Foldager <cryo@cyanite.org>
parents:
33174
diff
changeset
|
2087 ninteresting += 1; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2088 interesting[nsp] += 1; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2089 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2090 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2091 interesting[sv] -= 1; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2092 if (interesting[sv] == 0) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2093 ninteresting -= 1; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2094 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2095 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2096 final = 0; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2097 j = ninteresting; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2098 for (i = 0; i < (int)(2 << revcount) && j > 0; i++) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2099 if (interesting[i] == 0) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2100 continue; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2101 final |= i; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2102 j -= 1; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2103 } |
21730
8da100383dc3
parsers.c: fix a couple of memory leaks
Danek Duvall <danek.duvall@oracle.com>
parents:
21103
diff
changeset
|
2104 if (final == 0) { |
8da100383dc3
parsers.c: fix a couple of memory leaks
Danek Duvall <danek.duvall@oracle.com>
parents:
21103
diff
changeset
|
2105 keys = PyList_New(0); |
8da100383dc3
parsers.c: fix a couple of memory leaks
Danek Duvall <danek.duvall@oracle.com>
parents:
21103
diff
changeset
|
2106 goto bail; |
8da100383dc3
parsers.c: fix a couple of memory leaks
Danek Duvall <danek.duvall@oracle.com>
parents:
21103
diff
changeset
|
2107 } |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2108 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2109 dict = PyDict_New(); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2110 if (dict == NULL) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2111 goto bail; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2112 |
19504
2fa303619b4d
ancestor.deepest: ignore ninteresting while building result (issue3984)
Siddharth Agarwal <sid0@fb.com>
parents:
19503
diff
changeset
|
2113 for (i = 0; i < revcount; i++) { |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2114 PyObject *key; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2115 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2116 if ((final & (1 << i)) == 0) |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2117 continue; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2118 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2119 key = PyList_GET_ITEM(revs, i); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2120 Py_INCREF(key); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2121 Py_INCREF(Py_None); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2122 if (PyDict_SetItem(dict, key, Py_None) == -1) { |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2123 Py_DECREF(key); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2124 Py_DECREF(Py_None); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2125 goto bail; |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2126 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2127 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2128 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2129 keys = PyDict_Keys(dict); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2130 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2131 bail: |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2132 free(depth); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2133 free(seen); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2134 free(interesting); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2135 Py_XDECREF(dict); |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2136 |
21730
8da100383dc3
parsers.c: fix a couple of memory leaks
Danek Duvall <danek.duvall@oracle.com>
parents:
21103
diff
changeset
|
2137 return keys; |
18988
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2138 } |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2139 |
5bae936764bb
parsers: a C implementation of the new ancestors algorithm
Bryan O'Sullivan <bryano@fb.com>
parents:
18900
diff
changeset
|
2140 /* |
21102
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2141 * Given a (possibly overlapping) set of revs, return all the |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2142 * common ancestors heads: heads(::args[0] and ::a[1] and ...) |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2143 */ |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2144 static PyObject *index_commonancestorsheads(indexObject *self, PyObject *args) |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2145 { |
21103
628c16489d1c
parsers: remove unnecessary gca variable in index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
21102
diff
changeset
|
2146 PyObject *ret = NULL; |
21102
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2147 Py_ssize_t argcount, i, len; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2148 bitmask repeat = 0; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2149 int revcount = 0; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2150 int *revs; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2151 |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2152 argcount = PySequence_Length(args); |
31469
a43fd9ec2a39
parsers: use Python memory allocator in commonancestorsheads()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31426
diff
changeset
|
2153 revs = PyMem_Malloc(argcount * sizeof(*revs)); |
21102
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2154 if (argcount > 0 && revs == NULL) |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2155 return PyErr_NoMemory(); |
38851
781b2720d2ac
index: don't include nullid in len()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38850
diff
changeset
|
2156 len = index_length(self); |
21102
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2157 |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2158 for (i = 0; i < argcount; i++) { |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2159 static const int capacity = 24; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2160 PyObject *obj = PySequence_GetItem(args, i); |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2161 bitmask x; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2162 long val; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2163 |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2164 if (!PyInt_Check(obj)) { |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2165 PyErr_SetString(PyExc_TypeError, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2166 "arguments must all be ints"); |
23945
33d6aaf84c9e
parsers.c: fix a memory leak in index_commonancestorsheads
Augie Fackler <augie@google.com>
parents:
23944
diff
changeset
|
2167 Py_DECREF(obj); |
21102
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2168 goto bail; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2169 } |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2170 val = PyInt_AsLong(obj); |
23945
33d6aaf84c9e
parsers.c: fix a memory leak in index_commonancestorsheads
Augie Fackler <augie@google.com>
parents:
23944
diff
changeset
|
2171 Py_DECREF(obj); |
21102
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2172 if (val == -1) { |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2173 ret = PyList_New(0); |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2174 goto done; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2175 } |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2176 if (val < 0 || val >= len) { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2177 PyErr_SetString(PyExc_IndexError, "index out of range"); |
21102
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2178 goto bail; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2179 } |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2180 /* this cheesy bloom filter lets us avoid some more |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2181 * expensive duplicate checks in the common set-is-disjoint |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2182 * case */ |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2183 x = 1ull << (val & 0x3f); |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2184 if (repeat & x) { |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2185 int k; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2186 for (k = 0; k < revcount; k++) { |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2187 if (val == revs[k]) |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2188 goto duplicate; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2189 } |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2190 } else |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2191 repeat |= x; |
21102
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2192 if (revcount >= capacity) { |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2193 PyErr_Format(PyExc_OverflowError, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2194 "bitset size (%d) > capacity (%d)", |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2195 revcount, capacity); |
21102
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2196 goto bail; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2197 } |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2198 revs[revcount++] = (int)val; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2199 duplicate:; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2200 } |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2201 |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2202 if (revcount == 0) { |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2203 ret = PyList_New(0); |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2204 goto done; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2205 } |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2206 if (revcount == 1) { |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2207 PyObject *obj; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2208 ret = PyList_New(1); |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2209 if (ret == NULL) |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2210 goto bail; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2211 obj = PyInt_FromLong(revs[0]); |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2212 if (obj == NULL) |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2213 goto bail; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2214 PyList_SET_ITEM(ret, 0, obj); |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2215 goto done; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2216 } |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2217 |
21103
628c16489d1c
parsers: remove unnecessary gca variable in index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
21102
diff
changeset
|
2218 ret = find_gca_candidates(self, revs, revcount); |
628c16489d1c
parsers: remove unnecessary gca variable in index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
21102
diff
changeset
|
2219 if (ret == NULL) |
21102
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2220 goto bail; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2221 |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2222 done: |
31469
a43fd9ec2a39
parsers: use Python memory allocator in commonancestorsheads()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31426
diff
changeset
|
2223 PyMem_Free(revs); |
21102
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2224 return ret; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2225 |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2226 bail: |
31469
a43fd9ec2a39
parsers: use Python memory allocator in commonancestorsheads()
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31426
diff
changeset
|
2227 PyMem_Free(revs); |
21102
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2228 Py_XDECREF(ret); |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2229 return NULL; |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2230 } |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2231 |
4eb6553789e1
parsers: introduce index_commonancestorsheads
Mads Kiilerich <madski@unity3d.com>
parents:
20797
diff
changeset
|
2232 /* |
24004
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2233 * Given a (possibly overlapping) set of revs, return the greatest |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2234 * common ancestors: those with the longest path to the root. |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2235 */ |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2236 static PyObject *index_ancestors(indexObject *self, PyObject *args) |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2237 { |
26048
0be2f81aadc3
parsers: fix two leaks in index_ancestors
Augie Fackler <augie@google.com>
parents:
26044
diff
changeset
|
2238 PyObject *ret; |
24004
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2239 PyObject *gca = index_commonancestorsheads(self, args); |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2240 if (gca == NULL) |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2241 return NULL; |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2242 |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2243 if (PyList_GET_SIZE(gca) <= 1) { |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2244 return gca; |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2245 } |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2246 |
26048
0be2f81aadc3
parsers: fix two leaks in index_ancestors
Augie Fackler <augie@google.com>
parents:
26044
diff
changeset
|
2247 ret = find_deepest(self, gca); |
0be2f81aadc3
parsers: fix two leaks in index_ancestors
Augie Fackler <augie@google.com>
parents:
26044
diff
changeset
|
2248 Py_DECREF(gca); |
0be2f81aadc3
parsers: fix two leaks in index_ancestors
Augie Fackler <augie@google.com>
parents:
26044
diff
changeset
|
2249 return ret; |
24004
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2250 } |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2251 |
8a5267cd5286
parsers: rewrite index_ancestors() in terms of index_commonancestorsheads()
Martin von Zweigbergk <martinvonz@google.com>
parents:
23948
diff
changeset
|
2252 /* |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2253 * Invalidate any trie entries introduced by added revs. |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2254 */ |
38942
3e74c01102af
index: rename "nt_*(indexObject *self,...)" functions to "index_*"
Martin von Zweigbergk <martinvonz@google.com>
parents:
38941
diff
changeset
|
2255 static void index_invalidate_added(indexObject *self, Py_ssize_t start) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2256 { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2257 Py_ssize_t i, len = PyList_GET_SIZE(self->added); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2258 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2259 for (i = start; i < len; i++) { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2260 PyObject *tuple = PyList_GET_ITEM(self->added, i); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2261 PyObject *node = PyTuple_GET_ITEM(tuple, 7); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2262 |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
2263 nt_delete_node(&self->nt, PyBytes_AS_STRING(node)); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2264 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2265 |
16732
277e2acb7e5c
parsers: use Py_CLEAR where appropriate
Bryan O'Sullivan <bryano@fb.com>
parents:
16699
diff
changeset
|
2266 if (start == 0) |
277e2acb7e5c
parsers: use Py_CLEAR where appropriate
Bryan O'Sullivan <bryano@fb.com>
parents:
16699
diff
changeset
|
2267 Py_CLEAR(self->added); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2268 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2269 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2270 /* |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2271 * Delete a numeric range of revs, which must be at the end of the |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2272 * range, but exclude the sentinel nullid entry. |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2273 */ |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2274 static int index_slice_del(indexObject *self, PyObject *item) |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2275 { |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2276 Py_ssize_t start, stop, step, slicelength; |
38851
781b2720d2ac
index: don't include nullid in len()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38850
diff
changeset
|
2277 Py_ssize_t length = index_length(self) + 1; |
16784
12a852c7c763
parsers: reduce raw_length when truncating
Bryan O'Sullivan <bryano@fb.com>
parents:
16732
diff
changeset
|
2278 int ret = 0; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2279 |
30171
7a3b59f0329a
parsers: avoid PySliceObject cast on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30169
diff
changeset
|
2280 /* Argument changed from PySliceObject* to PyObject* in Python 3. */ |
7a3b59f0329a
parsers: avoid PySliceObject cast on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30169
diff
changeset
|
2281 #ifdef IS_PY3K |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2282 if (PySlice_GetIndicesEx(item, length, &start, &stop, &step, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2283 &slicelength) < 0) |
30171
7a3b59f0329a
parsers: avoid PySliceObject cast on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30169
diff
changeset
|
2284 #else |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2285 if (PySlice_GetIndicesEx((PySliceObject *)item, length, &start, &stop, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2286 &step, &slicelength) < 0) |
30171
7a3b59f0329a
parsers: avoid PySliceObject cast on Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30169
diff
changeset
|
2287 #endif |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2288 return -1; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2289 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2290 if (slicelength <= 0) |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2291 return 0; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2292 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2293 if ((step < 0 && start < stop) || (step > 0 && start > stop)) |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2294 stop = start; |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2295 |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2296 if (step < 0) { |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2297 stop = start + 1; |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2298 start = stop + step * (slicelength - 1) - 1; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2299 step = -step; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2300 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2301 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2302 if (step != 1) { |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2303 PyErr_SetString(PyExc_ValueError, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2304 "revlog index delete requires step size of 1"); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2305 return -1; |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2306 } |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2307 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2308 if (stop != length - 1) { |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2309 PyErr_SetString(PyExc_IndexError, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2310 "revlog index deletion indices are invalid"); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2311 return -1; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2312 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2313 |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
2314 if (start < self->length) { |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
2315 if (self->ntinitialized) { |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2316 Py_ssize_t i; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2317 |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
2318 for (i = start + 1; i < self->length; i++) { |
37999
514605777244
revlog: handle errors from index_node() in nt_insert() and index_slice_del()
Martin von Zweigbergk <martinvonz@google.com>
parents:
37978
diff
changeset
|
2319 const char *node = index_node_existing(self, i); |
514605777244
revlog: handle errors from index_node() in nt_insert() and index_slice_del()
Martin von Zweigbergk <martinvonz@google.com>
parents:
37978
diff
changeset
|
2320 if (node == NULL) |
514605777244
revlog: handle errors from index_node() in nt_insert() and index_slice_del()
Martin von Zweigbergk <martinvonz@google.com>
parents:
37978
diff
changeset
|
2321 return -1; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2322 |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
2323 nt_delete_node(&self->nt, node); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2324 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2325 if (self->added) |
38942
3e74c01102af
index: rename "nt_*(indexObject *self,...)" functions to "index_*"
Martin von Zweigbergk <martinvonz@google.com>
parents:
38941
diff
changeset
|
2326 index_invalidate_added(self, 0); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2327 if (self->ntrev > start) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2328 self->ntrev = (int)start; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2329 } |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
2330 self->length = start; |
18504
d1d5fdcc2d46
parsers: fix memleak of revlog cache entries on strip
Yuya Nishihara <yuya@tcha.org>
parents:
18430
diff
changeset
|
2331 if (start < self->raw_length) { |
d1d5fdcc2d46
parsers: fix memleak of revlog cache entries on strip
Yuya Nishihara <yuya@tcha.org>
parents:
18430
diff
changeset
|
2332 if (self->cache) { |
d1d5fdcc2d46
parsers: fix memleak of revlog cache entries on strip
Yuya Nishihara <yuya@tcha.org>
parents:
18430
diff
changeset
|
2333 Py_ssize_t i; |
d1d5fdcc2d46
parsers: fix memleak of revlog cache entries on strip
Yuya Nishihara <yuya@tcha.org>
parents:
18430
diff
changeset
|
2334 for (i = start; i < self->raw_length; i++) |
d1d5fdcc2d46
parsers: fix memleak of revlog cache entries on strip
Yuya Nishihara <yuya@tcha.org>
parents:
18430
diff
changeset
|
2335 Py_CLEAR(self->cache[i]); |
d1d5fdcc2d46
parsers: fix memleak of revlog cache entries on strip
Yuya Nishihara <yuya@tcha.org>
parents:
18430
diff
changeset
|
2336 } |
16784
12a852c7c763
parsers: reduce raw_length when truncating
Bryan O'Sullivan <bryano@fb.com>
parents:
16732
diff
changeset
|
2337 self->raw_length = start; |
18504
d1d5fdcc2d46
parsers: fix memleak of revlog cache entries on strip
Yuya Nishihara <yuya@tcha.org>
parents:
18430
diff
changeset
|
2338 } |
16784
12a852c7c763
parsers: reduce raw_length when truncating
Bryan O'Sullivan <bryano@fb.com>
parents:
16732
diff
changeset
|
2339 goto done; |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2340 } |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2341 |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
2342 if (self->ntinitialized) { |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
2343 index_invalidate_added(self, start - self->length); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2344 if (self->ntrev > start) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2345 self->ntrev = (int)start; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2346 } |
16784
12a852c7c763
parsers: reduce raw_length when truncating
Bryan O'Sullivan <bryano@fb.com>
parents:
16732
diff
changeset
|
2347 if (self->added) |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
2348 ret = PyList_SetSlice(self->added, start - self->length, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2349 PyList_GET_SIZE(self->added), NULL); |
16784
12a852c7c763
parsers: reduce raw_length when truncating
Bryan O'Sullivan <bryano@fb.com>
parents:
16732
diff
changeset
|
2350 done: |
16787
bda96ce993f9
parsers: cache the result of index_headrevs
Bryan O'Sullivan <bryano@fb.com>
parents:
16786
diff
changeset
|
2351 Py_CLEAR(self->headrevs); |
16784
12a852c7c763
parsers: reduce raw_length when truncating
Bryan O'Sullivan <bryano@fb.com>
parents:
16732
diff
changeset
|
2352 return ret; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2353 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2354 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2355 /* |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2356 * Supported ops: |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2357 * |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2358 * slice deletion |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2359 * string assignment (extend node->rev mapping) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2360 * string deletion (shrink node->rev mapping) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2361 */ |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2362 static int index_assign_subscript(indexObject *self, PyObject *item, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2363 PyObject *value) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2364 { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2365 char *node; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2366 long rev; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2367 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2368 if (PySlice_Check(item) && value == NULL) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2369 return index_slice_del(self, item); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2370 |
38819
49628742d264
revlog: remove unnecessary output parameter from node_check()
Martin von Zweigbergk <martinvonz@google.com>
parents:
38305
diff
changeset
|
2371 if (node_check(item, &node) == -1) |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2372 return -1; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2373 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2374 if (value == NULL) |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2375 return self->ntinitialized ? nt_delete_node(&self->nt, node) |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2376 : 0; |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2377 rev = PyInt_AsLong(value); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2378 if (rev > INT_MAX || rev < 0) { |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2379 if (!PyErr_Occurred()) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2380 PyErr_SetString(PyExc_ValueError, "rev out of range"); |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2381 return -1; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2382 } |
23468
ee311681e591
parsers: ensure revlog index node tree is initialized before insertion
Mike Edgar <adgar@google.com>
parents:
23087
diff
changeset
|
2383 |
38941
c0b6a7c78a21
index: split up nt_init() in two
Martin von Zweigbergk <martinvonz@google.com>
parents:
38940
diff
changeset
|
2384 if (index_init_nt(self) == -1) |
23468
ee311681e591
parsers: ensure revlog index node tree is initialized before insertion
Mike Edgar <adgar@google.com>
parents:
23087
diff
changeset
|
2385 return -1; |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
2386 return nt_insert(&self->nt, node, (int)rev); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2387 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2388 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2389 /* |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2390 * Find all RevlogNG entries in an index that has inline data. Update |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2391 * the optional "offsets" table with those entries. |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2392 */ |
22401
9ba8a93e55f5
parsers: ensure correct return type for inline_scan
Henrik Stuart <hg@hstuart.dk>
parents:
22400
diff
changeset
|
2393 static Py_ssize_t inline_scan(indexObject *self, const char **offsets) |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2394 { |
30577
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2395 const char *data = (const char *)self->buf.buf; |
20167
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
20109
diff
changeset
|
2396 Py_ssize_t pos = 0; |
30577
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2397 Py_ssize_t end = self->buf.len; |
16863
bbedef66c6f3
parsers: replace magic number 64 with symbolic constant
Bryan O'Sullivan <bryano@fb.com>
parents:
16787
diff
changeset
|
2398 long incr = v1_hdrsize; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2399 Py_ssize_t len = 0; |
13254
5ef5eb1f3515
revlog: only build the nodemap on demand
Matt Mackall <mpm@selenic.com>
parents:
11361
diff
changeset
|
2400 |
20167
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
20109
diff
changeset
|
2401 while (pos + v1_hdrsize <= end && pos >= 0) { |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2402 uint32_t comp_len; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2403 /* 3rd element of header is length of compressed inline data */ |
20167
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
20109
diff
changeset
|
2404 comp_len = getbe32(data + pos + 8); |
16863
bbedef66c6f3
parsers: replace magic number 64 with symbolic constant
Bryan O'Sullivan <bryano@fb.com>
parents:
16787
diff
changeset
|
2405 incr = v1_hdrsize + comp_len; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2406 if (offsets) |
20167
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
20109
diff
changeset
|
2407 offsets[len] = data + pos; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2408 len++; |
20167
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
20109
diff
changeset
|
2409 pos += incr; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2410 } |
13254
5ef5eb1f3515
revlog: only build the nodemap on demand
Matt Mackall <mpm@selenic.com>
parents:
11361
diff
changeset
|
2411 |
20167
09e41ac6289d
mpatch: rewrite pointer overflow checks
Matt Mackall <mpm@selenic.com>
parents:
20109
diff
changeset
|
2412 if (pos != end) { |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2413 if (!PyErr_Occurred()) |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2414 PyErr_SetString(PyExc_ValueError, "corrupt index file"); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2415 return -1; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2416 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2417 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2418 return len; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2419 } |
13254
5ef5eb1f3515
revlog: only build the nodemap on demand
Matt Mackall <mpm@selenic.com>
parents:
11361
diff
changeset
|
2420 |
16572
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2421 static int index_init(indexObject *self, PyObject *args) |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2422 { |
16572
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2423 PyObject *data_obj, *inlined_obj; |
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2424 Py_ssize_t size; |
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2425 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2426 /* Initialize before argument-checking to avoid index_dealloc() crash. |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2427 */ |
20109
e57c532c3835
parse_index2: fix crash on bad argument type (issue4110)
Chris Jerdonek <chris.jerdonek@gmail.com>
parents:
19728
diff
changeset
|
2428 self->raw_length = 0; |
e57c532c3835
parse_index2: fix crash on bad argument type (issue4110)
Chris Jerdonek <chris.jerdonek@gmail.com>
parents:
19728
diff
changeset
|
2429 self->added = NULL; |
e57c532c3835
parse_index2: fix crash on bad argument type (issue4110)
Chris Jerdonek <chris.jerdonek@gmail.com>
parents:
19728
diff
changeset
|
2430 self->cache = NULL; |
e57c532c3835
parse_index2: fix crash on bad argument type (issue4110)
Chris Jerdonek <chris.jerdonek@gmail.com>
parents:
19728
diff
changeset
|
2431 self->data = NULL; |
30577
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2432 memset(&self->buf, 0, sizeof(self->buf)); |
20109
e57c532c3835
parse_index2: fix crash on bad argument type (issue4110)
Chris Jerdonek <chris.jerdonek@gmail.com>
parents:
19728
diff
changeset
|
2433 self->headrevs = NULL; |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
2434 self->filteredrevs = Py_None; |
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
2435 Py_INCREF(Py_None); |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
2436 self->ntinitialized = 0; |
20109
e57c532c3835
parse_index2: fix crash on bad argument type (issue4110)
Chris Jerdonek <chris.jerdonek@gmail.com>
parents:
19728
diff
changeset
|
2437 self->offsets = NULL; |
e57c532c3835
parse_index2: fix crash on bad argument type (issue4110)
Chris Jerdonek <chris.jerdonek@gmail.com>
parents:
19728
diff
changeset
|
2438 |
16572
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2439 if (!PyArg_ParseTuple(args, "OO", &data_obj, &inlined_obj)) |
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2440 return -1; |
30577
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2441 if (!PyObject_CheckBuffer(data_obj)) { |
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2442 PyErr_SetString(PyExc_TypeError, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2443 "data does not support buffer interface"); |
16572
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2444 return -1; |
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2445 } |
30577
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2446 |
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2447 if (PyObject_GetBuffer(data_obj, &self->buf, PyBUF_SIMPLE) == -1) |
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2448 return -1; |
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2449 size = self->buf.len; |
16572
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2450 |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2451 self->inlined = inlined_obj && PyObject_IsTrue(inlined_obj); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2452 self->data = data_obj; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2453 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2454 self->ntlookups = self->ntmisses = 0; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2455 self->ntrev = -1; |
16597
b767382a8675
parsers: fix refcount bug on corrupt index
Matt Mackall <mpm@selenic.com>
parents:
16572
diff
changeset
|
2456 Py_INCREF(self->data); |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2457 |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2458 if (self->inlined) { |
22401
9ba8a93e55f5
parsers: ensure correct return type for inline_scan
Henrik Stuart <hg@hstuart.dk>
parents:
22400
diff
changeset
|
2459 Py_ssize_t len = inline_scan(self, NULL); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2460 if (len == -1) |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2461 goto bail; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2462 self->raw_length = len; |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
2463 self->length = len; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2464 } else { |
16863
bbedef66c6f3
parsers: replace magic number 64 with symbolic constant
Bryan O'Sullivan <bryano@fb.com>
parents:
16787
diff
changeset
|
2465 if (size % v1_hdrsize) { |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2466 PyErr_SetString(PyExc_ValueError, "corrupt index file"); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2467 goto bail; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2468 } |
16863
bbedef66c6f3
parsers: replace magic number 64 with symbolic constant
Bryan O'Sullivan <bryano@fb.com>
parents:
16787
diff
changeset
|
2469 self->raw_length = size / v1_hdrsize; |
39068
52e9bf215f96
index: don't include nullid in the internal "length" field
Martin von Zweigbergk <martinvonz@google.com>
parents:
38944
diff
changeset
|
2470 self->length = self->raw_length; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2471 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2472 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2473 return 0; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2474 bail: |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2475 return -1; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2476 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2477 |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2478 static PyObject *index_nodemap(indexObject *self) |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2479 { |
16572
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2480 Py_INCREF(self); |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2481 return (PyObject *)self; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2482 } |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2483 |
38944
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2484 static void _index_clearcaches(indexObject *self) |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2485 { |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2486 if (self->cache) { |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2487 Py_ssize_t i; |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2488 |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2489 for (i = 0; i < self->raw_length; i++) |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2490 Py_CLEAR(self->cache[i]); |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2491 free(self->cache); |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2492 self->cache = NULL; |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2493 } |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2494 if (self->offsets) { |
39075
b935adb4b041
cext: fix a warning about differing const qualifiers on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
39074
diff
changeset
|
2495 PyMem_Free((void *)self->offsets); |
38944
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2496 self->offsets = NULL; |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2497 } |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
2498 if (self->ntinitialized) { |
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
2499 nt_dealloc(&self->nt); |
38944
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2500 } |
39291
9f097214fbf3
index: embed nodetree in index object to avoid reference cycle
Martin von Zweigbergk <martinvonz@google.com>
parents:
39228
diff
changeset
|
2501 self->ntinitialized = 0; |
38944
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2502 Py_CLEAR(self->headrevs); |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2503 } |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2504 |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2505 static PyObject *index_clearcaches(indexObject *self) |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2506 { |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2507 _index_clearcaches(self); |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2508 self->ntrev = -1; |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2509 self->ntlookups = self->ntmisses = 0; |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2510 Py_RETURN_NONE; |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2511 } |
c1de67691d5b
index: move index_clearcaches() further down
Martin von Zweigbergk <martinvonz@google.com>
parents:
38943
diff
changeset
|
2512 |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2513 static void index_dealloc(indexObject *self) |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2514 { |
16370
28bb4daf070c
parsers: fix a memleak, and add a clearcaches method to the index
Bryan O'Sullivan <bryano@fb.com>
parents:
16363
diff
changeset
|
2515 _index_clearcaches(self); |
22484
2b5940f64750
obsolete: use C code for headrevs calculation
Durham Goode <durham@fb.com>
parents:
22403
diff
changeset
|
2516 Py_XDECREF(self->filteredrevs); |
30577
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2517 if (self->buf.buf) { |
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2518 PyBuffer_Release(&self->buf); |
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2519 memset(&self->buf, 0, sizeof(self->buf)); |
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2520 } |
20109
e57c532c3835
parse_index2: fix crash on bad argument type (issue4110)
Chris Jerdonek <chris.jerdonek@gmail.com>
parents:
19728
diff
changeset
|
2521 Py_XDECREF(self->data); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2522 Py_XDECREF(self->added); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2523 PyObject_Del(self); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2524 } |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2525 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2526 static PySequenceMethods index_sequence_methods = { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2527 (lenfunc)index_length, /* sq_length */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2528 0, /* sq_concat */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2529 0, /* sq_repeat */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2530 (ssizeargfunc)index_get, /* sq_item */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2531 0, /* sq_slice */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2532 0, /* sq_ass_item */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2533 0, /* sq_ass_slice */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2534 (objobjproc)index_contains, /* sq_contains */ |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2535 }; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2536 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2537 static PyMappingMethods index_mapping_methods = { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2538 (lenfunc)index_length, /* mp_length */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2539 (binaryfunc)index_getitem, /* mp_subscript */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2540 (objobjargproc)index_assign_subscript, /* mp_ass_subscript */ |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2541 }; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2542 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2543 static PyMethodDef index_methods[] = { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2544 {"ancestors", (PyCFunction)index_ancestors, METH_VARARGS, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2545 "return the gca set of the given revs"}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2546 {"commonancestorsheads", (PyCFunction)index_commonancestorsheads, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2547 METH_VARARGS, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2548 "return the heads of the common ancestors of the given revs"}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2549 {"clearcaches", (PyCFunction)index_clearcaches, METH_NOARGS, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2550 "clear the index caches"}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2551 {"get", (PyCFunction)index_m_get, METH_VARARGS, "get an index entry"}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2552 {"computephasesmapsets", (PyCFunction)compute_phases_map_sets, METH_VARARGS, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2553 "compute phases"}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2554 {"reachableroots2", (PyCFunction)reachableroots2, METH_VARARGS, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2555 "reachableroots"}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2556 {"headrevs", (PyCFunction)index_headrevs, METH_VARARGS, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2557 "get head revisions"}, /* Can do filtering since 3.2 */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2558 {"headrevsfiltered", (PyCFunction)index_headrevs, METH_VARARGS, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2559 "get filtered head revisions"}, /* Can always do filtering */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2560 {"deltachain", (PyCFunction)index_deltachain, METH_VARARGS, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2561 "determine revisions with deltas to reconstruct fulltext"}, |
40707
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
2562 {"slicechunktodensity", (PyCFunction)index_slicechunktodensity, |
cc76ca9fca20
sparse-revlog: introduce native (C) implementation of slicechunktodensity
Boris Feld <boris.feld@octobus.net>
parents:
40706
diff
changeset
|
2563 METH_VARARGS, "determine revisions with deltas to reconstruct fulltext"}, |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2564 {"append", (PyCFunction)index_append, METH_O, "append an index entry"}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2565 {"partialmatch", (PyCFunction)index_partialmatch, METH_VARARGS, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2566 "match a potentially ambiguous node ID"}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2567 {"shortest", (PyCFunction)index_shortest, METH_VARARGS, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2568 "find length of shortest hex nodeid of a binary ID"}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2569 {"stats", (PyCFunction)index_stats, METH_NOARGS, "stats for the index"}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2570 {NULL} /* Sentinel */ |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2571 }; |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2572 |
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2573 static PyGetSetDef index_getset[] = { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2574 {"nodemap", (getter)index_nodemap, NULL, "nodemap", NULL}, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2575 {NULL} /* Sentinel */ |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2576 }; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2577 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2578 static PyTypeObject indexType = { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2579 PyVarObject_HEAD_INIT(NULL, 0) /* header */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2580 "parsers.index", /* tp_name */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2581 sizeof(indexObject), /* tp_basicsize */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2582 0, /* tp_itemsize */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2583 (destructor)index_dealloc, /* tp_dealloc */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2584 0, /* tp_print */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2585 0, /* tp_getattr */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2586 0, /* tp_setattr */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2587 0, /* tp_compare */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2588 0, /* tp_repr */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2589 0, /* tp_as_number */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2590 &index_sequence_methods, /* tp_as_sequence */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2591 &index_mapping_methods, /* tp_as_mapping */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2592 0, /* tp_hash */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2593 0, /* tp_call */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2594 0, /* tp_str */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2595 0, /* tp_getattro */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2596 0, /* tp_setattro */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2597 0, /* tp_as_buffer */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2598 Py_TPFLAGS_DEFAULT, /* tp_flags */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2599 "revlog index", /* tp_doc */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2600 0, /* tp_traverse */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2601 0, /* tp_clear */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2602 0, /* tp_richcompare */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2603 0, /* tp_weaklistoffset */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2604 0, /* tp_iter */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2605 0, /* tp_iternext */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2606 index_methods, /* tp_methods */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2607 0, /* tp_members */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2608 index_getset, /* tp_getset */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2609 0, /* tp_base */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2610 0, /* tp_dict */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2611 0, /* tp_descr_get */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2612 0, /* tp_descr_set */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2613 0, /* tp_dictoffset */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2614 (initproc)index_init, /* tp_init */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2615 0, /* tp_alloc */ |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2616 }; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2617 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2618 /* |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2619 * returns a tuple of the form (index, index, cache) with elements as |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2620 * follows: |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2621 * |
16414
e8d37b78acfb
parsers: use base-16 trie for faster node->rev mapping
Bryan O'Sullivan <bryano@fb.com>
parents:
16393
diff
changeset
|
2622 * index: an index object that lazily parses RevlogNG records |
30577
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2623 * cache: if data is inlined, a tuple (0, index_file_content), else None |
6146d5acee69
parsers: use buffer to store revlog index
Jun Wu <quark@fb.com>
parents:
30171
diff
changeset
|
2624 * index_file_content could be a string, or a buffer |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2625 * |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2626 * added complications are for backwards compatibility |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2627 */ |
32378
7d0c69505a66
cext: extract revlog/index parsing code to own C file
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32372
diff
changeset
|
2628 PyObject *parse_index2(PyObject *self, PyObject *args) |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2629 { |
16572
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2630 PyObject *tuple = NULL, *cache = NULL; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2631 indexObject *idx; |
16572
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2632 int ret; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2633 |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2634 idx = PyObject_New(indexObject, &indexType); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2635 if (idx == NULL) |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2636 goto bail; |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2637 |
16572
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2638 ret = index_init(idx, args); |
8d44b5a2974f
parsers: fix refcount leak, simplify init of index (issue3417)
Bryan O'Sullivan <bryano@fb.com>
parents:
16437
diff
changeset
|
2639 if (ret == -1) |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2640 goto bail; |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2641 |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2642 if (idx->inlined) { |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2643 cache = Py_BuildValue("iO", 0, idx->data); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2644 if (cache == NULL) |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2645 goto bail; |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2646 } else { |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2647 cache = Py_None; |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2648 Py_INCREF(cache); |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2649 } |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2650 |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2651 tuple = Py_BuildValue("NN", idx, cache); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2652 if (!tuple) |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2653 goto bail; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2654 return tuple; |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2655 |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2656 bail: |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2657 Py_XDECREF(idx); |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2658 Py_XDECREF(cache); |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2659 Py_XDECREF(tuple); |
7108
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2660 return NULL; |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2661 } |
1ca878d7b849
C implementation of revlog index parsing
Bernhard Leiner <bleiner@gmail.com>
parents:
7093
diff
changeset
|
2662 |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2663 #ifdef WITH_RUST |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2664 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2665 /* rustlazyancestors: iteration over ancestors implemented in Rust |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2666 * |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2667 * This class holds a reference to an index and to the Rust iterator. |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2668 */ |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2669 typedef struct rustlazyancestorsObjectStruct rustlazyancestorsObject; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2670 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2671 struct rustlazyancestorsObjectStruct { |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2672 PyObject_HEAD |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2673 /* Type-specific fields go here. */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2674 indexObject *index; /* Ref kept to avoid GC'ing the index */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2675 void *iter; /* Rust iterator */ |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2676 }; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2677 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2678 /* FFI exposed from Rust code */ |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2679 rustlazyancestorsObject * |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2680 rustlazyancestors_init(indexObject *index, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2681 /* to pass index_get_parents() */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2682 int (*)(indexObject *, Py_ssize_t, int *, int), |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2683 /* intrevs vector */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2684 Py_ssize_t initrevslen, long *initrevs, long stoprev, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2685 int inclusive); |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2686 void rustlazyancestors_drop(rustlazyancestorsObject *self); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2687 int rustlazyancestors_next(rustlazyancestorsObject *self); |
40300
72b94f946e90
rust: rustlazyancestors.__contains__
Georges Racinet <gracinet@anybox.fr>
parents:
40273
diff
changeset
|
2688 int rustlazyancestors_contains(rustlazyancestorsObject *self, long rev); |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2689 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2690 /* CPython instance methods */ |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2691 static int rustla_init(rustlazyancestorsObject *self, PyObject *args) |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2692 { |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2693 PyObject *initrevsarg = NULL; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2694 PyObject *inclusivearg = NULL; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2695 long stoprev = 0; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2696 long *initrevs = NULL; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2697 int inclusive = 0; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2698 Py_ssize_t i; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2699 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2700 indexObject *index; |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2701 if (!PyArg_ParseTuple(args, "O!O!lO!", &indexType, &index, &PyList_Type, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2702 &initrevsarg, &stoprev, &PyBool_Type, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2703 &inclusivearg)) |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2704 return -1; |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2705 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2706 Py_INCREF(index); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2707 self->index = index; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2708 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2709 if (inclusivearg == Py_True) |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2710 inclusive = 1; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2711 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2712 Py_ssize_t linit = PyList_GET_SIZE(initrevsarg); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2713 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2714 initrevs = (long *)calloc(linit, sizeof(long)); |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2715 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2716 if (initrevs == NULL) { |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2717 PyErr_NoMemory(); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2718 goto bail; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2719 } |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2720 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2721 for (i = 0; i < linit; i++) { |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2722 initrevs[i] = PyInt_AsLong(PyList_GET_ITEM(initrevsarg, i)); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2723 } |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2724 if (PyErr_Occurred()) |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2725 goto bail; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2726 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2727 self->iter = rustlazyancestors_init(index, index_get_parents, linit, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2728 initrevs, stoprev, inclusive); |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2729 if (self->iter == NULL) { |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2730 /* if this is because of GraphError::ParentOutOfRange |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2731 * index_get_parents() has already set the proper ValueError */ |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2732 goto bail; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2733 } |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2734 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2735 free(initrevs); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2736 return 0; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2737 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2738 bail: |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2739 free(initrevs); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2740 return -1; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2741 }; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2742 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2743 static void rustla_dealloc(rustlazyancestorsObject *self) |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2744 { |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2745 Py_XDECREF(self->index); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2746 if (self->iter != NULL) { /* can happen if rustla_init failed */ |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2747 rustlazyancestors_drop(self->iter); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2748 } |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2749 PyObject_Del(self); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2750 } |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2751 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2752 static PyObject *rustla_next(rustlazyancestorsObject *self) |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2753 { |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2754 int res = rustlazyancestors_next(self->iter); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2755 if (res == -1) { |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2756 /* Setting an explicit exception seems unnecessary |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2757 * as examples from Python source code (Objects/rangeobjets.c |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2758 * and Modules/_io/stringio.c) seem to demonstrate. |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2759 */ |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2760 return NULL; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2761 } |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2762 return PyInt_FromLong(res); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2763 } |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2764 |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2765 static int rustla_contains(rustlazyancestorsObject *self, PyObject *rev) |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2766 { |
40598
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
2767 long lrev; |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
2768 if (!pylong_to_long(rev, &lrev)) { |
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
2769 PyErr_Clear(); |
40300
72b94f946e90
rust: rustlazyancestors.__contains__
Georges Racinet <gracinet@anybox.fr>
parents:
40273
diff
changeset
|
2770 return 0; |
72b94f946e90
rust: rustlazyancestors.__contains__
Georges Racinet <gracinet@anybox.fr>
parents:
40273
diff
changeset
|
2771 } |
40598
fa33196088c4
revlog: replace PyInt_AS_LONG with a more portable helper function
Augie Fackler <augie@google.com>
parents:
40562
diff
changeset
|
2772 return rustlazyancestors_contains(self->iter, lrev); |
40300
72b94f946e90
rust: rustlazyancestors.__contains__
Georges Racinet <gracinet@anybox.fr>
parents:
40273
diff
changeset
|
2773 } |
72b94f946e90
rust: rustlazyancestors.__contains__
Georges Racinet <gracinet@anybox.fr>
parents:
40273
diff
changeset
|
2774 |
72b94f946e90
rust: rustlazyancestors.__contains__
Georges Racinet <gracinet@anybox.fr>
parents:
40273
diff
changeset
|
2775 static PySequenceMethods rustla_sequence_methods = { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2776 0, /* sq_length */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2777 0, /* sq_concat */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2778 0, /* sq_repeat */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2779 0, /* sq_item */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2780 0, /* sq_slice */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2781 0, /* sq_ass_item */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2782 0, /* sq_ass_slice */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2783 (objobjproc)rustla_contains, /* sq_contains */ |
40300
72b94f946e90
rust: rustlazyancestors.__contains__
Georges Racinet <gracinet@anybox.fr>
parents:
40273
diff
changeset
|
2784 }; |
72b94f946e90
rust: rustlazyancestors.__contains__
Georges Racinet <gracinet@anybox.fr>
parents:
40273
diff
changeset
|
2785 |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2786 static PyTypeObject rustlazyancestorsType = { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2787 PyVarObject_HEAD_INIT(NULL, 0) /* header */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2788 "parsers.rustlazyancestors", /* tp_name */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2789 sizeof(rustlazyancestorsObject), /* tp_basicsize */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2790 0, /* tp_itemsize */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2791 (destructor)rustla_dealloc, /* tp_dealloc */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2792 0, /* tp_print */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2793 0, /* tp_getattr */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2794 0, /* tp_setattr */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2795 0, /* tp_compare */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2796 0, /* tp_repr */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2797 0, /* tp_as_number */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2798 &rustla_sequence_methods, /* tp_as_sequence */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2799 0, /* tp_as_mapping */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2800 0, /* tp_hash */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2801 0, /* tp_call */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2802 0, /* tp_str */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2803 0, /* tp_getattro */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2804 0, /* tp_setattro */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2805 0, /* tp_as_buffer */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2806 Py_TPFLAGS_DEFAULT, /* tp_flags */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2807 "Iterator over ancestors, implemented in Rust", /* tp_doc */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2808 0, /* tp_traverse */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2809 0, /* tp_clear */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2810 0, /* tp_richcompare */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2811 0, /* tp_weaklistoffset */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2812 0, /* tp_iter */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2813 (iternextfunc)rustla_next, /* tp_iternext */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2814 0, /* tp_methods */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2815 0, /* tp_members */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2816 0, /* tp_getset */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2817 0, /* tp_base */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2818 0, /* tp_dict */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2819 0, /* tp_descr_get */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2820 0, /* tp_descr_set */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2821 0, /* tp_dictoffset */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2822 (initproc)rustla_init, /* tp_init */ |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2823 0, /* tp_alloc */ |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2824 }; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2825 #endif /* WITH_RUST */ |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2826 |
32378
7d0c69505a66
cext: extract revlog/index parsing code to own C file
Gregory Szorc <gregory.szorc@gmail.com>
parents:
32372
diff
changeset
|
2827 void revlog_module_init(PyObject *mod) |
24017
72c9b5ae7278
parsers: add fm1readmarker
Augie Fackler <augie@google.com>
parents:
24004
diff
changeset
|
2828 { |
16604
48e42f984074
parsers: statically initializing tp_new to PyType_GenericNew is not portable
Adrian Buehlmann <adrian@cadifra.com>
parents:
16597
diff
changeset
|
2829 indexType.tp_new = PyType_GenericNew; |
32384
2e5a476b2e46
cext: move back finalization of dirstateTupleType where it should be
Yuya Nishihara <yuya@tcha.org>
parents:
32378
diff
changeset
|
2830 if (PyType_Ready(&indexType) < 0) |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2831 return; |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2832 Py_INCREF(&indexType); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2833 PyModule_AddObject(mod, "index", (PyObject *)&indexType); |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2834 |
39218
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
2835 nodetreeType.tp_new = PyType_GenericNew; |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
2836 if (PyType_Ready(&nodetreeType) < 0) |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
2837 return; |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
2838 Py_INCREF(&nodetreeType); |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
2839 PyModule_AddObject(mod, "nodetree", (PyObject *)&nodetreeType); |
b85b377e7fc2
index: make node tree a Python object
Martin von Zweigbergk <martinvonz@google.com>
parents:
39075
diff
changeset
|
2840 |
40088
129bfc7ad2cc
revlog: if the module is initialized more than once, don't leak nullentry
Augie Fackler <augie@google.com>
parents:
39609
diff
changeset
|
2841 if (!nullentry) { |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2842 nullentry = Py_BuildValue(PY23("iiiiiiis#", "iiiiiiiy#"), 0, 0, |
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2843 0, -1, -1, -1, -1, nullid, 20); |
40088
129bfc7ad2cc
revlog: if the module is initialized more than once, don't leak nullentry
Augie Fackler <augie@google.com>
parents:
39609
diff
changeset
|
2844 } |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2845 if (nullentry) |
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2846 PyObject_GC_UnTrack(nullentry); |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2847 |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2848 #ifdef WITH_RUST |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2849 rustlazyancestorsType.tp_new = PyType_GenericNew; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2850 if (PyType_Ready(&rustlazyancestorsType) < 0) |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2851 return; |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2852 Py_INCREF(&rustlazyancestorsType); |
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2853 PyModule_AddObject(mod, "rustlazyancestors", |
40562
e5ad3ef90aa1
revlog: give formatting to clang-format
Augie Fackler <augie@google.com>
parents:
40561
diff
changeset
|
2854 (PyObject *)&rustlazyancestorsType); |
40273
3b275f549777
rust: exposing in parsers module
Georges Racinet <gracinet@anybox.fr>
parents:
40099
diff
changeset
|
2855 #endif |
16363
2cdd7e63211b
parsers: incrementally parse the revlog index in C
Bryan O'Sullivan <bryano@fb.com>
parents:
15033
diff
changeset
|
2856 } |