mercurial-scm/hg: mercurial/cext/revlog.c annotate

annotate mercurial/cext/revlog.c @ 40704:7da3729d4b45

sparse-revlog: add a `index_get_length` function in C We are about to implement a native version of `slicechunktodensity`. For clarity, we introduce the helper functions first. This new function provides an efficient way to retrieve some of the information needed by `slicechunktodensity`.

author	Boris Feld <boris.feld@octobus.net>
date	Fri, 09 Nov 2018 18:42:58 +0100
parents	d5b300ec2e89
children	4ec6a24029d2

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>
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	15 #include <string.h>
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	16
34438 b90e8da190da cext: reorder #include Gregory Szorc <gregory.szorc@gmail.com> parents: 34437 diff changeset	17 #include "bitmanipulation.h"
33758 0f4ac3b6dee4 cext: factor out header for charencode.c Yuya Nishihara <yuya@tcha.org> parents: 33475 diff changeset	18 #include "charencode.h"
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	19 #include "util.h"
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	20
30112 9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	21 #ifdef IS_PY3K
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	22 /* 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	23 * 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	24 * 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	25 #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	26 #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	27 #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	28 #define PyInt_AsLong PyLong_AsLong
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	29 #endif
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	30
38939 53bc73fae1a3 index: add pointer from nodetree back to index Martin von Zweigbergk <martinvonz@google.com> parents: 38938 diff changeset	31 typedef struct indexObjectStruct indexObject;
53bc73fae1a3 index: add pointer from nodetree back to index Martin von Zweigbergk <martinvonz@google.com> parents: 38938 diff changeset	32
38912 d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	33 typedef struct {
d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	34 int children[16];
d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	35 } nodetreenode;
d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	36
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	37 /*
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	38 * 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	39 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	40 * 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	41 * 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	42 * Zero is empty
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	43 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	44 typedef struct {
38939 53bc73fae1a3 index: add pointer from nodetree back to index Martin von Zweigbergk <martinvonz@google.com> parents: 38938 diff changeset	45 indexObject *index;
38912 d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	46 nodetreenode *nodes;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	47 unsigned length; /* # nodes in use */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	48 unsigned capacity; /* # nodes allocated */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	49 int depth; /* maximum depth of tree */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	50 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	51 } nodetree;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	52
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	53 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	54 PyObject_HEAD /* ; */
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	55 nodetree nt;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	56 } nodetreeObject;
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	57
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	58 /*
26098 ce26928cbe41 spelling: behaviour -> behavior timeless@mozdev.org parents: 26080 diff changeset	59 * 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	60 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	61 * 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	62 * 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	63 * 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	64 * 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	65 * sentinel.
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	66 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	67 * 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	68 * 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	69 */
38939 53bc73fae1a3 index: add pointer from nodetree back to index Martin von Zweigbergk <martinvonz@google.com> parents: 38938 diff changeset	70 struct indexObjectStruct {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	71 PyObject_HEAD
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	72 /* Type-specific fields go here. */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	73 PyObject data; / raw bytes of index */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	74 Py_buffer buf; /* buffer of data */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	75 PyObject *cache; / cached tuples */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	76 const char *offsets; / populated on demand */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	77 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	78 Py_ssize_t length; /* current number of elements */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	79 PyObject added; / populated on demand */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	80 PyObject headrevs; / cache, invalidated on changes */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	81 PyObject filteredrevs; / filtered revs set */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	82 nodetree nt; /* base-16 trie */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	83 int ntinitialized; /* 0 or 1 */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	84 int ntrev; /* last rev scanned */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	85 int ntlookups; /* # lookups */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	86 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	87 int inlined;
38939 53bc73fae1a3 index: add pointer from nodetree back to index Martin von Zweigbergk <martinvonz@google.com> parents: 38938 diff changeset	88 };
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	89
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	90 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	91 {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	92 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	93 return self->length;
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 + 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	95 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	96
40099 994010b87534 revlog: explicitly initialize static variables Yuya Nishihara <yuya@tcha.org> parents: 40088 diff changeset	97 static PyObject *nullentry = NULL;
994010b87534 revlog: explicitly initialize static variables Yuya Nishihara <yuya@tcha.org> parents: 40088 diff changeset	98 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	99
22401 9ba8a93e55f5 parsers: ensure correct return type for inline_scan Henrik Stuart <hg@hstuart.dk> parents: 22400 diff changeset	100 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	101
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	102 #if LONG_MAX == 0x7fffffffL
36621 4015b9248da0 cext: mark tuple_format as a constant Yuya Nishihara <yuya@tcha.org> parents: 36620 diff changeset	103 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	104 #else
36621 4015b9248da0 cext: mark tuple_format as a constant Yuya Nishihara <yuya@tcha.org> parents: 36620 diff changeset	105 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	106 #endif
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	107
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	108 /* 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	109 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	110
39219 f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	111 static void raise_revlog_error(void)
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	112 {
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	113 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	114
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	115 mod = PyImport_ImportModule("mercurial.error");
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	116 if (mod == NULL) {
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	117 goto cleanup;
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	118 }
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 dict = PyModule_GetDict(mod);
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	121 if (dict == NULL) {
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	122 goto cleanup;
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	123 }
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	124 Py_INCREF(dict);
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	125
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	126 errclass = PyDict_GetItemString(dict, "RevlogError");
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	127 if (errclass == NULL) {
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	128 PyErr_SetString(PyExc_SystemError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	129 "could not find RevlogError");
39219 f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	130 goto cleanup;
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	131 }
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 /* 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	134 PyErr_SetString(errclass, "RevlogError");
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	135
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	136 cleanup:
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	137 Py_XDECREF(dict);
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	138 Py_XDECREF(mod);
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	139 }
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	140
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	141 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	142 * 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	143 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	144 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	145 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	146 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	147 if (self->offsets == NULL) {
31470 bc445c556d3c parsers: use Python memory allocator for indexObject->offsets Gregory Szorc <gregory.szorc@gmail.com> parents: 31469 diff changeset	148 self->offsets = PyMem_Malloc(self->raw_length *
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	149 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	150 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	151 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	152 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	153 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	154 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	155 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	156
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	157 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	158 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	159
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	160 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	161 int maxrev)
25311 d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	162 {
39068 52e9bf215f96 index: don't include nullid in the internal "length" field Martin von Zweigbergk <martinvonz@google.com> parents: 38944 diff changeset	163 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	164 long tmp;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	165 PyObject *tuple =
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	166 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	167 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	168 return -1;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	169 }
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	170 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	171 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	172 return -1;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	173 }
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	174 ps[1] = (int)tmp;
25311 d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	175 } else {
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	176 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	177 ps[0] = getbe32(data + 24);
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	178 ps[1] = getbe32(data + 28);
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	179 }
25810 82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	180 /* 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	181 * 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	182 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	183 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	184 return -1;
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	185 }
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	186 return 0;
25311 d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	187 }
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	188
40703 d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	189 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	190 {
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	191 uint64_t offset;
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	192 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	193 PyObject *tuple;
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	194 PyObject *pylong;
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	195 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	196 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	197 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	198 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	199 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	200 return -1;
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	201 }
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	202 if (tmp < 0) {
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	203 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	204 "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	205 (long long)tmp);
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	206 return -1;
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	207 }
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	208 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	209 } else {
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	210 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	211 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	212 if (rev == 0) {
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	213 /* 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	214 offset &= 0xFFFF;
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	215 } else {
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	216 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	217 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	218 }
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 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	221 }
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	222
40704 7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	223 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	224 {
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	225 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	226 PyObject *tuple;
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	227 PyObject *pylong;
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	228 long ret;
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	229 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	230 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	231 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	232 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	233 return -1;
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	234 }
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	235 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	236 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	237 "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	238 ret);
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	239 return -1;
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	240 }
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	241 return (int)ret;
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	242 } else {
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	243 const char *data = index_deref(self, rev);
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	244 return (int)getbe32(data + 8);
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	245 }
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	246 }
7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	247
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	248 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	249 * 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	250 * 6 bytes: offset
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	251 * 2 bytes: flags
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	252 * 4 bytes: compressed length
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	253 * 4 bytes: uncompressed length
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	254 * 4 bytes: base revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	255 * 4 bytes: link revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	256 * 4 bytes: parent 1 revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	257 * 4 bytes: parent 2 revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	258 * 32 bytes: nodeid (only 20 bytes used)
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	259 */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	260 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	261 {
7154 7fdf7a0a41b7 index parser: fix refcounting in case of errors, refactor Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7135 diff changeset	262 uint64_t offset_flags;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	263 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	264 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	265 const char *data;
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	266 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	267 PyObject *entry;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	268
38852 a3dacabd476b index: don't allow index[len(index)] to mean nullid Martin von Zweigbergk <martinvonz@google.com> parents: 38851 diff changeset	269 if (pos == -1) {
38847 f3d394ea17db index: handle index[-1] as nullid more explicitly Martin von Zweigbergk <martinvonz@google.com> parents: 38846 diff changeset	270 Py_INCREF(nullentry);
f3d394ea17db index: handle index[-1] as nullid more explicitly Martin von Zweigbergk <martinvonz@google.com> parents: 38846 diff changeset	271 return nullentry;
f3d394ea17db index: handle index[-1] as nullid more explicitly Martin von Zweigbergk <martinvonz@google.com> parents: 38846 diff changeset	272 }
f3d394ea17db index: handle index[-1] as nullid more explicitly Martin von Zweigbergk <martinvonz@google.com> parents: 38846 diff changeset	273
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	274 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	275 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	276 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	277 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	278
39068 52e9bf215f96 index: don't include nullid in the internal "length" field Martin von Zweigbergk <martinvonz@google.com> parents: 38944 diff changeset	279 if (pos >= self->length) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	280 PyObject *obj;
39068 52e9bf215f96 index: don't include nullid in the internal "length" field Martin von Zweigbergk <martinvonz@google.com> parents: 38944 diff changeset	281 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	282 Py_INCREF(obj);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	283 return obj;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	284 }
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 if (self->cache) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	287 if (self->cache[pos]) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	288 Py_INCREF(self->cache[pos]);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	289 return self->cache[pos];
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	290 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	291 } else {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	292 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	293 if (self->cache == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	294 return PyErr_NoMemory();
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	295 }
7190 aecea6934fdd Some additional space/tab cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 7186 diff changeset	296
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	297 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	298 if (data == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	299 return NULL;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	300
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	301 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	302 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	303 offset_flags &= 0xFFFF;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	304 else {
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	305 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	306 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	307 }
7154 7fdf7a0a41b7 index parser: fix refcounting in case of errors, refactor Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7135 diff changeset	308
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	309 comp_len = getbe32(data + 8);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	310 uncomp_len = getbe32(data + 12);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	311 base_rev = getbe32(data + 16);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	312 link_rev = getbe32(data + 20);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	313 parent_1 = getbe32(data + 24);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	314 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	315 c_node_id = data + 32;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	316
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	317 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	318 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	319 20);
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	320
19726 b3c8c6f2b5c1 parsers: use Py_INCREF safely Bryan O'Sullivan <bryano@fb.com> parents: 19725 diff changeset	321 if (entry) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	322 PyObject_GC_UnTrack(entry);
19726 b3c8c6f2b5c1 parsers: use Py_INCREF safely Bryan O'Sullivan <bryano@fb.com> parents: 19725 diff changeset	323 Py_INCREF(entry);
b3c8c6f2b5c1 parsers: use Py_INCREF safely Bryan O'Sullivan <bryano@fb.com> parents: 19725 diff changeset	324 }
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	325
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	326 self->cache[pos] = entry;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	327
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	328 return entry;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	329 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	330
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	331 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	332 * 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	333 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	334 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	335 {
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	336 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	337 const char *data;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	338
38867 4c0fd3f0a15d index: drop support for nullid at position len(index) in index_node Martin von Zweigbergk <martinvonz@google.com> parents: 38866 diff changeset	339 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	340 return nullid;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	341
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	342 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	343 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	344
39068 52e9bf215f96 index: don't include nullid in the internal "length" field Martin von Zweigbergk <martinvonz@google.com> parents: 38944 diff changeset	345 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	346 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	347 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	348 str = PyTuple_GetItem(tuple, 7);
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	349 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	350 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	351
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	352 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	353 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	354 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	355
37860 a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	356 /*
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	357 * 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	358 * 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	359 */
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	360 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	361 {
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	362 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	363 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	364 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	365 (int)pos);
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	366 }
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	367 return node;
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	368 }
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	369
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	370 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	371
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	372 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	373 {
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	374 Py_ssize_t nodelen;
49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	375 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	376 return -1;
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	377 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	378 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	379 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	380 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	381 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	382
38850 6104b203bec8 index: replace insert(-1, e) method by append(e) method Martin von Zweigbergk <martinvonz@google.com> parents: 38848 diff changeset	383 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	384 {
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	385 char *node;
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	386 Py_ssize_t len;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	387
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	388 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	389 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	390 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	391 }
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	392
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	393 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	394 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	395
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	396 len = index_length(self);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	397
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	398 if (self->added == NULL) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	399 self->added = PyList_New(0);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	400 if (self->added == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	401 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	402 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	403
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	404 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	405 return NULL;
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	406
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	407 if (self->ntinitialized)
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	408 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	409
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	410 Py_CLEAR(self->headrevs);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	411 Py_RETURN_NONE;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	412 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	413
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	414 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	415 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	416 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	417 PyObject *s = NULL;
23948 bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	418 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	419
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	420 if (obj == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	421 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	422
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	423 #define istat(__n, __d) \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	424 do { \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	425 s = PyBytes_FromString(__d); \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	426 t = PyInt_FromSsize_t(self->__n); \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	427 if (!s \|\| !t) \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	428 goto bail; \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	429 if (PyDict_SetItem(obj, s, t) == -1) \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	430 goto bail; \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	431 Py_CLEAR(s); \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	432 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	433 } while (0)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	434
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	435 if (self->added) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	436 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	437 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	438 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	439 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	440 goto bail;
40455 88702fd208ce py3: convert revlog stats to a dict of (bytes, int) pairs Yuya Nishihara <yuya@tcha.org> parents: 40300 diff changeset	441 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	442 goto bail;
40455 88702fd208ce py3: convert revlog stats to a dict of (bytes, int) pairs Yuya Nishihara <yuya@tcha.org> parents: 40300 diff changeset	443 Py_CLEAR(s);
88702fd208ce py3: convert revlog stats to a dict of (bytes, int) pairs Yuya Nishihara <yuya@tcha.org> parents: 40300 diff changeset	444 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	445 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	446
39068 52e9bf215f96 index: don't include nullid in the internal "length" field Martin von Zweigbergk <martinvonz@google.com> parents: 38944 diff changeset	447 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	448 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	449 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	450 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	451 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	452 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	453 if (self->ntinitialized) {
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	454 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	455 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	456 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	457 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	458 }
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	459
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	460 #undef istat
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	461
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	462 return obj;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	463
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	464 bail:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	465 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	466 Py_XDECREF(s);
23948 bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	467 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	468 return NULL;
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
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	471 /*
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	472 * 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	473 * the cached copy.
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	474 */
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	475 static PyObject list_copy(PyObject list)
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	476 {
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	477 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	478 PyObject *newlist = PyList_New(len);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	479 Py_ssize_t i;
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	480
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	481 if (newlist == NULL)
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	482 return NULL;
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	483
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	484 for (i = 0; i < len; i++) {
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	485 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	486 Py_INCREF(obj);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	487 PyList_SET_ITEM(newlist, i, obj);
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
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	490 return newlist;
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
34440 7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	493 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	494 {
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	495 if (filter) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	496 PyObject arglist, result;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	497 int isfiltered;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	498
26107 50582df9d7a7 parsers: fix two cases of unsigned long instead of Py_ssize_t Augie Fackler <augie@google.com> parents: 26098 diff changeset	499 arglist = Py_BuildValue("(n)", arg);
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	500 if (!arglist) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	501 return -1;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	502 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	503
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	504 result = PyEval_CallObject(filter, arglist);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	505 Py_DECREF(arglist);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	506 if (!result) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	507 return -1;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	508 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	509
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	510 /* 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	511 * 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	512 isfiltered = PyObject_IsTrue(result);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	513 Py_DECREF(result);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	514 return isfiltered;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	515 } else {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	516 return 0;
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 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	519
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	520 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	521 Py_ssize_t marker, char *phases)
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	522 {
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	523 PyObject *iter = NULL;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	524 PyObject *iter_item = NULL;
38851 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38850 diff changeset	525 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	526 long iter_item_long;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	527
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	528 if (PyList_GET_SIZE(list) != 0) {
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	529 iter = PyObject_GetIter(list);
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	530 if (iter == NULL)
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	531 return -2;
34437 ce26a13869fb cext: move braces for control statements to same line Gregory Szorc <gregory.szorc@gmail.com> parents: 33758 diff changeset	532 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	533 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	534 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	535 return -2;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	536 }
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	537 Py_DECREF(iter_item);
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	538 if (iter_item_long < min_idx)
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	539 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	540 phases[iter_item_long] = (char)marker;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	541 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	542 Py_DECREF(iter);
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	543 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	544
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	545 return min_idx;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	546 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	547
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	548 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	549 int parent_2, Py_ssize_t i)
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	550 {
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	551 if (parent_1 >= 0 && phases[parent_1] > phases[i])
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	552 phases[i] = phases[parent_1];
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	553 if (parent_2 >= 0 && phases[parent_2] > phases[i])
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	554 phases[i] = phases[parent_2];
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
26053 b68c9d232db6 reachableroots: use internal "revstates" array to test if rev is a root Yuya Nishihara <yuya@tcha.org> parents: 26052 diff changeset	557 static PyObject reachableroots2(indexObject self, PyObject *args)
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	558 {
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	559
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	560 /* Input */
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	561 long minroot;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	562 PyObject *includepatharg = NULL;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	563 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	564 /* heads and roots are lists */
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	565 PyObject *heads = NULL;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	566 PyObject *roots = NULL;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	567 PyObject *reachable = NULL;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	568
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	569 PyObject *val;
38851 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38850 diff changeset	570 Py_ssize_t len = index_length(self);
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	571 long revnum;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	572 Py_ssize_t k;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	573 Py_ssize_t i;
26042 2a3010ba6f52 reachableroots: give anonymous name to short-lived "numheads" variable Yuya Nishihara <yuya@tcha.org> parents: 26041 diff changeset	574 Py_ssize_t l;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	575 int r;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	576 int parents[2];
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	577
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	578 /* Internal data structure:
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	579 * 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	580 * lentovisit
40561 5c14bf0c5be3 revlog: add blank line in comment to help clang-format Augie Fackler <augie@google.com> parents: 40560 diff changeset	581 *
26044 b3ad349d0e50 reachableroots: extend "revstates" to array of bit flags Yuya Nishihara <yuya@tcha.org> parents: 26043 diff changeset	582 * 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	583 int *tovisit = NULL;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	584 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	585 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	586 char *revstates = NULL;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	587
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	588 /* Get arguments */
26009 bbb698697efc reachableroots: fix transposition of set and list types in PyArg_ParseTuple Augie Fackler <augie@google.com> parents: 26008 diff changeset	589 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	590 &PyList_Type, &roots, &PyBool_Type,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	591 &includepatharg))
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	592 goto bail;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	593
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	594 if (includepatharg == Py_True)
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	595 includepath = 1;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	596
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	597 /* Initialize return set */
26055 607868eccaa7 reachableroots: return list of revisions instead of set Yuya Nishihara <yuya@tcha.org> parents: 26054 diff changeset	598 reachable = PyList_New(0);
607868eccaa7 reachableroots: return list of revisions instead of set Yuya Nishihara <yuya@tcha.org> parents: 26054 diff changeset	599 if (reachable == NULL)
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 /* Initialize internal datastructures */
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	603 tovisit = (int )malloc((len + 1) sizeof(int));
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	604 if (tovisit == NULL) {
26008 59d57ea69ae6 reachableroots: consistently use short-form of PyErr_NoMemory() Augie Fackler <augie@google.com> parents: 26007 diff changeset	605 PyErr_NoMemory();
26016 c8d41c9c23c7 reachableroots: unify bail cases to raise exception correctly Yuya Nishihara <yuya@tcha.org> parents: 26015 diff changeset	606 goto bail;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	607 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	608
26043 f2f0a3ab6e41 reachableroots: rename "seen" array to "revstates" for future extension Yuya Nishihara <yuya@tcha.org> parents: 26042 diff changeset	609 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	610 if (revstates == NULL) {
26008 59d57ea69ae6 reachableroots: consistently use short-form of PyErr_NoMemory() Augie Fackler <augie@google.com> parents: 26007 diff changeset	611 PyErr_NoMemory();
26016 c8d41c9c23c7 reachableroots: unify bail cases to raise exception correctly Yuya Nishihara <yuya@tcha.org> parents: 26015 diff changeset	612 goto bail;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	613 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	614
26053 b68c9d232db6 reachableroots: use internal "revstates" array to test if rev is a root Yuya Nishihara <yuya@tcha.org> parents: 26052 diff changeset	615 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	616 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	617 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	618 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	619 goto bail;
b68c9d232db6 reachableroots: use internal "revstates" array to test if rev is a root Yuya Nishihara <yuya@tcha.org> parents: 26052 diff changeset	620 /* 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	621 * 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	622 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	623 continue;
b68c9d232db6 reachableroots: use internal "revstates" array to test if rev is a root Yuya Nishihara <yuya@tcha.org> parents: 26052 diff changeset	624 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	625 }
b68c9d232db6 reachableroots: use internal "revstates" array to test if rev is a root Yuya Nishihara <yuya@tcha.org> parents: 26052 diff changeset	626
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	627 /* 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	628 l = PyList_GET_SIZE(heads);
2a3010ba6f52 reachableroots: give anonymous name to short-lived "numheads" variable Yuya Nishihara <yuya@tcha.org> parents: 26041 diff changeset	629 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	630 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	631 if (revnum == -1 && PyErr_Occurred())
c6115c30a376 reachableroots: verify type of each item of heads argument Yuya Nishihara <yuya@tcha.org> parents: 26017 diff changeset	632 goto bail;
26017 44705659da94 reachableroots: verify integer range of heads argument (issue4775) Yuya Nishihara <yuya@tcha.org> parents: 26016 diff changeset	633 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	634 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	635 goto bail;
44705659da94 reachableroots: verify integer range of heads argument (issue4775) Yuya Nishihara <yuya@tcha.org> parents: 26016 diff changeset	636 }
26044 b3ad349d0e50 reachableroots: extend "revstates" to array of bit flags Yuya Nishihara <yuya@tcha.org> parents: 26043 diff changeset	637 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	638 tovisit[lentovisit++] = (int)revnum;
26044 b3ad349d0e50 reachableroots: extend "revstates" to array of bit flags Yuya Nishihara <yuya@tcha.org> parents: 26043 diff changeset	639 revstates[revnum + 1] \|= RS_SEEN;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	640 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	641 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	642
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	643 /* Visit the tovisit list and find the reachable roots */
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	644 k = 0;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	645 while (k < lentovisit) {
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	646 /* 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	647 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	648 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	649 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	650 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	651 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	652 goto bail;
26058 e7fe0a12376c reachableroots: handle error of PyList_Append() Yuya Nishihara <yuya@tcha.org> parents: 26055 diff changeset	653 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	654 Py_DECREF(val);
26058 e7fe0a12376c reachableroots: handle error of PyList_Append() Yuya Nishihara <yuya@tcha.org> parents: 26055 diff changeset	655 if (r < 0)
e7fe0a12376c reachableroots: handle error of PyList_Append() Yuya Nishihara <yuya@tcha.org> parents: 26055 diff changeset	656 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	657 if (includepath == 0)
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	658 continue;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	659 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	660
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	661 /* 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	662 if (revnum == -1)
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	663 continue;
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	664 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	665 if (r < 0)
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	666 goto bail;
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	667 for (i = 0; i < 2; i++) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	668 if (!(revstates[parents[i] + 1] & RS_SEEN) &&
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	669 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	670 tovisit[lentovisit++] = parents[i];
26044 b3ad349d0e50 reachableroots: extend "revstates" to array of bit flags Yuya Nishihara <yuya@tcha.org> parents: 26043 diff changeset	671 revstates[parents[i] + 1] \|= RS_SEEN;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	672 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	673 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	674 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	675
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	676 /* 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	677 * and add them to the reachable set */
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	678 if (includepath == 1) {
26080 83c9edcac05c reachableroots: silence warning of implicit integer narrowing issued by clang Yuya Nishihara <yuya@tcha.org> parents: 26079 diff changeset	679 long minidx = minroot;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	680 if (minidx < 0)
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	681 minidx = 0;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	682 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	683 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	684 continue;
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	685 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	686 /* 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	687 * index_get_parents */
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	688 if (r < 0)
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	689 goto bail;
26059 8779ce81ea80 reachableroots: unroll loop that checks if one of parents is reachable Yuya Nishihara <yuya@tcha.org> parents: 26058 diff changeset	690 if (((revstates[parents[0] + 1] \|
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	691 revstates[parents[1] + 1]) &
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	692 RS_REACHABLE) &&
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	693 !(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	694 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	695 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	696 if (val == NULL)
8779ce81ea80 reachableroots: unroll loop that checks if one of parents is reachable Yuya Nishihara <yuya@tcha.org> parents: 26058 diff changeset	697 goto bail;
8779ce81ea80 reachableroots: unroll loop that checks if one of parents is reachable Yuya Nishihara <yuya@tcha.org> parents: 26058 diff changeset	698 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	699 Py_DECREF(val);
8779ce81ea80 reachableroots: unroll loop that checks if one of parents is reachable Yuya Nishihara <yuya@tcha.org> parents: 26058 diff changeset	700 if (r < 0)
8779ce81ea80 reachableroots: unroll loop that checks if one of parents is reachable Yuya Nishihara <yuya@tcha.org> parents: 26058 diff changeset	701 goto bail;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	702 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	703 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	704 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	705
26043 f2f0a3ab6e41 reachableroots: rename "seen" array to "revstates" for future extension Yuya Nishihara <yuya@tcha.org> parents: 26042 diff changeset	706 free(revstates);
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	707 free(tovisit);
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	708 return reachable;
26016 c8d41c9c23c7 reachableroots: unify bail cases to raise exception correctly Yuya Nishihara <yuya@tcha.org> parents: 26015 diff changeset	709 bail:
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	710 Py_XDECREF(reachable);
26043 f2f0a3ab6e41 reachableroots: rename "seen" array to "revstates" for future extension Yuya Nishihara <yuya@tcha.org> parents: 26042 diff changeset	711 free(revstates);
26016 c8d41c9c23c7 reachableroots: unify bail cases to raise exception correctly Yuya Nishihara <yuya@tcha.org> parents: 26015 diff changeset	712 free(tovisit);
26010 2c03e521a0c5 reachableroots: return NULL if we're throwing an exception Augie Fackler <augie@google.com> parents: 26009 diff changeset	713 return NULL;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	714 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	715
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	716 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	717 {
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	718 PyObject *roots = Py_None;
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	719 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	720 PyObject *phasessize = NULL;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	721 PyObject *phaseroots = NULL;
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	722 PyObject *phaseset = NULL;
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	723 PyObject *phasessetlist = NULL;
25911 f4386cb3252e parsers: fix memory leak in compute_phases_map_sets Laurent Charignon <lcharignon@fb.com> parents: 25860 diff changeset	724 PyObject *rev = NULL;
38851 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38850 diff changeset	725 Py_ssize_t len = index_length(self);
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	726 Py_ssize_t numphase = 0;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	727 Py_ssize_t minrevallphases = 0;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	728 Py_ssize_t minrevphase = 0;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	729 Py_ssize_t i = 0;
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	730 char *phases = NULL;
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	731 long phase;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	732
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	733 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	734 goto done;
36623 a472a897c340 cext: fix computephasesmapsets() not to return without setting an exception Yuya Nishihara <yuya@tcha.org> parents: 36621 diff changeset	735 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	736 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	737 goto done;
36623 a472a897c340 cext: fix computephasesmapsets() not to return without setting an exception Yuya Nishihara <yuya@tcha.org> parents: 36621 diff changeset	738 }
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	739
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	740 phases = calloc(
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	741 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	742 if (phases == NULL) {
ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	743 PyErr_NoMemory();
ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	744 goto done;
ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	745 }
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	746 /* 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	747 numphase = PyList_GET_SIZE(roots) + 1;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	748 minrevallphases = len + 1;
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	749 phasessetlist = PyList_New(numphase);
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	750 if (phasessetlist == NULL)
27364 ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	751 goto done;
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	752
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	753 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	754 Py_INCREF(Py_None);
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	755
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	756 for (i = 0; i < numphase - 1; i++) {
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	757 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	758 phaseset = PySet_New(NULL);
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	759 if (phaseset == NULL)
27364 ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	760 goto release;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	761 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	762 if (!PyList_Check(phaseroots)) {
a472a897c340 cext: fix computephasesmapsets() not to return without setting an exception Yuya Nishihara <yuya@tcha.org> parents: 36621 diff changeset	763 PyErr_SetString(PyExc_TypeError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	764 "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	765 goto release;
36623 a472a897c340 cext: fix computephasesmapsets() not to return without setting an exception Yuya Nishihara <yuya@tcha.org> parents: 36621 diff changeset	766 }
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	767 minrevphase =
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	768 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	769 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	770 goto release;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	771 minrevallphases = MIN(minrevallphases, minrevphase);
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	772 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	773 /* 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	774 if (minrevallphases != -1) {
25312 ee02728dd5f9 parsers: simplify the code computing the phases Laurent Charignon <lcharignon@fb.com> parents: 25311 diff changeset	775 int parents[2];
ee02728dd5f9 parsers: simplify the code computing the phases Laurent Charignon <lcharignon@fb.com> parents: 25311 diff changeset	776 for (i = minrevallphases; i < len; i++) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	777 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	778 0)
27364 ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	779 goto release;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	780 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	781 i);
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	782 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	783 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	784 /* 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	785 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	786 if (phasessize == NULL)
27364 ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	787 goto release;
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	788 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	789 phase = phases[i];
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	790 /* 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	791 * 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	792 if (phase != 0) {
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	793 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	794 rev = PyInt_FromSsize_t(i);
27365 ec04370bdfaf parsers: check results of PyInt_FromLong (issue4771) Bryan O'Sullivan <bos@serpentine.com> parents: 27364 diff changeset	795 if (rev == NULL)
ec04370bdfaf parsers: check results of PyInt_FromLong (issue4771) Bryan O'Sullivan <bos@serpentine.com> parents: 27364 diff changeset	796 goto release;
25911 f4386cb3252e parsers: fix memory leak in compute_phases_map_sets Laurent Charignon <lcharignon@fb.com> parents: 25860 diff changeset	797 PySet_Add(phaseset, rev);
f4386cb3252e parsers: fix memory leak in compute_phases_map_sets Laurent Charignon <lcharignon@fb.com> parents: 25860 diff changeset	798 Py_XDECREF(rev);
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	799 }
22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	800 }
35309 d13526333835 phases: drop the list with phase of each rev, always comput phase sets Joerg Sonnenberger <joerg@bec.de> parents: 34861 diff changeset	801 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	802
27364 ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	803 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	804 Py_XDECREF(phasessize);
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	805 Py_XDECREF(phasessetlist);
27364 ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	806 done:
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	807 free(phases);
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	808 return ret;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	809 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	810
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	811 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	812 {
25297 3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	813 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	814 char *nothead = NULL;
22540 9a860ac8c216 parsers: fix uninitialize variable warning David Soria Parra <davidsp@fb.com> parents: 22484 diff changeset	815 PyObject *heads = NULL;
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	816 PyObject *filter = NULL;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	817 PyObject *filteredrevs = Py_None;
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	818
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	819 if (!PyArg_ParseTuple(args, "\|O", &filteredrevs)) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	820 return NULL;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	821 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	822
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	823 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	824 return list_copy(self->headrevs);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	825
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	826 Py_DECREF(self->filteredrevs);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	827 self->filteredrevs = filteredrevs;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	828 Py_INCREF(filteredrevs);
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 if (filteredrevs != Py_None) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	831 filter = PyObject_GetAttrString(filteredrevs, "__contains__");
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	832 if (!filter) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	833 PyErr_SetString(
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	834 PyExc_TypeError,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	835 "filteredrevs has no attribute __contains__");
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	836 goto bail;
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 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	839
38851 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38850 diff changeset	840 len = index_length(self);
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	841 heads = PyList_New(0);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	842 if (heads == NULL)
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	843 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	844 if (len == 0) {
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	845 PyObject *nullid = PyInt_FromLong(-1);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	846 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	847 Py_XDECREF(nullid);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	848 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	849 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	850 goto done;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	851 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	852
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	853 nothead = calloc(len, 1);
27366 7e8a883da171 parsers: add a missed PyErr_NoMemory Bryan O'Sullivan <bos@serpentine.com> parents: 27365 diff changeset	854 if (nothead == NULL) {
7e8a883da171 parsers: add a missed PyErr_NoMemory Bryan O'Sullivan <bos@serpentine.com> parents: 27365 diff changeset	855 PyErr_NoMemory();
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	856 goto bail;
27366 7e8a883da171 parsers: add a missed PyErr_NoMemory Bryan O'Sullivan <bos@serpentine.com> parents: 27365 diff changeset	857 }
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	858
28386 1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	859 for (i = len - 1; i >= 0; i--) {
25297 3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	860 int isfiltered;
3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	861 int parents[2];
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	862
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	863 /* 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	864 * 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	865 * 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	866 */
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	867 if (nothead[i] != 1) {
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	868 isfiltered = check_filter(filter, i);
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	869 if (isfiltered == -1) {
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	870 PyErr_SetString(PyExc_TypeError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	871 "unable to check filter");
28386 1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	872 goto bail;
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	873 }
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 (isfiltered) {
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	876 nothead[i] = 1;
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	877 continue;
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	878 }
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	879 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	880
25860 895f04955a49 parsers: silence warning of implicit integer conversion issued by clang Yuya Nishihara <yuya@tcha.org> parents: 25810 diff changeset	881 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	882 goto bail;
25297 3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	883 for (j = 0; j < 2; j++) {
3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	884 if (parents[j] >= 0)
3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	885 nothead[parents[j]] = 1;
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	886 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	887 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	888
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	889 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	890 PyObject *head;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	891
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	892 if (nothead[i])
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	893 continue;
22400 888bc106de83 parsers: fix typing issue when constructing Python integer object Henrik Stuart <hg@hstuart.dk> parents: 22399 diff changeset	894 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	895 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	896 Py_XDECREF(head);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	897 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	898 }
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
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	901 done:
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	902 self->headrevs = heads;
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	903 Py_XDECREF(filter);
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	904 free(nothead);
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	905 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	906 bail:
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	907 Py_XDECREF(filter);
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	908 Py_XDECREF(heads);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	909 free(nothead);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	910 return NULL;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	911 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	912
33174 f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	913 /**
f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	914 * 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	915 *
f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	916 * 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	917 */
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	918 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	919 {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	920 const char *data;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	921
39068 52e9bf215f96 index: don't include nullid in the internal "length" field Martin von Zweigbergk <martinvonz@google.com> parents: 38944 diff changeset	922 if (rev >= self->length) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	923 PyObject *tuple =
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	924 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	925 long ret;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	926 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	927 return -2;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	928 }
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	929 return (int)ret;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	930 } else {
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	931 data = index_deref(self, rev);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	932 if (data == NULL) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	933 return -2;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	934 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	935
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	936 return getbe32(data + 16);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	937 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	938 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	939
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	940 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	941 {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	942 int rev, generaldelta;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	943 PyObject *stoparg;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	944 int stoprev, iterrev, baserev = -1;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	945 int stopped;
33174 f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	946 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	947 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	948
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	949 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	950 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	951 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	952
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	953 if (PyInt_Check(stoparg)) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	954 stoprev = (int)PyInt_AsLong(stoparg);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	955 if (stoprev == -1 && PyErr_Occurred()) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	956 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	957 }
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	958 } else if (stoparg == Py_None) {
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	959 stoprev = -2;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	960 } else {
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	961 PyErr_SetString(PyExc_ValueError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	962 "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	963 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	964 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	965
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	966 if (rev < 0 \|\| rev >= length) {
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	967 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	968 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	969 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	970
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	971 chain = PyList_New(0);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	972 if (chain == NULL) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	973 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	974 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	975
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	976 baserev = index_baserev(self, rev);
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 /* This should never happen. */
33174 f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	979 if (baserev <= -2) {
f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	980 /* 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	981 assert(PyErr_Occurred());
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	982 goto bail;
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
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	985 iterrev = rev;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	986
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	987 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	988 PyObject *value = PyInt_FromLong(iterrev);
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	989 if (value == NULL) {
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 if (PyList_Append(chain, value)) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	993 Py_DECREF(value);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	994 goto bail;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	995 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	996 Py_DECREF(value);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	997
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	998 if (generaldelta) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	999 iterrev = baserev;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1000 } else {
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1001 iterrev--;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1002 }
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 if (iterrev < 0) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1005 break;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1006 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1007
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	1008 if (iterrev >= length) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1009 PyErr_SetString(PyExc_IndexError,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1010 "revision outside index");
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1011 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1012 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1013
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1014 baserev = index_baserev(self, iterrev);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1015
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1016 /* This should never happen. */
33174 f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	1017 if (baserev <= -2) {
f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	1018 /* 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	1019 assert(PyErr_Occurred());
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1020 goto bail;
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 }
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 if (iterrev == stoprev) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1025 stopped = 1;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1026 } else {
33174 f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	1027 PyObject *value = PyInt_FromLong(iterrev);
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1028 if (value == NULL) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1029 goto bail;
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 if (PyList_Append(chain, value)) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1032 Py_DECREF(value);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1033 goto bail;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1034 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1035 Py_DECREF(value);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1036
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1037 stopped = 0;
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
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1040 if (PyList_Reverse(chain)) {
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
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1044 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	1045 Py_DECREF(chain);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1046 return result;
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 bail:
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1049 Py_DECREF(chain);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1050 return NULL;
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
16618 6bae941b58ad parsers: change the type of nt_level Bryan O'Sullivan <bryano@fb.com> parents: 16617 diff changeset	1053 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	1054 {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1055 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	1056 if (!(level & 1))
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1057 v >>= 4;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1058 return v & 0xf;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1059 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1060
16616 8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1061 /*
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1062 * Return values:
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1063 *
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1064 * -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	1065 * -2: not found
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1066 * rest: valid rev
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1067 */
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1068 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	1069 int hex)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1070 {
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1071 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	1072 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	1073
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1074 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	1075 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1076
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1077 if (hex)
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1078 maxlevel = nodelen > 40 ? 40 : (int)nodelen;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1079 else
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1080 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	1081
e6dfbc5df76f parsers: use the correct maximum radix tree depth Bryan O'Sullivan <bryano@fb.com> parents: 16604 diff changeset	1082 for (level = off = 0; level < maxlevel; level++) {
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1083 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	1084 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	1085 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	1086
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1087 if (v < 0) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1088 const char *n;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1089 Py_ssize_t i;
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1090
38846 f738c502e43b index: store nullrev as -1 in nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38845 diff changeset	1091 v = -(v + 2);
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1092 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	1093 if (n == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1094 return -2;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1095 for (i = level; i < maxlevel; i++)
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1096 if (getnybble(node, i) != nt_level(n, i))
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1097 return -2;
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1098 return v;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1099 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1100 if (v == 0)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1101 return -2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1102 off = v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1103 }
16616 8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1104 /* 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	1105 return -4;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1106 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1107
38915 fff675dfb80b index: pass only nodetree to nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38914 diff changeset	1108 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	1109 {
38915 fff675dfb80b index: pass only nodetree to nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38914 diff changeset	1110 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	1111 unsigned newcapacity;
dcd395dc98d8 index: remove side-effect from failed nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38937 diff changeset	1112 nodetreenode *newnodes;
39071 06ff7ea4f440 index: avoid duplicating capacity-growth expression Martin von Zweigbergk <martinvonz@google.com> parents: 39070 diff changeset	1113 newcapacity = self->capacity * 2;
06ff7ea4f440 index: avoid duplicating capacity-growth expression Martin von Zweigbergk <martinvonz@google.com> parents: 39070 diff changeset	1114 if (newcapacity >= INT_MAX / sizeof(nodetreenode)) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1115 PyErr_SetString(PyExc_MemoryError,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1116 "overflow in nt_new");
24623 2262d7bc469e parsers: check for memory allocation overflows more carefully Bryan O'Sullivan <bryano@fb.com> parents: 24622 diff changeset	1117 return -1;
2262d7bc469e parsers: check for memory allocation overflows more carefully Bryan O'Sullivan <bryano@fb.com> parents: 24622 diff changeset	1118 }
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1119 newnodes =
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1120 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	1121 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	1122 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	1123 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1124 }
38938 dcd395dc98d8 index: remove side-effect from failed nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38937 diff changeset	1125 self->capacity = newcapacity;
dcd395dc98d8 index: remove side-effect from failed nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38937 diff changeset	1126 self->nodes = newnodes;
38915 fff675dfb80b index: pass only nodetree to nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38914 diff changeset	1127 memset(&self->nodes[self->length], 0,
fff675dfb80b index: pass only nodetree to nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38914 diff changeset	1128 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	1129 }
38915 fff675dfb80b index: pass only nodetree to nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38914 diff changeset	1130 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	1131 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1132
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1133 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	1134 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1135 int level = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1136 int off = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1137
16641 e6dfbc5df76f parsers: use the correct maximum radix tree depth Bryan O'Sullivan <bryano@fb.com> parents: 16604 diff changeset	1138 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	1139 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	1140 nodetreenode *n;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1141 int v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1142
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1143 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	1144 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	1145
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1146 if (v == 0) {
38846 f738c502e43b index: store nullrev as -1 in nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38845 diff changeset	1147 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	1148 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1149 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1150 if (v < 0) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1151 const char *oldnode =
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1152 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	1153 int noff;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1154
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	1155 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	1156 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	1157 if (!memcmp(oldnode, node, 20)) {
38846 f738c502e43b index: store nullrev as -1 in nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38845 diff changeset	1158 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	1159 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1160 }
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1161 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	1162 if (noff == -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1163 return -1;
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1164 /* 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	1165 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	1166 off = noff;
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1167 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	1168 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	1169 if (level > self->depth)
b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1170 self->depth = level;
b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1171 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	1172 } else {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1173 level += 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1174 off = v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1175 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1176 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1177
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1178 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1179 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1180
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1181 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	1182 {
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1183 Py_ssize_t rev;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1184 const char *node;
39227 42cc76d0f836 cext: fix revlog compiler error on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 39226 diff changeset	1185 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	1186 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	1187 return NULL;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1188 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	1189 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	1190 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	1191 return NULL;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1192 }
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1193 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	1194 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	1195 return NULL;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1196 Py_RETURN_NONE;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1197 }
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1198
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1199 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	1200 {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1201 /* 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	1202 */
38846 f738c502e43b index: store nullrev as -1 in nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38845 diff changeset	1203 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	1204 }
f9fc59ea3135 index: create function for deleting node from nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38821 diff changeset	1205
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1206 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	1207 {
39225 fcaffbd7e635 index: fix a comment about overflow-checking Martin von Zweigbergk <martinvonz@google.com> parents: 39219 diff changeset	1208 /* 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	1209 self->nodes = NULL;
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1210
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1211 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	1212 /* 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	1213 * 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	1214 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	1215 self->depth = 0;
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1216 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	1217 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	1218 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	1219 return -1;
4dd92a15fcca index: move check for too large capacity into nt_init() Martin von Zweigbergk <martinvonz@google.com> parents: 39069 diff changeset	1220 }
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1221 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	1222 if (self->nodes == NULL) {
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1223 PyErr_NoMemory();
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1224 return -1;
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1225 }
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1226 self->length = 1;
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1227 return 0;
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1228 }
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1229
39218 b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1230 static PyTypeObject indexType;
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1231
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1232 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	1233 {
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1234 PyObject *index;
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1235 unsigned capacity;
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1236 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	1237 return -1;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1238 Py_INCREF(index);
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1239 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	1240 }
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1241
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1242 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	1243 {
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1244 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	1245 }
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1246
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1247 /*
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1248 * 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	1249 *
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1250 * Return values:
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1251 *
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1252 * -3: error (exception set)
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1253 * -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	1254 * rest: length of shortest prefix
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1255 */
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1256 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	1257 {
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1258 int level, off;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1259
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1260 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	1261 int k, v;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1262 nodetreenode *n = &self->nodes[off];
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1263 k = nt_level(node, level);
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1264 v = n->children[k];
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1265 if (v < 0) {
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1266 const char *n;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1267 v = -(v + 2);
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1268 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	1269 if (n == NULL)
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1270 return -3;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1271 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	1272 /*
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1273 * 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	1274 * 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	1275 * not exist).
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1276 */
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1277 return -2;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1278 return level + 1;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1279 }
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1280 if (v == 0)
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1281 return -2;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1282 off = v;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1283 }
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1284 /*
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1285 * 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	1286 * 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	1287 * 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	1288 */
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1289 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	1290 return -3;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1291 }
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1292
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1293 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	1294 {
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1295 PyObject *val;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1296 char *node;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1297 int length;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1298
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1299 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	1300 return NULL;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1301 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	1302 return NULL;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1303
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1304 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	1305 if (length == -3)
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1306 return NULL;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1307 if (length == -2) {
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1308 raise_revlog_error();
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1309 return NULL;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1310 }
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1311 return PyInt_FromLong(length);
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1312 }
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1313
39218 b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1314 static void nt_dealloc(nodetree *self)
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1315 {
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1316 free(self->nodes);
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1317 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	1318 }
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1319
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1320 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	1321 {
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1322 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	1323 nt_dealloc(&self->nt);
39218 b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1324 PyObject_Del(self);
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1325 }
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1326
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1327 static PyMethodDef ntobj_methods[] = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1328 {"insert", (PyCFunction)ntobj_insert, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1329 "insert an index entry"},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1330 {"shortest", (PyCFunction)ntobj_shortest, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1331 "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	1332 {NULL} /* Sentinel */
39226 7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1333 };
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1334
39218 b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1335 static PyTypeObject nodetreeType = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1336 PyVarObject_HEAD_INIT(NULL, 0) /* header */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1337 "parsers.nodetree", /* tp_name */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1338 sizeof(nodetreeObject), /* tp_basicsize */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1339 0, /* tp_itemsize */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1340 (destructor)ntobj_dealloc, /* tp_dealloc */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1341 0, /* tp_print */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1342 0, /* tp_getattr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1343 0, /* tp_setattr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1344 0, /* tp_compare */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1345 0, /* tp_repr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1346 0, /* tp_as_number */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1347 0, /* tp_as_sequence */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1348 0, /* tp_as_mapping */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1349 0, /* tp_hash */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1350 0, /* tp_call */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1351 0, /* tp_str */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1352 0, /* tp_getattro */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1353 0, /* tp_setattro */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1354 0, /* tp_as_buffer */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1355 Py_TPFLAGS_DEFAULT, /* tp_flags */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1356 "nodetree", /* tp_doc */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1357 0, /* tp_traverse */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1358 0, /* tp_clear */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1359 0, /* tp_richcompare */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1360 0, /* tp_weaklistoffset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1361 0, /* tp_iter */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1362 0, /* tp_iternext */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1363 ntobj_methods, /* tp_methods */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1364 0, /* tp_members */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1365 0, /* tp_getset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1366 0, /* tp_base */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1367 0, /* tp_dict */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1368 0, /* tp_descr_get */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1369 0, /* tp_descr_set */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1370 0, /* tp_dictoffset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1371 (initproc)ntobj_init, /* tp_init */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1372 0, /* tp_alloc */
39218 b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1373 };
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1374
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1375 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	1376 {
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1377 if (!self->ntinitialized) {
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1378 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	1379 nt_dealloc(&self->nt);
38912 d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	1380 return -1;
d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	1381 }
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1382 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	1383 nt_dealloc(&self->nt);
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1384 return -1;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1385 }
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1386 self->ntinitialized = 1;
38851 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38850 diff changeset	1387 self->ntrev = (int)index_length(self);
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1388 self->ntlookups = 1;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1389 self->ntmisses = 0;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1390 }
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1391 return 0;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1392 }
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1393
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1394 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1395 * Return values:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1396 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1397 * -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	1398 * -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	1399 * rest: valid rev
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1400 */
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1401 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	1402 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	1403 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1404 int rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1405
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1406 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	1407 return -3;
44bbc89ec5e0 revlog: remove micro-optimization for looking up only nullid Martin von Zweigbergk <martinvonz@google.com> parents: 38819 diff changeset	1408
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1409 self->ntlookups++;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1410 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	1411 if (rev >= -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1412 return rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1413
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1414 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1415 * 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	1416 * 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	1417 * 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	1418 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1419 * 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	1420 * 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	1421 * 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	1422 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1423 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	1424 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	1425 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	1426 if (n == NULL)
37861 a9d9802d577e revlog: don't say "not found" on internal error Martin von Zweigbergk <martinvonz@google.com> parents: 37860 diff changeset	1427 return -3;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1428 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	1429 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	1430 return -3;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1431 break;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1432 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1433 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1434 } else {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1435 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	1436 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	1437 if (n == NULL)
a9d9802d577e revlog: don't say "not found" on internal error Martin von Zweigbergk <martinvonz@google.com> parents: 37860 diff changeset	1438 return -3;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1439 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	1440 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	1441 return -3;
16614 1d800eb9ba52 parsers: update ntrev when we stop scanning Bryan O'Sullivan <bryano@fb.com> parents: 16597 diff changeset	1442 }
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1443 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	1444 break;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1445 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1446 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1447 self->ntrev = rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1448 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1449
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1450 if (rev >= 0)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1451 return rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1452 return -2;
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 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	1456 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1457 char *node;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1458 int rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1459
40598 fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	1460 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	1461 long idx;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	1462 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	1463 return NULL;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	1464 }
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	1465 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	1466 }
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1467
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	1468 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	1469 return NULL;
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	1470 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	1471 if (rev >= -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1472 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	1473 if (rev == -2)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1474 raise_revlog_error();
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1475 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1476 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1477
37929 9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	1478 /*
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	1479 * 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	1480 */
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1481 static int index_populate_nt(indexObject *self)
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1482 {
37929 9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	1483 int rev;
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	1484 if (self->ntrev > 0) {
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	1485 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	1486 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	1487 if (n == NULL)
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	1488 return -1;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1489 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	1490 return -1;
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	1491 }
37930 892592475094 revlog: use literal -1 instead of variable that always has that value Martin von Zweigbergk <martinvonz@google.com> parents: 37929 diff changeset	1492 self->ntrev = -1;
37929 9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	1493 }
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	1494 return 0;
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	1495 }
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	1496
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1497 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	1498 {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1499 const char *fullnode;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1500 int nodelen;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1501 char *node;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1502 int rev, i;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1503
36620 186c6df3a373 py3: bulk-replace 'const char' format specifier passed to PyArg_ParseTuple() Yuya Nishihara <yuya@tcha.org> parents: 36619 diff changeset	1504 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	1505 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1506
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	1507 if (nodelen < 1) {
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1508 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	1509 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1510 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1511
17353 bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	1512 if (nodelen > 40) {
bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	1513 PyErr_SetString(PyExc_ValueError, "key too long");
bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	1514 return NULL;
bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	1515 }
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1516
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1517 for (i = 0; i < nodelen; i++)
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1518 hexdigit(node, i);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1519 if (PyErr_Occurred()) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1520 /* input contains non-hex characters */
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1521 PyErr_Clear();
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1522 Py_RETURN_NONE;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1523 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1524
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1525 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	1526 return NULL;
38942 3e74c01102af index: rename "nt_(indexObject self,...)" functions to "index_" Martin von Zweigbergk <martinvonz@google.com>* parents: 38941 diff changeset	1527 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	1528 return NULL;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1529 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	1530
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1531 switch (rev) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1532 case -4:
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1533 raise_revlog_error();
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1534 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1535 case -2:
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1536 Py_RETURN_NONE;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1537 case -1:
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	1538 return PyBytes_FromStringAndSize(nullid, 20);
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1539 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1540
37860 a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	1541 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	1542 if (fullnode == NULL) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1543 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1544 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	1545 return PyBytes_FromStringAndSize(fullnode, 20);
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1546 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	1547
37968 0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1548 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	1549 {
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1550 PyObject *val;
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1551 char *node;
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1552 int length;
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1553
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1554 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	1555 return NULL;
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	1556 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	1557 return NULL;
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1558
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1559 self->ntlookups++;
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1560 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	1561 return NULL;
38942 3e74c01102af index: rename "nt_(indexObject self,...)" functions to "index_" Martin von Zweigbergk <martinvonz@google.com>* parents: 38941 diff changeset	1562 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	1563 return NULL;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1564 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	1565 if (length == -3)
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1566 return NULL;
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1567 if (length == -2) {
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1568 raise_revlog_error();
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1569 return NULL;
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1570 }
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1571 return PyInt_FromLong(length);
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1572 }
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	1573
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1574 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	1575 {
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1576 PyObject *val;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1577 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	1578 int rev;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1579
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	1580 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	1581 return NULL;
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	1582 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	1583 return NULL;
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	1584 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	1585 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	1586 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1587 if (rev == -2)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1588 Py_RETURN_NONE;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1589 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	1590 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1591
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1592 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	1593 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1594 char *node;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1595
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1596 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	1597 long rev;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	1598 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	1599 return -1;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	1600 }
38866 aa33988ad8ab index: return False for "len(index) in index" Martin von Zweigbergk <martinvonz@google.com> parents: 38852 diff changeset	1601 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	1602 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1603
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	1604 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	1605 return -1;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1606
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	1607 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	1608 case -3:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1609 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1610 case -2:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1611 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1612 default:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1613 return 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1614 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1615 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1616
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1617 typedef uint64_t bitmask;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1618
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1619 /*
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1620 * 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	1621 * 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	1622 * "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	1623 */
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1624 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	1625 int revcount)
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1626 {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1627 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	1628 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	1629 PyObject *gca = PyList_New(0);
20555 4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	1630 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	1631 int maxrev = -1;
22399 9f490afcb067 parsers: use bitmask type consistently in find_gca_candidates Henrik Stuart <hg@hstuart.dk> parents: 21871 diff changeset	1632 bitmask sp;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1633 bitmask *seen;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1634
19727 3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1635 if (gca == NULL)
3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1636 return PyErr_NoMemory();
3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1637
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1638 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	1639 if (revs[i] > maxrev)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1640 maxrev = revs[i];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1641 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1642
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1643 seen = calloc(sizeof(*seen), maxrev + 1);
19727 3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1644 if (seen == NULL) {
3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1645 Py_DECREF(gca);
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1646 return PyErr_NoMemory();
19727 3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	1647 }
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1648
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1649 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	1650 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	1651
20555 4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	1652 interesting = revcount;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1653
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1654 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	1655 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	1656 int parents[2];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1657
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1658 if (!sv)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1659 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1660
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1661 if (sv < poison) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1662 interesting -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1663 if (sv == allseen) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1664 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	1665 if (obj == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1666 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1667 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	1668 Py_DECREF(obj);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1669 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1670 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1671 sv \|= poison;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1672 for (i = 0; i < revcount; i++) {
20555 4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	1673 if (revs[i] == v)
4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	1674 goto done;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1675 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1676 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1677 }
25810 82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	1678 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	1679 goto bail;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1680
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1681 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	1682 int p = parents[i];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1683 if (p == -1)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1684 continue;
19030 48d6f436363e parsers: fix variable declaration position issue Matt Mackall <mpm@selenic.com> parents: 18988 diff changeset	1685 sp = seen[p];
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1686 if (sv < poison) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1687 if (sp == 0) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1688 seen[p] = sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1689 interesting++;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1690 } 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	1691 seen[p] \|= sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1692 } else {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1693 if (sp && sp < poison)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1694 interesting--;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1695 seen[p] = sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1696 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1697 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1698 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1699
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1700 done:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1701 free(seen);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1702 return gca;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1703 bail:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1704 free(seen);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1705 Py_XDECREF(gca);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1706 return NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1707 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1708
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1709 /*
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1710 * 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	1711 * path to the root.
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1712 */
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1713 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	1714 {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1715 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	1716 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	1717 int depth, interesting = NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1718 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	1719 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	1720 long *seen = NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1721 int maxrev = -1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1722 long final;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1723
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1724 if (revcount > capacity) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1725 PyErr_Format(PyExc_OverflowError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1726 "bitset size (%ld) > capacity (%ld)",
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1727 (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	1728 return NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1729 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1730
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1731 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	1732 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	1733 if (n > maxrev)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1734 maxrev = n;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1735 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1736
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1737 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	1738 if (depth == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1739 return PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1740
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1741 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	1742 if (seen == NULL) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1743 PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1744 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1745 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1746
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	1747 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	1748 if (interesting == NULL) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1749 PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1750 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1751 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1752
19502 8704477ad3b6 ancestor.deepest: sort revs in C version Siddharth Agarwal <sid0@fb.com> parents: 19062 diff changeset	1753 if (PyList_Sort(revs) == -1)
8704477ad3b6 ancestor.deepest: sort revs in C version Siddharth Agarwal <sid0@fb.com> parents: 19062 diff changeset	1754 goto bail;
8704477ad3b6 ancestor.deepest: sort revs in C version Siddharth Agarwal <sid0@fb.com> parents: 19062 diff changeset	1755
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1756 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	1757 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	1758 long b = 1l << i;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1759 depth[n] = 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1760 seen[n] = b;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1761 interesting[b] = 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1762 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1763
33475 f501322512b6 parsers: fix invariant bug in find_deepest (issue5623) Sune Foldager <cryo@cyanite.org> parents: 33174 diff changeset	1764 /* 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	1765 * interesting. */
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1766 ninteresting = (int)revcount;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1767
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1768 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	1769 int dv = depth[v];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1770 int parents[2];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1771 long sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1772
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1773 if (dv == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1774 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1775
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1776 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	1777 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	1778 goto bail;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1779
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1780 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	1781 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	1782 long sp;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1783 int dp;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1784
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1785 if (p == -1)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1786 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1787
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1788 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	1789 sp = seen[p];
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1790 if (dp <= dv) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1791 depth[p] = dv + 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1792 if (sp != sv) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1793 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	1794 seen[p] = sv;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1795 if (sp) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1796 interesting[sp] -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1797 if (interesting[sp] == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1798 ninteresting -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1799 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1800 }
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1801 } 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	1802 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	1803 if (nsp == sp)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1804 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1805 seen[p] = nsp;
19503 f2dfda6ac152 ancestor.deepest: decrement ninteresting correctly (issue3984) Wei, Elson <elson.wei@gmail.com> parents: 19502 diff changeset	1806 interesting[sp] -= 1;
33475 f501322512b6 parsers: fix invariant bug in find_deepest (issue5623) Sune Foldager <cryo@cyanite.org> parents: 33174 diff changeset	1807 if (interesting[sp] == 0)
19503 f2dfda6ac152 ancestor.deepest: decrement ninteresting correctly (issue3984) Wei, Elson <elson.wei@gmail.com> parents: 19502 diff changeset	1808 ninteresting -= 1;
33475 f501322512b6 parsers: fix invariant bug in find_deepest (issue5623) Sune Foldager <cryo@cyanite.org> parents: 33174 diff changeset	1809 if (interesting[nsp] == 0)
f501322512b6 parsers: fix invariant bug in find_deepest (issue5623) Sune Foldager <cryo@cyanite.org> parents: 33174 diff changeset	1810 ninteresting += 1;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1811 interesting[nsp] += 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1812 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1813 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1814 interesting[sv] -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1815 if (interesting[sv] == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1816 ninteresting -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1817 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1818
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1819 final = 0;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1820 j = ninteresting;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1821 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	1822 if (interesting[i] == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1823 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1824 final \|= i;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1825 j -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1826 }
21730 8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1827 if (final == 0) {
8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1828 keys = PyList_New(0);
8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1829 goto bail;
8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1830 }
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1831
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1832 dict = PyDict_New();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1833 if (dict == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1834 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1835
19504 2fa303619b4d ancestor.deepest: ignore ninteresting while building result (issue3984) Siddharth Agarwal <sid0@fb.com> parents: 19503 diff changeset	1836 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	1837 PyObject *key;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1838
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1839 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	1840 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1841
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1842 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	1843 Py_INCREF(key);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1844 Py_INCREF(Py_None);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1845 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	1846 Py_DECREF(key);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1847 Py_DECREF(Py_None);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1848 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1849 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1850 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1851
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1852 keys = PyDict_Keys(dict);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1853
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1854 bail:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1855 free(depth);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1856 free(seen);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1857 free(interesting);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1858 Py_XDECREF(dict);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1859
21730 8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	1860 return keys;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1861 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1862
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	1863 /*
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1864 * Given a (possibly overlapping) set of revs, return all the
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1865 * common ancestors heads: heads(::args[0] and ::a[1] and ...)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1866 */
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1867 static PyObject index_commonancestorsheads(indexObject self, PyObject *args)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1868 {
21103 628c16489d1c parsers: remove unnecessary gca variable in index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 21102 diff changeset	1869 PyObject *ret = NULL;
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1870 Py_ssize_t argcount, i, len;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1871 bitmask repeat = 0;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1872 int revcount = 0;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1873 int *revs;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1874
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1875 argcount = PySequence_Length(args);
31469 a43fd9ec2a39 parsers: use Python memory allocator in commonancestorsheads() Gregory Szorc <gregory.szorc@gmail.com> parents: 31426 diff changeset	1876 revs = PyMem_Malloc(argcount * sizeof(*revs));
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1877 if (argcount > 0 && revs == NULL)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1878 return PyErr_NoMemory();
38851 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38850 diff changeset	1879 len = index_length(self);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1880
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1881 for (i = 0; i < argcount; i++) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1882 static const int capacity = 24;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1883 PyObject *obj = PySequence_GetItem(args, i);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1884 bitmask x;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1885 long val;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1886
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1887 if (!PyInt_Check(obj)) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1888 PyErr_SetString(PyExc_TypeError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1889 "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	1890 Py_DECREF(obj);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1891 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1892 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1893 val = PyInt_AsLong(obj);
23945 33d6aaf84c9e parsers.c: fix a memory leak in index_commonancestorsheads Augie Fackler <augie@google.com> parents: 23944 diff changeset	1894 Py_DECREF(obj);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1895 if (val == -1) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1896 ret = PyList_New(0);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1897 goto done;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1898 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1899 if (val < 0 \|\| val >= len) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1900 PyErr_SetString(PyExc_IndexError, "index out of range");
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1901 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1902 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1903 /* this cheesy bloom filter lets us avoid some more
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1904 * expensive duplicate checks in the common set-is-disjoint
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1905 * case */
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1906 x = 1ull << (val & 0x3f);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1907 if (repeat & x) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1908 int k;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1909 for (k = 0; k < revcount; k++) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1910 if (val == revs[k])
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1911 goto duplicate;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1912 }
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1913 } else
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1914 repeat \|= x;
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1915 if (revcount >= capacity) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1916 PyErr_Format(PyExc_OverflowError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1917 "bitset size (%d) > capacity (%d)",
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1918 revcount, capacity);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1919 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1920 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1921 revs[revcount++] = (int)val;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1922 duplicate:;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1923 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1924
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1925 if (revcount == 0) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1926 ret = PyList_New(0);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1927 goto done;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1928 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1929 if (revcount == 1) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1930 PyObject *obj;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1931 ret = PyList_New(1);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1932 if (ret == NULL)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1933 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1934 obj = PyInt_FromLong(revs[0]);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1935 if (obj == NULL)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1936 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1937 PyList_SET_ITEM(ret, 0, obj);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1938 goto done;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1939 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1940
21103 628c16489d1c parsers: remove unnecessary gca variable in index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 21102 diff changeset	1941 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	1942 if (ret == NULL)
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1943 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1944
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1945 done:
31469 a43fd9ec2a39 parsers: use Python memory allocator in commonancestorsheads() Gregory Szorc <gregory.szorc@gmail.com> parents: 31426 diff changeset	1946 PyMem_Free(revs);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1947 return ret;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1948
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1949 bail:
31469 a43fd9ec2a39 parsers: use Python memory allocator in commonancestorsheads() Gregory Szorc <gregory.szorc@gmail.com> parents: 31426 diff changeset	1950 PyMem_Free(revs);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1951 Py_XDECREF(ret);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1952 return NULL;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1953 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1954
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	1955 /*
24004 8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	1956 * 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	1957 * 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	1958 */
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	1959 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	1960 {
26048 0be2f81aadc3 parsers: fix two leaks in index_ancestors Augie Fackler <augie@google.com> parents: 26044 diff changeset	1961 PyObject *ret;
24004 8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	1962 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	1963 if (gca == NULL)
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	1964 return NULL;
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	1965
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	1966 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	1967 return gca;
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	1968 }
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	1969
26048 0be2f81aadc3 parsers: fix two leaks in index_ancestors Augie Fackler <augie@google.com> parents: 26044 diff changeset	1970 ret = find_deepest(self, gca);
0be2f81aadc3 parsers: fix two leaks in index_ancestors Augie Fackler <augie@google.com> parents: 26044 diff changeset	1971 Py_DECREF(gca);
0be2f81aadc3 parsers: fix two leaks in index_ancestors Augie Fackler <augie@google.com> parents: 26044 diff changeset	1972 return ret;
24004 8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	1973 }
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	1974
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	1975 /*
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1976 * 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	1977 */
38942 3e74c01102af index: rename "nt_(indexObject self,...)" functions to "index_" Martin von Zweigbergk <martinvonz@google.com>* parents: 38941 diff changeset	1978 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	1979 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1980 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	1981
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1982 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	1983 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	1984 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	1985
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1986 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	1987 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1988
16732 277e2acb7e5c parsers: use Py_CLEAR where appropriate Bryan O'Sullivan <bryano@fb.com> parents: 16699 diff changeset	1989 if (start == 0)
277e2acb7e5c parsers: use Py_CLEAR where appropriate Bryan O'Sullivan <bryano@fb.com> parents: 16699 diff changeset	1990 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	1991 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1992
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1993 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1994 * 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	1995 * 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	1996 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1997 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	1998 {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1999 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	2000 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	2001 int ret = 0;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2002
30171 7a3b59f0329a parsers: avoid PySliceObject cast on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 30169 diff changeset	2003 /* 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	2004 #ifdef IS_PY3K
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2005 if (PySlice_GetIndicesEx(item, length, &start, &stop, &step,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2006 &slicelength) < 0)
30171 7a3b59f0329a parsers: avoid PySliceObject cast on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 30169 diff changeset	2007 #else
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2008 if (PySlice_GetIndicesEx((PySliceObject *)item, length, &start, &stop,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2009 &step, &slicelength) < 0)
30171 7a3b59f0329a parsers: avoid PySliceObject cast on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 30169 diff changeset	2010 #endif
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2011 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2012
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2013 if (slicelength <= 0)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2014 return 0;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2015
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2016 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	2017 stop = start;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2018
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2019 if (step < 0) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2020 stop = start + 1;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2021 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	2022 step = -step;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2023 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2024
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2025 if (step != 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2026 PyErr_SetString(PyExc_ValueError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2027 "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	2028 return -1;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2029 }
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2030
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2031 if (stop != length - 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2032 PyErr_SetString(PyExc_IndexError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2033 "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	2034 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2035 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2036
39068 52e9bf215f96 index: don't include nullid in the internal "length" field Martin von Zweigbergk <martinvonz@google.com> parents: 38944 diff changeset	2037 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	2038 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	2039 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	2040
39068 52e9bf215f96 index: don't include nullid in the internal "length" field Martin von Zweigbergk <martinvonz@google.com> parents: 38944 diff changeset	2041 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	2042 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	2043 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	2044 return -1;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2045
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2046 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	2047 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2048 if (self->added)
38942 3e74c01102af index: rename "nt_(indexObject self,...)" functions to "index_" Martin von Zweigbergk <martinvonz@google.com>* parents: 38941 diff changeset	2049 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	2050 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	2051 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	2052 }
39068 52e9bf215f96 index: don't include nullid in the internal "length" field Martin von Zweigbergk <martinvonz@google.com> parents: 38944 diff changeset	2053 self->length = start;
18504 d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	2054 if (start < self->raw_length) {
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	2055 if (self->cache) {
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	2056 Py_ssize_t i;
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	2057 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	2058 Py_CLEAR(self->cache[i]);
d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	2059 }
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2060 self->raw_length = start;
18504 d1d5fdcc2d46 parsers: fix memleak of revlog cache entries on strip Yuya Nishihara <yuya@tcha.org> parents: 18430 diff changeset	2061 }
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2062 goto done;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2063 }
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2064
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2065 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	2066 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	2067 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	2068 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	2069 }
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2070 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	2071 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	2072 PyList_GET_SIZE(self->added), NULL);
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2073 done:
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	2074 Py_CLEAR(self->headrevs);
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2075 return ret;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2076 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2077
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2078 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2079 * Supported ops:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2080 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2081 * slice deletion
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2082 * 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	2083 * 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	2084 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2085 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	2086 PyObject *value)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2087 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2088 char *node;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2089 long rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2090
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2091 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	2092 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	2093
38819 49628742d264 revlog: remove unnecessary output parameter from node_check() Martin von Zweigbergk <martinvonz@google.com> parents: 38305 diff changeset	2094 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	2095 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2096
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2097 if (value == NULL)
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2098 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	2099 : 0;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2100 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	2101 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	2102 if (!PyErr_Occurred())
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2103 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	2104 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2105 }
23468 ee311681e591 parsers: ensure revlog index node tree is initialized before insertion Mike Edgar <adgar@google.com> parents: 23087 diff changeset	2106
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	2107 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	2108 return -1;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2109 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	2110 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2111
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2112 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2113 * 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	2114 * 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	2115 */
22401 9ba8a93e55f5 parsers: ensure correct return type for inline_scan Henrik Stuart <hg@hstuart.dk> parents: 22400 diff changeset	2116 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	2117 {
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2118 const char data = (const char )self->buf.buf;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2119 Py_ssize_t pos = 0;
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2120 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	2121 long incr = v1_hdrsize;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2122 Py_ssize_t len = 0;
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	2123
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2124 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	2125 uint32_t comp_len;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2126 /* 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	2127 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	2128 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	2129 if (offsets)
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2130 offsets[len] = data + pos;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2131 len++;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2132 pos += incr;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2133 }
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	2134
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2135 if (pos != end) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2136 if (!PyErr_Occurred())
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2137 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	2138 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2139 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2140
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2141 return len;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2142 }
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	2143
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2144 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	2145 {
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2146 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	2147 Py_ssize_t size;
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2148
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2149 /* 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	2150 */
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2151 self->raw_length = 0;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2152 self->added = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2153 self->cache = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2154 self->data = NULL;
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2155 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	2156 self->headrevs = NULL;
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	2157 self->filteredrevs = Py_None;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	2158 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	2159 self->ntinitialized = 0;
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2160 self->offsets = NULL;
e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2161
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2162 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	2163 return -1;
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2164 if (!PyObject_CheckBuffer(data_obj)) {
6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 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 "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	2167 return -1;
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2168 }
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2169
6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2170 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	2171 return -1;
6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2172 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	2173
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2174 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	2175 self->data = data_obj;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2176
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2177 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	2178 self->ntrev = -1;
16597 b767382a8675 parsers: fix refcount bug on corrupt index Matt Mackall <mpm@selenic.com> parents: 16572 diff changeset	2179 Py_INCREF(self->data);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2180
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2181 if (self->inlined) {
22401 9ba8a93e55f5 parsers: ensure correct return type for inline_scan Henrik Stuart <hg@hstuart.dk> parents: 22400 diff changeset	2182 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	2183 if (len == -1)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2184 goto bail;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2185 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	2186 self->length = len;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2187 } else {
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	2188 if (size % v1_hdrsize) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2189 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	2190 goto bail;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2191 }
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	2192 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	2193 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	2194 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2195
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2196 return 0;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2197 bail:
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2198 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2199 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2200
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2201 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	2202 {
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2203 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	2204 return (PyObject *)self;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2205 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2206
38944 c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2207 static void _index_clearcaches(indexObject *self)
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2208 {
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2209 if (self->cache) {
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2210 Py_ssize_t i;
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2211
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2212 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	2213 Py_CLEAR(self->cache[i]);
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2214 free(self->cache);
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2215 self->cache = NULL;
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2216 }
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2217 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	2218 PyMem_Free((void *)self->offsets);
38944 c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2219 self->offsets = NULL;
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2220 }
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2221 if (self->ntinitialized) {
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2222 nt_dealloc(&self->nt);
38944 c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2223 }
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2224 self->ntinitialized = 0;
38944 c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2225 Py_CLEAR(self->headrevs);
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2226 }
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2227
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2228 static PyObject index_clearcaches(indexObject self)
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2229 {
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2230 _index_clearcaches(self);
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2231 self->ntrev = -1;
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2232 self->ntlookups = self->ntmisses = 0;
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2233 Py_RETURN_NONE;
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2234 }
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2235
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2236 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	2237 {
16370 28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	2238 _index_clearcaches(self);
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	2239 Py_XDECREF(self->filteredrevs);
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2240 if (self->buf.buf) {
6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2241 PyBuffer_Release(&self->buf);
6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2242 memset(&self->buf, 0, sizeof(self->buf));
6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2243 }
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2244 Py_XDECREF(self->data);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2245 Py_XDECREF(self->added);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2246 PyObject_Del(self);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2247 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2248
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2249 static PySequenceMethods index_sequence_methods = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2250 (lenfunc)index_length, /* sq_length */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2251 0, /* sq_concat */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2252 0, /* sq_repeat */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2253 (ssizeargfunc)index_get, /* sq_item */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2254 0, /* sq_slice */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2255 0, /* sq_ass_item */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2256 0, /* sq_ass_slice */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2257 (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	2258 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2259
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2260 static PyMappingMethods index_mapping_methods = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2261 (lenfunc)index_length, /* mp_length */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2262 (binaryfunc)index_getitem, /* mp_subscript */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2263 (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	2264 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2265
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2266 static PyMethodDef index_methods[] = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2267 {"ancestors", (PyCFunction)index_ancestors, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2268 "return the gca set of the given revs"},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2269 {"commonancestorsheads", (PyCFunction)index_commonancestorsheads,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2270 METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2271 "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	2272 {"clearcaches", (PyCFunction)index_clearcaches, METH_NOARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2273 "clear the index caches"},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2274 {"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	2275 {"computephasesmapsets", (PyCFunction)compute_phases_map_sets, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2276 "compute phases"},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2277 {"reachableroots2", (PyCFunction)reachableroots2, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2278 "reachableroots"},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2279 {"headrevs", (PyCFunction)index_headrevs, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2280 "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	2281 {"headrevsfiltered", (PyCFunction)index_headrevs, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2282 "get filtered head revisions"}, /* Can always do filtering */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2283 {"deltachain", (PyCFunction)index_deltachain, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2284 "determine revisions with deltas to reconstruct fulltext"},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2285 {"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	2286 {"partialmatch", (PyCFunction)index_partialmatch, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2287 "match a potentially ambiguous node ID"},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2288 {"shortest", (PyCFunction)index_shortest, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2289 "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	2290 {"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	2291 {NULL} /* Sentinel */
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2292 };
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2293
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2294 static PyGetSetDef index_getset[] = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2295 {"nodemap", (getter)index_nodemap, NULL, "nodemap", NULL},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2296 {NULL} /* Sentinel */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2297 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2298
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2299 static PyTypeObject indexType = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2300 PyVarObject_HEAD_INIT(NULL, 0) /* header */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2301 "parsers.index", /* tp_name */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2302 sizeof(indexObject), /* tp_basicsize */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2303 0, /* tp_itemsize */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2304 (destructor)index_dealloc, /* tp_dealloc */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2305 0, /* tp_print */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2306 0, /* tp_getattr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2307 0, /* tp_setattr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2308 0, /* tp_compare */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2309 0, /* tp_repr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2310 0, /* tp_as_number */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2311 &index_sequence_methods, /* tp_as_sequence */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2312 &index_mapping_methods, /* tp_as_mapping */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2313 0, /* tp_hash */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2314 0, /* tp_call */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2315 0, /* tp_str */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2316 0, /* tp_getattro */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2317 0, /* tp_setattro */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2318 0, /* tp_as_buffer */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2319 Py_TPFLAGS_DEFAULT, /* tp_flags */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2320 "revlog index", /* tp_doc */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2321 0, /* tp_traverse */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2322 0, /* tp_clear */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2323 0, /* tp_richcompare */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2324 0, /* tp_weaklistoffset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2325 0, /* tp_iter */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2326 0, /* tp_iternext */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2327 index_methods, /* tp_methods */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2328 0, /* tp_members */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2329 index_getset, /* tp_getset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2330 0, /* tp_base */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2331 0, /* tp_dict */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2332 0, /* tp_descr_get */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2333 0, /* tp_descr_set */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2334 0, /* tp_dictoffset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2335 (initproc)index_init, /* tp_init */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2336 0, /* tp_alloc */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2337 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2338
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2339 /*
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2340 * 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	2341 * follows:
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2342 *
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2343 * 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	2344 * 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	2345 * 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	2346 *
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2347 * added complications are for backwards compatibility
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2348 */
32378 7d0c69505a66 cext: extract revlog/index parsing code to own C file Gregory Szorc <gregory.szorc@gmail.com> parents: 32372 diff changeset	2349 PyObject parse_index2(PyObject self, PyObject *args)
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2350 {
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2351 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	2352 indexObject *idx;
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2353 int ret;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2354
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2355 idx = PyObject_New(indexObject, &indexType);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2356 if (idx == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2357 goto bail;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2358
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2359 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	2360 if (ret == -1)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2361 goto bail;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2362
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2363 if (idx->inlined) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2364 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	2365 if (cache == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2366 goto bail;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2367 } else {
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2368 cache = Py_None;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2369 Py_INCREF(cache);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2370 }
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2371
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2372 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	2373 if (!tuple)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2374 goto bail;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2375 return tuple;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2376
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2377 bail:
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2378 Py_XDECREF(idx);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2379 Py_XDECREF(cache);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2380 Py_XDECREF(tuple);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2381 return NULL;
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2382 }
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2383
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2384 #ifdef WITH_RUST
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2385
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2386 /* rustlazyancestors: iteration over ancestors implemented in Rust
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2387 *
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2388 * 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	2389 */
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2390 typedef struct rustlazyancestorsObjectStruct rustlazyancestorsObject;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2391
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2392 struct rustlazyancestorsObjectStruct {
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2393 PyObject_HEAD
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2394 /* Type-specific fields go here. */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2395 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	2396 void iter; / Rust iterator */
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2397 };
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2398
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2399 /* FFI exposed from Rust code */
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2400 rustlazyancestorsObject *
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2401 rustlazyancestors_init(indexObject *index,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2402 /* to pass index_get_parents() */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2403 int ()(indexObject , Py_ssize_t, int *, int),
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2404 /* intrevs vector */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2405 Py_ssize_t initrevslen, long *initrevs, long stoprev,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2406 int inclusive);
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2407 void rustlazyancestors_drop(rustlazyancestorsObject *self);
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2408 int rustlazyancestors_next(rustlazyancestorsObject *self);
40300 72b94f946e90 rust: rustlazyancestors.__contains__ Georges Racinet <gracinet@anybox.fr> parents: 40273 diff changeset	2409 int rustlazyancestors_contains(rustlazyancestorsObject *self, long rev);
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2410
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2411 /* CPython instance methods */
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2412 static int rustla_init(rustlazyancestorsObject self, PyObject args)
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2413 {
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2414 PyObject *initrevsarg = NULL;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2415 PyObject *inclusivearg = NULL;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2416 long stoprev = 0;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2417 long *initrevs = NULL;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2418 int inclusive = 0;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2419 Py_ssize_t i;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2420
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2421 indexObject *index;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2422 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	2423 &initrevsarg, &stoprev, &PyBool_Type,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2424 &inclusivearg))
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2425 return -1;
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2426
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2427 Py_INCREF(index);
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2428 self->index = index;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2429
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2430 if (inclusivearg == Py_True)
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2431 inclusive = 1;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2432
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2433 Py_ssize_t linit = PyList_GET_SIZE(initrevsarg);
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2434
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2435 initrevs = (long *)calloc(linit, sizeof(long));
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2436
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2437 if (initrevs == NULL) {
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2438 PyErr_NoMemory();
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2439 goto bail;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2440 }
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2441
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2442 for (i = 0; i < linit; i++) {
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2443 initrevs[i] = PyInt_AsLong(PyList_GET_ITEM(initrevsarg, i));
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2444 }
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2445 if (PyErr_Occurred())
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2446 goto bail;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2447
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2448 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	2449 initrevs, stoprev, inclusive);
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2450 if (self->iter == NULL) {
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2451 /* if this is because of GraphError::ParentOutOfRange
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2452 * index_get_parents() has already set the proper ValueError */
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2453 goto bail;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2454 }
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2455
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2456 free(initrevs);
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2457 return 0;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2458
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2459 bail:
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2460 free(initrevs);
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2461 return -1;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2462 };
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2463
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2464 static void rustla_dealloc(rustlazyancestorsObject *self)
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2465 {
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2466 Py_XDECREF(self->index);
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2467 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	2468 rustlazyancestors_drop(self->iter);
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2469 }
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2470 PyObject_Del(self);
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2471 }
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2472
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2473 static PyObject rustla_next(rustlazyancestorsObject self)
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2474 {
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2475 int res = rustlazyancestors_next(self->iter);
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2476 if (res == -1) {
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2477 /* Setting an explicit exception seems unnecessary
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2478 * 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	2479 * and Modules/_io/stringio.c) seem to demonstrate.
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2480 */
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2481 return NULL;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2482 }
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2483 return PyInt_FromLong(res);
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2484 }
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2485
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2486 static int rustla_contains(rustlazyancestorsObject self, PyObject rev)
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2487 {
40598 fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	2488 long lrev;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	2489 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	2490 PyErr_Clear();
40300 72b94f946e90 rust: rustlazyancestors.__contains__ Georges Racinet <gracinet@anybox.fr> parents: 40273 diff changeset	2491 return 0;
72b94f946e90 rust: rustlazyancestors.__contains__ Georges Racinet <gracinet@anybox.fr> parents: 40273 diff changeset	2492 }
40598 fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	2493 return rustlazyancestors_contains(self->iter, lrev);
40300 72b94f946e90 rust: rustlazyancestors.__contains__ Georges Racinet <gracinet@anybox.fr> parents: 40273 diff changeset	2494 }
72b94f946e90 rust: rustlazyancestors.__contains__ Georges Racinet <gracinet@anybox.fr> parents: 40273 diff changeset	2495
72b94f946e90 rust: rustlazyancestors.__contains__ Georges Racinet <gracinet@anybox.fr> parents: 40273 diff changeset	2496 static PySequenceMethods rustla_sequence_methods = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2497 0, /* sq_length */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2498 0, /* sq_concat */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2499 0, /* sq_repeat */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2500 0, /* sq_item */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2501 0, /* sq_slice */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2502 0, /* sq_ass_item */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2503 0, /* sq_ass_slice */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2504 (objobjproc)rustla_contains, /* sq_contains */
40300 72b94f946e90 rust: rustlazyancestors.__contains__ Georges Racinet <gracinet@anybox.fr> parents: 40273 diff changeset	2505 };
72b94f946e90 rust: rustlazyancestors.__contains__ Georges Racinet <gracinet@anybox.fr> parents: 40273 diff changeset	2506
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2507 static PyTypeObject rustlazyancestorsType = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2508 PyVarObject_HEAD_INIT(NULL, 0) /* header */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2509 "parsers.rustlazyancestors", /* tp_name */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2510 sizeof(rustlazyancestorsObject), /* tp_basicsize */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2511 0, /* tp_itemsize */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2512 (destructor)rustla_dealloc, /* tp_dealloc */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2513 0, /* tp_print */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2514 0, /* tp_getattr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2515 0, /* tp_setattr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2516 0, /* tp_compare */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2517 0, /* tp_repr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2518 0, /* tp_as_number */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2519 &rustla_sequence_methods, /* tp_as_sequence */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2520 0, /* tp_as_mapping */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2521 0, /* tp_hash */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2522 0, /* tp_call */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2523 0, /* tp_str */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2524 0, /* tp_getattro */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2525 0, /* tp_setattro */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2526 0, /* tp_as_buffer */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2527 Py_TPFLAGS_DEFAULT, /* tp_flags */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2528 "Iterator over ancestors, implemented in Rust", /* tp_doc */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2529 0, /* tp_traverse */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2530 0, /* tp_clear */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2531 0, /* tp_richcompare */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2532 0, /* tp_weaklistoffset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2533 0, /* tp_iter */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2534 (iternextfunc)rustla_next, /* tp_iternext */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2535 0, /* tp_methods */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2536 0, /* tp_members */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2537 0, /* tp_getset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2538 0, /* tp_base */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2539 0, /* tp_dict */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2540 0, /* tp_descr_get */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2541 0, /* tp_descr_set */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2542 0, /* tp_dictoffset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2543 (initproc)rustla_init, /* tp_init */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2544 0, /* tp_alloc */
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2545 };
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2546 #endif /* WITH_RUST */
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2547
32378 7d0c69505a66 cext: extract revlog/index parsing code to own C file Gregory Szorc <gregory.szorc@gmail.com> parents: 32372 diff changeset	2548 void revlog_module_init(PyObject *mod)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	2549 {
16604 48e42f984074 parsers: statically initializing tp_new to PyType_GenericNew is not portable Adrian Buehlmann <adrian@cadifra.com> parents: 16597 diff changeset	2550 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	2551 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	2552 return;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2553 Py_INCREF(&indexType);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2554 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	2555
39218 b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	2556 nodetreeType.tp_new = PyType_GenericNew;
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	2557 if (PyType_Ready(&nodetreeType) < 0)
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	2558 return;
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	2559 Py_INCREF(&nodetreeType);
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	2560 PyModule_AddObject(mod, "nodetree", (PyObject *)&nodetreeType);
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	2561
40088 129bfc7ad2cc revlog: if the module is initialized more than once, don't leak nullentry Augie Fackler <augie@google.com> parents: 39609 diff changeset	2562 if (!nullentry) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2563 nullentry = Py_BuildValue(PY23("iiiiiiis#", "iiiiiiiy#"), 0, 0,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2564 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	2565 }
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2566 if (nullentry)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2567 PyObject_GC_UnTrack(nullentry);
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2568
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2569 #ifdef WITH_RUST
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2570 rustlazyancestorsType.tp_new = PyType_GenericNew;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2571 if (PyType_Ready(&rustlazyancestorsType) < 0)
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2572 return;
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2573 Py_INCREF(&rustlazyancestorsType);
3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2574 PyModule_AddObject(mod, "rustlazyancestors",
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2575 (PyObject *)&rustlazyancestorsType);
40273 3b275f549777 rust: exposing in parsers module Georges Racinet <gracinet@anybox.fr> parents: 40099 diff changeset	2576 #endif
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2577 }

Mercurial > public > mercurial-scm > hg

annotate mercurial/cext/revlog.c @ 40704:7da3729d4b45