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

annotate mercurial/cext/revlog.c @ 47143:47ffc754989a

revlog: always "append" full size tuple Same reasoning as the previous patch. Differential Revision: https://phab.mercurial-scm.org/D10569

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Mon, 03 May 2021 12:21:25 +0200
parents	4292bed8da7c
children	6b1eae313b2f

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
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Rapha?l Gom?s <rgomes@octobus.net> parents: 46717 diff changeset	4 Copyright 2008 Olivia Mackall <olivia@selenic.com> and others
6389 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
42067 b01bbb8ff1f2 cext: make revlog.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41283 diff changeset	10 #define PY_SSIZE_T_CLEAN
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	11 #include <Python.h>
33174 f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	12 #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	13 #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	14 #include <limits.h>
17356 511dfb34b412 parsers: fix an integer size warning issued by clang Bryan O'Sullivan <bryano@fb.com> parents: 17353 diff changeset	15 #include <stddef.h>
40707 cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	16 #include <stdlib.h>
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	17 #include <string.h>
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46875 diff changeset	18 #include <structmember.h>
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	19
34438 b90e8da190da cext: reorder #include Gregory Szorc <gregory.szorc@gmail.com> parents: 34437 diff changeset	20 #include "bitmanipulation.h"
33758 0f4ac3b6dee4 cext: factor out header for charencode.c Yuya Nishihara <yuya@tcha.org> parents: 33475 diff changeset	21 #include "charencode.h"
46328 0216abfb2d3e clang-format: reorder includes to appease the formatter Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46317 diff changeset	22 #include "compat.h"
40859 aa76be85029b revlog: export symbol of indexType Yuya Nishihara <yuya@tcha.org> parents: 40819 diff changeset	23 #include "revlog.h"
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	24 #include "util.h"
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	25
30112 9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	26 #ifdef IS_PY3K
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	27 /* 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	28 * 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	29 * 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	30 #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	31 #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	32 #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	33 #define PyInt_AsLong PyLong_AsLong
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	34 #endif
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	35
38939 53bc73fae1a3 index: add pointer from nodetree back to index Martin von Zweigbergk <martinvonz@google.com> parents: 38938 diff changeset	36 typedef struct indexObjectStruct indexObject;
53bc73fae1a3 index: add pointer from nodetree back to index Martin von Zweigbergk <martinvonz@google.com> parents: 38938 diff changeset	37
38912 d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	38 typedef struct {
d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	39 int children[16];
d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	40 } nodetreenode;
d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	41
43959 f384d68d8ea8 revlog: made C Capsule an array of function pointers Georges Racinet <georges.racinet@octobus.net> parents: 43847 diff changeset	42 typedef struct {
44066 f5d2720f3bea revlog-native: introduced ABI version in capsule Georges Racinet <georges.racinet@octobus.net> parents: 43959 diff changeset	43 int abi_version;
44502 166349510398 revlog: using two new functions in C capsule from Rust code Georges Racinet <georges.racinet@octobus.net> parents: 44486 diff changeset	44 Py_ssize_t (index_length)(const indexObject );
166349510398 revlog: using two new functions in C capsule from Rust code Georges Racinet <georges.racinet@octobus.net> parents: 44486 diff changeset	45 const char (index_node)(indexObject *, Py_ssize_t);
43959 f384d68d8ea8 revlog: made C Capsule an array of function pointers Georges Racinet <georges.racinet@octobus.net> parents: 43847 diff changeset	46 int (index_parents)(PyObject , int, int *);
f384d68d8ea8 revlog: made C Capsule an array of function pointers Georges Racinet <georges.racinet@octobus.net> parents: 43847 diff changeset	47 } Revlog_CAPI;
f384d68d8ea8 revlog: made C Capsule an array of function pointers Georges Racinet <georges.racinet@octobus.net> parents: 43847 diff changeset	48
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	49 /*
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	50 * 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	51 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	52 * 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	53 * 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	54 * Zero is empty
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	55 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	56 typedef struct {
38939 53bc73fae1a3 index: add pointer from nodetree back to index Martin von Zweigbergk <martinvonz@google.com> parents: 38938 diff changeset	57 indexObject *index;
38912 d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	58 nodetreenode *nodes;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	59 Py_ssize_t nodelen;
46224 fcc324a228fe revlog: use size_t for nodetree capacity Jun Wu <quark@fb.com> parents: 46144 diff changeset	60 size_t length; /* # nodes in use */
fcc324a228fe revlog: use size_t for nodetree capacity Jun Wu <quark@fb.com> parents: 46144 diff changeset	61 size_t capacity; /* # nodes allocated */
fcc324a228fe revlog: use size_t for nodetree capacity Jun Wu <quark@fb.com> parents: 46144 diff changeset	62 int depth; /* maximum depth of tree */
fcc324a228fe revlog: use size_t for nodetree capacity Jun Wu <quark@fb.com> parents: 46144 diff changeset	63 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	64 } nodetree;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	65
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	66 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	67 PyObject_HEAD /* ; */
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	68 nodetree nt;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	69 } nodetreeObject;
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	70
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	71 /*
26098 ce26928cbe41 spelling: behaviour -> behavior timeless@mozdev.org parents: 26080 diff changeset	72 * 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	73 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	74 * When used in a list-like way (with integer keys), we decode an
43582 ae5e39512ca0 revlog: delete references to deleted nullid sentinel value Martin von Zweigbergk <martinvonz@google.com> parents: 43554 diff changeset	75 * entry in a RevlogNG index file on demand. We have limited support for
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	76 * integer-keyed insert and delete, only at elements right before the
43582 ae5e39512ca0 revlog: delete references to deleted nullid sentinel value Martin von Zweigbergk <martinvonz@google.com> parents: 43554 diff changeset	77 * end.
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	78 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	79 * 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	80 * 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	81 */
38939 53bc73fae1a3 index: add pointer from nodetree back to index Martin von Zweigbergk <martinvonz@google.com> parents: 38938 diff changeset	82 struct indexObjectStruct {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	83 PyObject_HEAD
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	84 /* Type-specific fields go here. */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	85 PyObject data; / raw bytes of index */
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	86 Py_ssize_t nodelen; /* digest size of the hash, 20 for SHA-1 */
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	87 PyObject nullentry; / fast path for references to null */
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	88 Py_buffer buf; /* buffer of data */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	89 const char *offsets; / populated on demand */
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	90 Py_ssize_t length; /* current on-disk number of elements */
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	91 unsigned new_length; /* number of added elements */
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	92 unsigned added_length; /* space reserved for added elements */
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	93 char added; / populated on demand */
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	94 PyObject headrevs; / cache, invalidated on changes */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	95 PyObject filteredrevs; / filtered revs set */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	96 nodetree nt; /* base-16 trie */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	97 int ntinitialized; /* 0 or 1 */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	98 int ntrev; /* last rev scanned */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	99 int ntlookups; /* # lookups */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	100 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	101 int inlined;
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	102 long entry_size; /* size of index headers. Differs in v1 v.s. v2 format
c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	103 */
47141 ac72eee94035 revlog: introduce an explicit `format_version` member in the index struct Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47140 diff changeset	104 char format_version; /* size of index headers. Differs in v1 v.s. v2
ac72eee94035 revlog: introduce an explicit `format_version` member in the index struct Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47140 diff changeset	105 format */
38939 53bc73fae1a3 index: add pointer from nodetree back to index Martin von Zweigbergk <martinvonz@google.com> parents: 38938 diff changeset	106 };
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	107
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	108 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	109 {
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	110 return self->length + self->new_length;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	111 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	112
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	113 static const char nullid[32] = {0};
40960 43974cd44967 revlog: introduce a constant for nullrev in `revlog.c` Boris Feld <boris.feld@octobus.net> parents: 40862 diff changeset	114 static const Py_ssize_t nullrev = -1;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	115
22401 9ba8a93e55f5 parsers: ensure correct return type for inline_scan Henrik Stuart <hg@hstuart.dk> parents: 22400 diff changeset	116 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	117
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	118 static int index_find_node(indexObject self, const char node);
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	119
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	120 #if LONG_MAX == 0x7fffffffL
47143 47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	121 static const char *const tuple_format = PY23("Kiiiiiis#Ki", "Kiiiiiiy#Ki");
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	122 #else
47143 47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	123 static const char *const tuple_format = PY23("kiiiiiis#ki", "kiiiiiiy#ki");
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	124 #endif
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	125
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	126 /* A RevlogNG v1 index entry is 64 bytes long. */
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	127 static const long v1_entry_size = 64;
16863 bbedef66c6f3 parsers: replace magic number 64 with symbolic constant Bryan O'Sullivan <bryano@fb.com> parents: 16787 diff changeset	128
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	129 /* A Revlogv2 index entry is 96 bytes long. */
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	130 static const long v2_entry_size = 96;
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	131
47141 ac72eee94035 revlog: introduce an explicit `format_version` member in the index struct Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47140 diff changeset	132 static const long format_v1 = 1; /* Internal only, could be any number */
ac72eee94035 revlog: introduce an explicit `format_version` member in the index struct Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47140 diff changeset	133 static const long format_v2 = 2; /* Internal only, could be any number */
ac72eee94035 revlog: introduce an explicit `format_version` member in the index struct Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47140 diff changeset	134
39219 f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	135 static void raise_revlog_error(void)
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	136 {
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	137 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	138
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	139 mod = PyImport_ImportModule("mercurial.error");
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	140 if (mod == NULL) {
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	141 goto cleanup;
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	142 }
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	143
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	144 dict = PyModule_GetDict(mod);
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	145 if (dict == NULL) {
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	146 goto cleanup;
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	147 }
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	148 Py_INCREF(dict);
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	149
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	150 errclass = PyDict_GetItemString(dict, "RevlogError");
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	151 if (errclass == NULL) {
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	152 PyErr_SetString(PyExc_SystemError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	153 "could not find RevlogError");
39219 f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	154 goto cleanup;
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	155 }
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	156
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	157 /* 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	158 PyErr_SetString(errclass, "RevlogError");
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	159
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	160 cleanup:
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	161 Py_XDECREF(dict);
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	162 Py_XDECREF(mod);
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	163 }
f85b25608252 index: move raise_revlog_error() further up Martin von Zweigbergk <martinvonz@google.com> parents: 39218 diff changeset	164
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	165 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	166 * 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	167 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	168 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	169 {
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	170 if (pos >= self->length)
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	171 return self->added + (pos - self->length) * self->entry_size;
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	172
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	173 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	174 if (self->offsets == NULL) {
44580 3122058df7a5 cext: move variable declaration to the top of the block for C89 support Matt Harbison <matt_harbison@yahoo.com> parents: 44500 diff changeset	175 Py_ssize_t ret;
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	176 self->offsets =
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	177 PyMem_Malloc(self->length * 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	178 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	179 return (const char *)PyErr_NoMemory();
44580 3122058df7a5 cext: move variable declaration to the top of the block for C89 support Matt Harbison <matt_harbison@yahoo.com> parents: 44500 diff changeset	180 ret = inline_scan(self, self->offsets);
44500 864e9534d3d4 cext-index: propagate inline_scan error in `index_deref` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44066 diff changeset	181 if (ret == -1) {
864e9534d3d4 cext-index: propagate inline_scan error in `index_deref` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44066 diff changeset	182 return NULL;
864e9534d3d4 cext-index: propagate inline_scan error in `index_deref` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44066 diff changeset	183 };
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	184 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	185 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	186 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	187
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	188 return (const char )(self->buf.buf) + pos self->entry_size;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	189 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	190
40812 9cdd525d97b2 revlog: fix out-of-bounds access by negative parents read from revlog (SEC) Yuya Nishihara <yuya@tcha.org> parents: 40454 diff changeset	191 /*
9cdd525d97b2 revlog: fix out-of-bounds access by negative parents read from revlog (SEC) Yuya Nishihara <yuya@tcha.org> parents: 40454 diff changeset	192 * Get parents of the given rev.
9cdd525d97b2 revlog: fix out-of-bounds access by negative parents read from revlog (SEC) Yuya Nishihara <yuya@tcha.org> parents: 40454 diff changeset	193 *
9cdd525d97b2 revlog: fix out-of-bounds access by negative parents read from revlog (SEC) Yuya Nishihara <yuya@tcha.org> parents: 40454 diff changeset	194 * The specified rev must be valid and must not be nullrev. A returned
9cdd525d97b2 revlog: fix out-of-bounds access by negative parents read from revlog (SEC) Yuya Nishihara <yuya@tcha.org> parents: 40454 diff changeset	195 * parent revision may be nullrev, but is guaranteed to be in valid range.
9cdd525d97b2 revlog: fix out-of-bounds access by negative parents read from revlog (SEC) Yuya Nishihara <yuya@tcha.org> parents: 40454 diff changeset	196 */
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	197 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	198 int maxrev)
25311 d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	199 {
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	200 const char *data = index_deref(self, rev);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	201
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	202 ps[0] = getbe32(data + 24);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	203 ps[1] = getbe32(data + 28);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	204
25810 82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	205 /* 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	206 * there is a risk of buffer overflow to trust them unconditionally. */
40812 9cdd525d97b2 revlog: fix out-of-bounds access by negative parents read from revlog (SEC) Yuya Nishihara <yuya@tcha.org> parents: 40454 diff changeset	207 if (ps[0] < -1 \|\| ps[0] > maxrev \|\| ps[1] < -1 \|\| ps[1] > maxrev) {
25810 82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	208 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	209 return -1;
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	210 }
82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	211 return 0;
25311 d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	212 }
d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	213
40861 b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	214 /*
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	215 * Get parents of the given rev.
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	216 *
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	217 * If the specified rev is out of range, IndexError will be raised. If the
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	218 * revlog entry is corrupted, ValueError may be raised.
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	219 *
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	220 * Returns 0 on success or -1 on failure.
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	221 */
44467 9db11679f8ac cext: make HgRevlogIndex_GetParents private again Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44066 diff changeset	222 static int HgRevlogIndex_GetParents(PyObject op, int rev, int ps)
40861 b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	223 {
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	224 int tiprev;
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	225 if (!op \|\| !HgRevlogIndex_Check(op) \|\| !ps) {
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	226 PyErr_BadInternalCall();
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	227 return -1;
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	228 }
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	229 tiprev = (int)index_length((indexObject *)op) - 1;
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	230 if (rev < -1 \|\| rev > tiprev) {
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	231 PyErr_Format(PyExc_IndexError, "rev out of range: %d", rev);
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	232 return -1;
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	233 } else if (rev == -1) {
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	234 ps[0] = ps[1] = -1;
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	235 return 0;
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	236 } else {
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	237 return index_get_parents((indexObject *)op, rev, ps, tiprev);
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	238 }
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	239 }
b12700dd261f revlog: add public CPython function to get parent revisions Yuya Nishihara <yuya@tcha.org> parents: 40860 diff changeset	240
40703 d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	241 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	242 {
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	243 const char *data;
40703 d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	244 uint64_t offset;
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	245
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	246 if (rev == nullrev)
40961 b54727f82511 sparse-revlog: handle nullrev in index_get_start Boris Feld <boris.feld@octobus.net> parents: 40960 diff changeset	247 return 0;
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	248
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	249 data = index_deref(self, rev);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	250 offset = getbe32(data + 4);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	251 if (rev == 0) {
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	252 /* mask out version number for the first entry */
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	253 offset &= 0xFFFF;
40703 d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	254 } else {
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	255 uint32_t offset_high = getbe32(data);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	256 offset \|= ((uint64_t)offset_high) << 32;
40703 d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	257 }
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	258 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	259 }
d5b300ec2e89 sparse-revlog: add a `index_get_start` function in C Boris Feld <boris.feld@octobus.net> parents: 40598 diff changeset	260
40704 7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	261 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	262 {
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	263 const char *data;
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	264 int tmp;
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	265
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	266 if (rev == nullrev)
40962 c6939b353ebd sparse-revlog: handle nullrev in index_get_length Boris Feld <boris.feld@octobus.net> parents: 40961 diff changeset	267 return 0;
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	268
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	269 data = index_deref(self, rev);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	270
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	271 tmp = (int)getbe32(data + 8);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	272 if (tmp < 0) {
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	273 PyErr_Format(PyExc_OverflowError,
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	274 "revlog entry size out of bound (%d)", tmp);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	275 return -1;
40962 c6939b353ebd sparse-revlog: handle nullrev in index_get_length Boris Feld <boris.feld@octobus.net> parents: 40961 diff changeset	276 }
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	277 return tmp;
40704 7da3729d4b45 sparse-revlog: add a `index_get_length` function in C Boris Feld <boris.feld@octobus.net> parents: 40703 diff changeset	278 }
25311 d2e88f960d1a parsers: move index_get_parents's declaration higher Laurent Charignon <lcharignon@fb.com> parents: 25297 diff changeset	279
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	280 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	281 * 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	282 * 6 bytes: offset
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	283 * 2 bytes: flags
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	284 * 4 bytes: compressed length
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	285 * 4 bytes: uncompressed length
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	286 * 4 bytes: base revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	287 * 4 bytes: link revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	288 * 4 bytes: parent 1 revision
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	289 * 4 bytes: parent 2 revision
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	290 * 32 bytes: nodeid (only 20 bytes used with SHA-1)
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	291 */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	292 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	293 {
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	294 uint64_t offset_flags, sidedata_offset;
358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	295 int comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2,
358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	296 sidedata_comp_len;
7154 7fdf7a0a41b7 index parser: fix refcounting in case of errors, refactor Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7135 diff changeset	297 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	298 const char *data;
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	299 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	300
40960 43974cd44967 revlog: introduce a constant for nullrev in `revlog.c` Boris Feld <boris.feld@octobus.net> parents: 40862 diff changeset	301 if (pos == nullrev) {
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	302 Py_INCREF(self->nullentry);
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	303 return self->nullentry;
38847 f3d394ea17db index: handle index[-1] as nullid more explicitly Martin von Zweigbergk <martinvonz@google.com> parents: 38846 diff changeset	304 }
f3d394ea17db index: handle index[-1] as nullid more explicitly Martin von Zweigbergk <martinvonz@google.com> parents: 38846 diff changeset	305
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	306 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	307 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	308 return NULL;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	309 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	310
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	311 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	312 if (data == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	313 return NULL;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	314
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	315 offset_flags = getbe32(data + 4);
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	316 /*
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	317 * The first entry on-disk needs the version number masked out,
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	318 * but this doesn't apply if entries are added to an empty index.
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	319 */
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	320 if (self->length && pos == 0)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	321 offset_flags &= 0xFFFF;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	322 else {
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	323 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	324 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	325 }
7154 7fdf7a0a41b7 index parser: fix refcounting in case of errors, refactor Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7135 diff changeset	326
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	327 comp_len = getbe32(data + 8);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	328 uncomp_len = getbe32(data + 12);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	329 base_rev = getbe32(data + 16);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	330 link_rev = getbe32(data + 20);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	331 parent_1 = getbe32(data + 24);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	332 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	333 c_node_id = data + 32;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	334
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	335 if (self->entry_size == v1_entry_size) {
47142 4292bed8da7c revlog: make the index always return the same tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47141 diff changeset	336 sidedata_offset = 0;
4292bed8da7c revlog: make the index always return the same tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47141 diff changeset	337 sidedata_comp_len = 0;
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	338 } else {
358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	339 sidedata_offset = getbe64(data + 64);
358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	340 sidedata_comp_len = getbe32(data + 72);
358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	341 }
47142 4292bed8da7c revlog: make the index always return the same tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47141 diff changeset	342
47143 47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	343 return Py_BuildValue(tuple_format, offset_flags, comp_len, uncomp_len,
47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	344 base_rev, link_rev, parent_1, parent_2, c_node_id,
47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	345 self->nodelen, sidedata_offset, sidedata_comp_len);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	346 }
47034 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	347 /*
47037 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	348 * Pack header information in binary
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	349 */
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	350 static PyObject index_pack_header(indexObject self, PyObject *args)
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	351 {
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	352 int header;
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	353 char out[4];
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	354 if (!PyArg_ParseTuple(args, "I", &header)) {
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	355 return NULL;
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	356 }
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	357 putbe32(header, out);
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	358 return PyBytes_FromStringAndSize(out, 4);
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	359 }
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	360 /*
47034 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	361 * Return the raw binary string representing a revision
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	362 */
47037 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	363 static PyObject index_entry_binary(indexObject self, PyObject *value)
47034 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	364 {
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	365 long rev;
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	366 const char *data;
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	367 Py_ssize_t length = index_length(self);
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	368
47037 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	369 if (!pylong_to_long(value, &rev)) {
47034 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	370 return NULL;
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	371 }
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	372 if (rev < 0 \|\| rev >= length) {
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	373 PyErr_Format(PyExc_ValueError, "revlog index out of range: %ld",
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	374 rev);
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	375 return NULL;
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	376 };
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	377
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	378 data = index_deref(self, rev);
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	379 if (data == NULL)
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	380 return NULL;
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	381 if (rev == 0) {
47037 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	382 /* the header is eating the start of the first entry */
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	383 return PyBytes_FromStringAndSize(data + 4,
c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	384 self->entry_size - 4);
47034 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	385 }
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	386 return PyBytes_FromStringAndSize(data, self->entry_size);
47034 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	387 }
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	388
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	389 /*
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	390 * Return the hash of node corresponding to the given rev.
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	391 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	392 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	393 {
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	394 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	395 const char *data;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	396
40960 43974cd44967 revlog: introduce a constant for nullrev in `revlog.c` Boris Feld <boris.feld@octobus.net> parents: 40862 diff changeset	397 if (pos == nullrev)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	398 return nullid;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	399
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	400 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	401 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	402
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	403 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	404 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	405 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	406
37860 a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	407 /*
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	408 * Return the hash of the node corresponding to the given rev. The
37860 a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	409 * 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	410 */
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	411 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	412 {
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	413 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	414 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	415 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	416 (int)pos);
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	417 }
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	418 return node;
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	419 }
a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	420
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	421 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	422
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	423 static int node_check(Py_ssize_t nodelen, 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	424 {
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	425 Py_ssize_t thisnodelen;
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	426 if (PyBytes_AsStringAndSize(obj, node, &thisnodelen) == -1)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	427 return -1;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	428 if (nodelen == thisnodelen)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	429 return 0;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	430 PyErr_Format(PyExc_ValueError, "node len %zd != expected node len %zd",
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	431 thisnodelen, nodelen);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	432 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	433 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	434
38850 6104b203bec8 index: replace insert(-1, e) method by append(e) method Martin von Zweigbergk <martinvonz@google.com> parents: 38848 diff changeset	435 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	436 {
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	437 uint64_t offset_flags, sidedata_offset;
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	438 int rev, comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2;
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	439 Py_ssize_t c_node_id_len, sidedata_comp_len;
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	440 const char *c_node_id;
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	441 char *data;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	442
47143 47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	443 if (!PyArg_ParseTuple(obj, tuple_format, &offset_flags, &comp_len,
47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	444 &uncomp_len, &base_rev, &link_rev, &parent_1,
47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	445 &parent_2, &c_node_id, &c_node_id_len,
47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	446 &sidedata_offset, &sidedata_comp_len)) {
47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	447 PyErr_SetString(PyExc_TypeError, "10-tuple required");
47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	448 return NULL;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	449 }
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	450
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	451 if (c_node_id_len != self->nodelen) {
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	452 PyErr_SetString(PyExc_TypeError, "invalid node");
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	453 return NULL;
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	454 }
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	455
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	456 if (self->new_length == self->added_length) {
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	457 size_t new_added_length =
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	458 self->added_length ? self->added_length * 2 : 4096;
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	459 void *new_added = PyMem_Realloc(
c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	460 self->added, new_added_length * self->entry_size);
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	461 if (!new_added)
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	462 return PyErr_NoMemory();
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	463 self->added = new_added;
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	464 self->added_length = new_added_length;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	465 }
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	466 rev = self->length + self->new_length;
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	467 data = self->added + self->entry_size * self->new_length++;
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	468 putbe32(offset_flags >> 32, data);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	469 putbe32(offset_flags & 0xffffffffU, data + 4);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	470 putbe32(comp_len, data + 8);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	471 putbe32(uncomp_len, data + 12);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	472 putbe32(base_rev, data + 16);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	473 putbe32(link_rev, data + 20);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	474 putbe32(parent_1, data + 24);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	475 putbe32(parent_2, data + 28);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	476 memcpy(data + 32, c_node_id, c_node_id_len);
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	477 /* Padding since SHA-1 is only 20 bytes for now */
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	478 memset(data + 32 + c_node_id_len, 0, 32 - c_node_id_len);
47143 47ffc754989a revlog: always "append" full size tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47142 diff changeset	479 if (self->format_version == format_v2) {
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	480 putbe64(sidedata_offset, data + 64);
358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	481 putbe32(sidedata_comp_len, data + 72);
358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	482 /* Padding for 96 bytes alignment */
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	483 memset(data + 76, 0, self->entry_size - 76);
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	484 }
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	485
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	486 if (self->ntinitialized)
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	487 nt_insert(&self->nt, c_node_id, rev);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	488
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	489 Py_CLEAR(self->headrevs);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	490 Py_RETURN_NONE;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	491 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	492
46717 502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	493 /* Replace an existing index entry's sidedata offset and length with new ones.
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	494 This cannot be used outside of the context of sidedata rewriting,
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	495 inside the transaction that creates the given revision. */
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	496 static PyObject index_replace_sidedata_info(indexObject self, PyObject *args)
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	497 {
47078 223b47235d1c sidedata: enable sidedata computers to optionally rewrite flags Rapha?l Gom?s <rgomes@octobus.net> parents: 47037 diff changeset	498 uint64_t offset_flags, sidedata_offset;
46717 502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	499 int rev;
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	500 Py_ssize_t sidedata_comp_len;
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	501 char *data;
46875 651e6df2b0a4 clang-format: run the formatter on mercurial/cext/revlog.c Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	502 #if LONG_MAX == 0x7fffffffL
47078 223b47235d1c sidedata: enable sidedata computers to optionally rewrite flags Rapha?l Gom?s <rgomes@octobus.net> parents: 47037 diff changeset	503 const char *const sidedata_format = PY23("nKiK", "nKiK");
46875 651e6df2b0a4 clang-format: run the formatter on mercurial/cext/revlog.c Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	504 #else
47078 223b47235d1c sidedata: enable sidedata computers to optionally rewrite flags Rapha?l Gom?s <rgomes@octobus.net> parents: 47037 diff changeset	505 const char *const sidedata_format = PY23("nkik", "nkik");
46875 651e6df2b0a4 clang-format: run the formatter on mercurial/cext/revlog.c Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	506 #endif
46717 502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	507
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	508 if (self->entry_size == v1_entry_size \|\| self->inlined) {
46717 502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	509 /*
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	510 There is a bug in the transaction handling when going from an
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	511 inline revlog to a separate index and data file. Turn it off until
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	512 it's fixed, since v2 revlogs sometimes get rewritten on exchange.
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	513 See issue6485.
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	514 */
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	515 raise_revlog_error();
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	516 return NULL;
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	517 }
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	518
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	519 if (!PyArg_ParseTuple(args, sidedata_format, &rev, &sidedata_offset,
47078 223b47235d1c sidedata: enable sidedata computers to optionally rewrite flags Rapha?l Gom?s <rgomes@octobus.net> parents: 47037 diff changeset	520 &sidedata_comp_len, &offset_flags))
46717 502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	521 return NULL;
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	522
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	523 if (rev < 0 \|\| rev >= index_length(self)) {
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	524 PyErr_SetString(PyExc_IndexError, "revision outside index");
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	525 return NULL;
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	526 }
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	527 if (rev < self->length) {
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	528 PyErr_SetString(
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	529 PyExc_IndexError,
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	530 "cannot rewrite entries outside of this transaction");
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	531 return NULL;
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	532 }
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	533
46875 651e6df2b0a4 clang-format: run the formatter on mercurial/cext/revlog.c Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	534 /* Find the newly added node, offset from the "already on-disk" length
651e6df2b0a4 clang-format: run the formatter on mercurial/cext/revlog.c Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	535 */
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	536 data = self->added + self->entry_size * (rev - self->length);
47078 223b47235d1c sidedata: enable sidedata computers to optionally rewrite flags Rapha?l Gom?s <rgomes@octobus.net> parents: 47037 diff changeset	537 putbe64(offset_flags, data);
46717 502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	538 putbe64(sidedata_offset, data + 64);
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	539 putbe32(sidedata_comp_len, data + 72);
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	540
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	541 Py_RETURN_NONE;
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	542 }
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	543
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	544 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	545 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	546 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	547 PyObject *s = NULL;
23948 bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	548 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	549
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	550 if (obj == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	551 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	552
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	553 #define istat(__n, __d) \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	554 do { \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	555 s = PyBytes_FromString(__d); \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	556 t = PyInt_FromSsize_t(self->__n); \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	557 if (!s \|\| !t) \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	558 goto bail; \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	559 if (PyDict_SetItem(obj, s, t) == -1) \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	560 goto bail; \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	561 Py_CLEAR(s); \
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	562 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	563 } while (0)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	564
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	565 if (self->added_length)
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	566 istat(new_length, "index entries added");
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	567 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	568 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	569 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	570 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	571 if (self->ntinitialized) {
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	572 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	573 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	574 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	575 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	576 }
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	577
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	578 #undef istat
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	579
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	580 return obj;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	581
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	582 bail:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	583 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	584 Py_XDECREF(s);
23948 bd307b462ce2 parsers: avoid leaking several PyObjects in index_stats Augie Fackler <augie@google.com> parents: 23947 diff changeset	585 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	586 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	587 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	588
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	589 /*
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	590 * 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	591 * the cached copy.
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	592 */
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	593 static PyObject list_copy(PyObject list)
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	594 {
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	595 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	596 PyObject *newlist = PyList_New(len);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	597 Py_ssize_t i;
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	598
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	599 if (newlist == NULL)
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	600 return NULL;
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	601
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	602 for (i = 0; i < len; i++) {
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	603 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	604 Py_INCREF(obj);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	605 PyList_SET_ITEM(newlist, i, obj);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	606 }
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	607
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	608 return newlist;
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	609 }
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	610
34440 7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	611 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	612 {
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	613 if (filter) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	614 PyObject arglist, result;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	615 int isfiltered;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	616
26107 50582df9d7a7 parsers: fix two cases of unsigned long instead of Py_ssize_t Augie Fackler <augie@google.com> parents: 26098 diff changeset	617 arglist = Py_BuildValue("(n)", arg);
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	618 if (!arglist) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	619 return -1;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	620 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	621
46260 abba2d365373 revlog: migrate from PyEval_CallObject to PyObject_Call Augie Fackler <augie@google.com> parents: 46224 diff changeset	622 result = PyObject_Call(filter, arglist, NULL);
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	623 Py_DECREF(arglist);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	624 if (!result) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	625 return -1;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	626 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	627
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	628 /* 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	629 * 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	630 isfiltered = PyObject_IsTrue(result);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	631 Py_DECREF(result);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	632 return isfiltered;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	633 } else {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	634 return 0;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	635 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	636 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	637
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	638 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	639 int parent_2, Py_ssize_t i)
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	640 {
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	641 if (parent_1 >= 0 && phases[parent_1] > phases[i])
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	642 phases[i] = phases[parent_1];
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	643 if (parent_2 >= 0 && phases[parent_2] > phases[i])
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	644 phases[i] = phases[parent_2];
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	645 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	646
26053 b68c9d232db6 reachableroots: use internal "revstates" array to test if rev is a root Yuya Nishihara <yuya@tcha.org> parents: 26052 diff changeset	647 static PyObject reachableroots2(indexObject self, PyObject *args)
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	648 {
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	649
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	650 /* Input */
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	651 long minroot;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	652 PyObject *includepatharg = NULL;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	653 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	654 /* heads and roots are lists */
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	655 PyObject *heads = NULL;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	656 PyObject *roots = NULL;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	657 PyObject *reachable = NULL;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	658
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	659 PyObject *val;
38851 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38850 diff changeset	660 Py_ssize_t len = index_length(self);
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	661 long revnum;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	662 Py_ssize_t k;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	663 Py_ssize_t i;
26042 2a3010ba6f52 reachableroots: give anonymous name to short-lived "numheads" variable Yuya Nishihara <yuya@tcha.org> parents: 26041 diff changeset	664 Py_ssize_t l;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	665 int r;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	666 int parents[2];
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	667
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	668 /* Internal data structure:
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	669 * 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	670 * lentovisit
40561 5c14bf0c5be3 revlog: add blank line in comment to help clang-format Augie Fackler <augie@google.com> parents: 40560 diff changeset	671 *
26044 b3ad349d0e50 reachableroots: extend "revstates" to array of bit flags Yuya Nishihara <yuya@tcha.org> parents: 26043 diff changeset	672 * 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	673 int *tovisit = NULL;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	674 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	675 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	676 char *revstates = NULL;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	677
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	678 /* Get arguments */
26009 bbb698697efc reachableroots: fix transposition of set and list types in PyArg_ParseTuple Augie Fackler <augie@google.com> parents: 26008 diff changeset	679 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	680 &PyList_Type, &roots, &PyBool_Type,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	681 &includepatharg))
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	682 goto bail;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	683
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	684 if (includepatharg == Py_True)
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	685 includepath = 1;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	686
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	687 /* Initialize return set */
26055 607868eccaa7 reachableroots: return list of revisions instead of set Yuya Nishihara <yuya@tcha.org> parents: 26054 diff changeset	688 reachable = PyList_New(0);
607868eccaa7 reachableroots: return list of revisions instead of set Yuya Nishihara <yuya@tcha.org> parents: 26054 diff changeset	689 if (reachable == NULL)
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	690 goto bail;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	691
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	692 /* Initialize internal datastructures */
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	693 tovisit = (int )malloc((len + 1) sizeof(int));
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	694 if (tovisit == NULL) {
26008 59d57ea69ae6 reachableroots: consistently use short-form of PyErr_NoMemory() Augie Fackler <augie@google.com> parents: 26007 diff changeset	695 PyErr_NoMemory();
26016 c8d41c9c23c7 reachableroots: unify bail cases to raise exception correctly Yuya Nishihara <yuya@tcha.org> parents: 26015 diff changeset	696 goto bail;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	697 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	698
26043 f2f0a3ab6e41 reachableroots: rename "seen" array to "revstates" for future extension Yuya Nishihara <yuya@tcha.org> parents: 26042 diff changeset	699 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	700 if (revstates == NULL) {
26008 59d57ea69ae6 reachableroots: consistently use short-form of PyErr_NoMemory() Augie Fackler <augie@google.com> parents: 26007 diff changeset	701 PyErr_NoMemory();
26016 c8d41c9c23c7 reachableroots: unify bail cases to raise exception correctly Yuya Nishihara <yuya@tcha.org> parents: 26015 diff changeset	702 goto bail;
26004 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
26053 b68c9d232db6 reachableroots: use internal "revstates" array to test if rev is a root Yuya Nishihara <yuya@tcha.org> parents: 26052 diff changeset	705 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	706 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	707 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	708 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	709 goto bail;
b68c9d232db6 reachableroots: use internal "revstates" array to test if rev is a root Yuya Nishihara <yuya@tcha.org> parents: 26052 diff changeset	710 /* 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	711 * 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	712 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	713 continue;
b68c9d232db6 reachableroots: use internal "revstates" array to test if rev is a root Yuya Nishihara <yuya@tcha.org> parents: 26052 diff changeset	714 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	715 }
b68c9d232db6 reachableroots: use internal "revstates" array to test if rev is a root Yuya Nishihara <yuya@tcha.org> parents: 26052 diff changeset	716
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	717 /* 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	718 l = PyList_GET_SIZE(heads);
2a3010ba6f52 reachableroots: give anonymous name to short-lived "numheads" variable Yuya Nishihara <yuya@tcha.org> parents: 26041 diff changeset	719 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	720 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	721 if (revnum == -1 && PyErr_Occurred())
c6115c30a376 reachableroots: verify type of each item of heads argument Yuya Nishihara <yuya@tcha.org> parents: 26017 diff changeset	722 goto bail;
26017 44705659da94 reachableroots: verify integer range of heads argument (issue4775) Yuya Nishihara <yuya@tcha.org> parents: 26016 diff changeset	723 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	724 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	725 goto bail;
44705659da94 reachableroots: verify integer range of heads argument (issue4775) Yuya Nishihara <yuya@tcha.org> parents: 26016 diff changeset	726 }
26044 b3ad349d0e50 reachableroots: extend "revstates" to array of bit flags Yuya Nishihara <yuya@tcha.org> parents: 26043 diff changeset	727 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	728 tovisit[lentovisit++] = (int)revnum;
26044 b3ad349d0e50 reachableroots: extend "revstates" to array of bit flags Yuya Nishihara <yuya@tcha.org> parents: 26043 diff changeset	729 revstates[revnum + 1] \|= RS_SEEN;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	730 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	731 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	732
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	733 /* Visit the tovisit list and find the reachable roots */
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	734 k = 0;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	735 while (k < lentovisit) {
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	736 /* 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	737 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	738 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	739 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	740 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	741 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	742 goto bail;
26058 e7fe0a12376c reachableroots: handle error of PyList_Append() Yuya Nishihara <yuya@tcha.org> parents: 26055 diff changeset	743 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	744 Py_DECREF(val);
26058 e7fe0a12376c reachableroots: handle error of PyList_Append() Yuya Nishihara <yuya@tcha.org> parents: 26055 diff changeset	745 if (r < 0)
e7fe0a12376c reachableroots: handle error of PyList_Append() Yuya Nishihara <yuya@tcha.org> parents: 26055 diff changeset	746 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	747 if (includepath == 0)
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	748 continue;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	749 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	750
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	751 /* Add its parents to the list of nodes to visit */
40960 43974cd44967 revlog: introduce a constant for nullrev in `revlog.c` Boris Feld <boris.feld@octobus.net> parents: 40862 diff changeset	752 if (revnum == nullrev)
26041 8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	753 continue;
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	754 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	755 if (r < 0)
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	756 goto bail;
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	757 for (i = 0; i < 2; i++) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	758 if (!(revstates[parents[i] + 1] & RS_SEEN) &&
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	759 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	760 tovisit[lentovisit++] = parents[i];
26044 b3ad349d0e50 reachableroots: extend "revstates" to array of bit flags Yuya Nishihara <yuya@tcha.org> parents: 26043 diff changeset	761 revstates[parents[i] + 1] \|= RS_SEEN;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	762 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	763 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	764 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	765
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	766 /* 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	767 * and add them to the reachable set */
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	768 if (includepath == 1) {
26080 83c9edcac05c reachableroots: silence warning of implicit integer narrowing issued by clang Yuya Nishihara <yuya@tcha.org> parents: 26079 diff changeset	769 long minidx = minroot;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	770 if (minidx < 0)
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	771 minidx = 0;
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	772 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	773 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	774 continue;
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	775 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	776 /* 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	777 * index_get_parents */
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	778 if (r < 0)
8da628be211b reachableroots: reduce nesting level by jumping to next iteration by continue Yuya Nishihara <yuya@tcha.org> parents: 26033 diff changeset	779 goto bail;
26059 8779ce81ea80 reachableroots: unroll loop that checks if one of parents is reachable Yuya Nishihara <yuya@tcha.org> parents: 26058 diff changeset	780 if (((revstates[parents[0] + 1] \|
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	781 revstates[parents[1] + 1]) &
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	782 RS_REACHABLE) &&
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	783 !(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	784 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	785 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	786 if (val == NULL)
8779ce81ea80 reachableroots: unroll loop that checks if one of parents is reachable Yuya Nishihara <yuya@tcha.org> parents: 26058 diff changeset	787 goto bail;
8779ce81ea80 reachableroots: unroll loop that checks if one of parents is reachable Yuya Nishihara <yuya@tcha.org> parents: 26058 diff changeset	788 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	789 Py_DECREF(val);
8779ce81ea80 reachableroots: unroll loop that checks if one of parents is reachable Yuya Nishihara <yuya@tcha.org> parents: 26058 diff changeset	790 if (r < 0)
8779ce81ea80 reachableroots: unroll loop that checks if one of parents is reachable Yuya Nishihara <yuya@tcha.org> parents: 26058 diff changeset	791 goto bail;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	792 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	793 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	794 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	795
26043 f2f0a3ab6e41 reachableroots: rename "seen" array to "revstates" for future extension Yuya Nishihara <yuya@tcha.org> parents: 26042 diff changeset	796 free(revstates);
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	797 free(tovisit);
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	798 return reachable;
26016 c8d41c9c23c7 reachableroots: unify bail cases to raise exception correctly Yuya Nishihara <yuya@tcha.org> parents: 26015 diff changeset	799 bail:
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	800 Py_XDECREF(reachable);
26043 f2f0a3ab6e41 reachableroots: rename "seen" array to "revstates" for future extension Yuya Nishihara <yuya@tcha.org> parents: 26042 diff changeset	801 free(revstates);
26016 c8d41c9c23c7 reachableroots: unify bail cases to raise exception correctly Yuya Nishihara <yuya@tcha.org> parents: 26015 diff changeset	802 free(tovisit);
26010 2c03e521a0c5 reachableroots: return NULL if we're throwing an exception Augie Fackler <augie@google.com> parents: 26009 diff changeset	803 return NULL;
26004 ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	804 }
ff89383a97db reachableroots: add a C implementation Laurent Charignon <lcharignon@fb.com> parents: 25911 diff changeset	805
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	806 static int add_roots_get_min(indexObject self, PyObject roots, char *phases,
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	807 char phase)
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	808 {
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	809 Py_ssize_t len = index_length(self);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	810 PyObject *item;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	811 PyObject *iterator;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	812 int rev, minrev = -1;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	813 char *node;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	814
45175 211063648b29 phases: fix error return with no exception from computephases() Yuya Nishihara <yuya@tcha.org> parents: 45173 diff changeset	815 if (!PySet_Check(roots)) {
211063648b29 phases: fix error return with no exception from computephases() Yuya Nishihara <yuya@tcha.org> parents: 45173 diff changeset	816 PyErr_SetString(PyExc_TypeError,
211063648b29 phases: fix error return with no exception from computephases() Yuya Nishihara <yuya@tcha.org> parents: 45173 diff changeset	817 "roots must be a set of nodes");
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	818 return -2;
45175 211063648b29 phases: fix error return with no exception from computephases() Yuya Nishihara <yuya@tcha.org> parents: 45173 diff changeset	819 }
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	820 iterator = PyObject_GetIter(roots);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	821 if (iterator == NULL)
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	822 return -2;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	823 while ((item = PyIter_Next(iterator))) {
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	824 if (node_check(self->nodelen, item, &node) == -1)
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	825 goto failed;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	826 rev = index_find_node(self, node);
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	827 /* null is implicitly public, so negative is invalid */
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	828 if (rev < 0 \|\| rev >= len)
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	829 goto failed;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	830 phases[rev] = phase;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	831 if (minrev == -1 \|\| minrev > rev)
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	832 minrev = rev;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	833 Py_DECREF(item);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	834 }
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	835 Py_DECREF(iterator);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	836 return minrev;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	837 failed:
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	838 Py_DECREF(iterator);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	839 Py_DECREF(item);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	840 return -2;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	841 }
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	842
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	843 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	844 {
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	845 /* 0: public (untracked), 1: draft, 2: secret, 32: archive,
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	846 96: internal */
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	847 static const char trackedphases[] = {1, 2, 32, 96};
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	848 PyObject *roots = Py_None;
45179 ba5e4b11d085 phases: rename variable used for owned dict of phasesets Yuya Nishihara <yuya@tcha.org> parents: 45178 diff changeset	849 PyObject *phasesetsdict = NULL;
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	850 PyObject *phasesets[4] = {NULL, NULL, NULL, NULL};
38851 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38850 diff changeset	851 Py_ssize_t len = index_length(self);
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	852 char *phases = NULL;
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	853 int minphaserev = -1, rev, i;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	854 const int numphases = (int)(sizeof(phasesets) / sizeof(phasesets[0]));
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	855
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	856 if (!PyArg_ParseTuple(args, "O", &roots))
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	857 return NULL;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	858 if (roots == NULL \|\| !PyDict_Check(roots)) {
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	859 PyErr_SetString(PyExc_TypeError, "roots must be a dictionary");
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	860 return NULL;
36623 a472a897c340 cext: fix computephasesmapsets() not to return without setting an exception Yuya Nishihara <yuya@tcha.org> parents: 36621 diff changeset	861 }
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	862
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	863 phases = calloc(len, 1);
27364 ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	864 if (phases == NULL) {
ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	865 PyErr_NoMemory();
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	866 return NULL;
27364 ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	867 }
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	868
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	869 for (i = 0; i < numphases; ++i) {
45180 a6fde9d789d9 phases: move short-lived PyObject pointers to local scope Yuya Nishihara <yuya@tcha.org> parents: 45179 diff changeset	870 PyObject *pyphase = PyInt_FromLong(trackedphases[i]);
a6fde9d789d9 phases: move short-lived PyObject pointers to local scope Yuya Nishihara <yuya@tcha.org> parents: 45179 diff changeset	871 PyObject *phaseroots = NULL;
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	872 if (pyphase == NULL)
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	873 goto release;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	874 phaseroots = PyDict_GetItem(roots, pyphase);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	875 Py_DECREF(pyphase);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	876 if (phaseroots == NULL)
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	877 continue;
45176 3264d58e8b06 phases: fix clang-format error Yuya Nishihara <yuya@tcha.org> parents: 45175 diff changeset	878 rev = add_roots_get_min(self, phaseroots, phases,
3264d58e8b06 phases: fix clang-format error Yuya Nishihara <yuya@tcha.org> parents: 45175 diff changeset	879 trackedphases[i]);
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	880 if (rev == -2)
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	881 goto release;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	882 if (rev != -1 && (minphaserev == -1 \|\| rev < minphaserev))
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	883 minphaserev = rev;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	884 }
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	885
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	886 for (i = 0; i < numphases; ++i) {
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	887 phasesets[i] = PySet_New(NULL);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	888 if (phasesets[i] == NULL)
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	889 goto release;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	890 }
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	891
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	892 if (minphaserev == -1)
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	893 minphaserev = len;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	894 for (rev = minphaserev; rev < len; ++rev) {
45180 a6fde9d789d9 phases: move short-lived PyObject pointers to local scope Yuya Nishihara <yuya@tcha.org> parents: 45179 diff changeset	895 PyObject *pyphase = NULL;
a6fde9d789d9 phases: move short-lived PyObject pointers to local scope Yuya Nishihara <yuya@tcha.org> parents: 45179 diff changeset	896 PyObject *pyrev = NULL;
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	897 int parents[2];
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	898 /*
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	899 * The parent lookup could be skipped for phaseroots, but
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	900 * phase --force would historically not recompute them
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	901 * correctly, leaving descendents with a lower phase around.
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	902 * As such, unconditionally recompute the phase.
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	903 */
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	904 if (index_get_parents(self, rev, parents, (int)len - 1) < 0)
27364 ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	905 goto release;
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	906 set_phase_from_parents(phases, parents[0], parents[1], rev);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	907 switch (phases[rev]) {
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	908 case 0:
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	909 continue;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	910 case 1:
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	911 pyphase = phasesets[0];
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	912 break;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	913 case 2:
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	914 pyphase = phasesets[1];
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	915 break;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	916 case 32:
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	917 pyphase = phasesets[2];
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	918 break;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	919 case 96:
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	920 pyphase = phasesets[3];
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	921 break;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	922 default:
45177 03332e5f67e9 phases: make sure an exception should be set on error return Yuya Nishihara <yuya@tcha.org> parents: 45176 diff changeset	923 /* this should never happen since the phase number is
03332e5f67e9 phases: make sure an exception should be set on error return Yuya Nishihara <yuya@tcha.org> parents: 45176 diff changeset	924 * specified by this function. */
03332e5f67e9 phases: make sure an exception should be set on error return Yuya Nishihara <yuya@tcha.org> parents: 45176 diff changeset	925 PyErr_SetString(PyExc_SystemError,
03332e5f67e9 phases: make sure an exception should be set on error return Yuya Nishihara <yuya@tcha.org> parents: 45176 diff changeset	926 "bad phase number in internal list");
27364 ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	927 goto release;
36623 a472a897c340 cext: fix computephasesmapsets() not to return without setting an exception Yuya Nishihara <yuya@tcha.org> parents: 36621 diff changeset	928 }
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	929 pyrev = PyInt_FromLong(rev);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	930 if (pyrev == NULL)
27364 ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	931 goto release;
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	932 if (PySet_Add(pyphase, pyrev) == -1) {
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	933 Py_DECREF(pyrev);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	934 goto release;
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	935 }
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	936 Py_DECREF(pyrev);
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	937 }
45179 ba5e4b11d085 phases: rename variable used for owned dict of phasesets Yuya Nishihara <yuya@tcha.org> parents: 45178 diff changeset	938
ba5e4b11d085 phases: rename variable used for owned dict of phasesets Yuya Nishihara <yuya@tcha.org> parents: 45178 diff changeset	939 phasesetsdict = _dict_new_presized(numphases);
ba5e4b11d085 phases: rename variable used for owned dict of phasesets Yuya Nishihara <yuya@tcha.org> parents: 45178 diff changeset	940 if (phasesetsdict == NULL)
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	941 goto release;
45141 9719e118e4af cext: remove unused variables Joerg Sonnenberger <joerg@bec.de> parents: 45131 diff changeset	942 for (i = 0; i < numphases; ++i) {
45180 a6fde9d789d9 phases: move short-lived PyObject pointers to local scope Yuya Nishihara <yuya@tcha.org> parents: 45179 diff changeset	943 PyObject *pyphase = PyInt_FromLong(trackedphases[i]);
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	944 if (pyphase == NULL)
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	945 goto release;
45179 ba5e4b11d085 phases: rename variable used for owned dict of phasesets Yuya Nishihara <yuya@tcha.org> parents: 45178 diff changeset	946 if (PyDict_SetItem(phasesetsdict, pyphase, phasesets[i]) ==
ba5e4b11d085 phases: rename variable used for owned dict of phasesets Yuya Nishihara <yuya@tcha.org> parents: 45178 diff changeset	947 -1) {
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	948 Py_DECREF(pyphase);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	949 goto release;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	950 }
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	951 Py_DECREF(phasesets[i]);
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	952 phasesets[i] = NULL;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	953 }
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	954
45179 ba5e4b11d085 phases: rename variable used for owned dict of phasesets Yuya Nishihara <yuya@tcha.org> parents: 45178 diff changeset	955 return Py_BuildValue("nN", len, phasesetsdict);
25190 22438cfd11b5 phases: add set per phase in C phase computation Laurent Charignon <lcharignon@fb.com> parents: 24879 diff changeset	956
27364 ad1cc1435b13 parsers: simplify error logic in compute_phases_map_sets Bryan O'Sullivan <bos@serpentine.com> parents: 27341 diff changeset	957 release:
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	958 for (i = 0; i < numphases; ++i)
61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	959 Py_XDECREF(phasesets[i]);
45179 ba5e4b11d085 phases: rename variable used for owned dict of phasesets Yuya Nishihara <yuya@tcha.org> parents: 45178 diff changeset	960 Py_XDECREF(phasesetsdict);
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	961
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	962 free(phases);
45131 61e7464477ac phases: sparsify phaseroots and phasesets Joerg Sonnenberger <joerg@bec.de> parents: 44587 diff changeset	963 return NULL;
24443 539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	964 }
539b3c7eea44 phase: compute phases in C Laurent Charignon <lcharignon@fb.com> parents: 24214 diff changeset	965
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	966 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	967 {
25297 3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	968 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	969 char *nothead = NULL;
22540 9a860ac8c216 parsers: fix uninitialize variable warning David Soria Parra <davidsp@fb.com> parents: 22484 diff changeset	970 PyObject *heads = NULL;
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	971 PyObject *filter = NULL;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	972 PyObject *filteredrevs = Py_None;
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	973
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	974 if (!PyArg_ParseTuple(args, "\|O", &filteredrevs)) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	975 return NULL;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	976 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	977
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	978 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	979 return list_copy(self->headrevs);
bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	980
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	981 Py_DECREF(self->filteredrevs);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	982 self->filteredrevs = filteredrevs;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	983 Py_INCREF(filteredrevs);
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	984
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	985 if (filteredrevs != Py_None) {
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	986 filter = PyObject_GetAttrString(filteredrevs, "__contains__");
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	987 if (!filter) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	988 PyErr_SetString(
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	989 PyExc_TypeError,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	990 "filteredrevs has no attribute __contains__");
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	991 goto bail;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	992 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	993 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	994
38851 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38850 diff changeset	995 len = index_length(self);
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	996 heads = PyList_New(0);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	997 if (heads == NULL)
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	998 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	999 if (len == 0) {
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1000 PyObject *nullid = PyInt_FromLong(-1);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1001 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	1002 Py_XDECREF(nullid);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1003 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1004 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1005 goto done;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1006 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1007
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1008 nothead = calloc(len, 1);
27366 7e8a883da171 parsers: add a missed PyErr_NoMemory Bryan O'Sullivan <bos@serpentine.com> parents: 27365 diff changeset	1009 if (nothead == NULL) {
7e8a883da171 parsers: add a missed PyErr_NoMemory Bryan O'Sullivan <bos@serpentine.com> parents: 27365 diff changeset	1010 PyErr_NoMemory();
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1011 goto bail;
27366 7e8a883da171 parsers: add a missed PyErr_NoMemory Bryan O'Sullivan <bos@serpentine.com> parents: 27365 diff changeset	1012 }
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1013
28386 1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	1014 for (i = len - 1; i >= 0; i--) {
25297 3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	1015 int isfiltered;
3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	1016 int parents[2];
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1017
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1018 /* 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	1019 * 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	1020 * 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	1021 */
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	1022 if (nothead[i] != 1) {
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	1023 isfiltered = check_filter(filter, i);
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	1024 if (isfiltered == -1) {
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	1025 PyErr_SetString(PyExc_TypeError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1026 "unable to check filter");
28386 1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	1027 goto bail;
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	1028 }
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	1029
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	1030 if (isfiltered) {
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	1031 nothead[i] = 1;
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	1032 continue;
1c658391b22f parsers: optimize filtered headrevs logic Durham Goode <durham@fb.com> parents: 27638 diff changeset	1033 }
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1034 }
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1035
25860 895f04955a49 parsers: silence warning of implicit integer conversion issued by clang Yuya Nishihara <yuya@tcha.org> parents: 25810 diff changeset	1036 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	1037 goto bail;
25297 3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	1038 for (j = 0; j < 2; j++) {
3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	1039 if (parents[j] >= 0)
3966e39fea98 changelog: fix bug in heads computation Laurent Charignon <lcharignon@fb.com> parents: 25296 diff changeset	1040 nothead[parents[j]] = 1;
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1041 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1042 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1043
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1044 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	1045 PyObject *head;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1046
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1047 if (nothead[i])
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1048 continue;
22400 888bc106de83 parsers: fix typing issue when constructing Python integer object Henrik Stuart <hg@hstuart.dk> parents: 22399 diff changeset	1049 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	1050 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	1051 Py_XDECREF(head);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1052 goto bail;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1053 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1054 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1055
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1056 done:
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1057 self->headrevs = heads;
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1058 Py_XDECREF(filter);
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1059 free(nothead);
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	1060 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	1061 bail:
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	1062 Py_XDECREF(filter);
16786 2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1063 Py_XDECREF(heads);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1064 free(nothead);
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1065 return NULL;
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1066 }
2631cd5dd244 revlog: switch to a C version of headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16784 diff changeset	1067
33174 f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	1068 /**
f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	1069 * 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	1070 *
f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	1071 * 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	1072 */
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1073 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	1074 {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1075 const char *data;
41018 f4113489e4d4 revlog: catch revlog corruption in index_baserev Boris Feld <boris.feld@octobus.net> parents: 40813 diff changeset	1076 int result;
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1077
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	1078 data = index_deref(self, rev);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	1079 if (data == NULL)
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	1080 return -2;
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	1081 result = getbe32(data + 16);
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1082
41018 f4113489e4d4 revlog: catch revlog corruption in index_baserev Boris Feld <boris.feld@octobus.net> parents: 40813 diff changeset	1083 if (result > rev) {
f4113489e4d4 revlog: catch revlog corruption in index_baserev Boris Feld <boris.feld@octobus.net> parents: 40813 diff changeset	1084 PyErr_Format(
f4113489e4d4 revlog: catch revlog corruption in index_baserev Boris Feld <boris.feld@octobus.net> parents: 40813 diff changeset	1085 PyExc_ValueError,
f4113489e4d4 revlog: catch revlog corruption in index_baserev Boris Feld <boris.feld@octobus.net> parents: 40813 diff changeset	1086 "corrupted revlog, revision base above revision: %d, %d",
f4113489e4d4 revlog: catch revlog corruption in index_baserev Boris Feld <boris.feld@octobus.net> parents: 40813 diff changeset	1087 rev, result);
f4113489e4d4 revlog: catch revlog corruption in index_baserev Boris Feld <boris.feld@octobus.net> parents: 40813 diff changeset	1088 return -2;
f4113489e4d4 revlog: catch revlog corruption in index_baserev Boris Feld <boris.feld@octobus.net> parents: 40813 diff changeset	1089 }
41019 7542466b94e2 revlog: cache delta base value under -1 Boris Feld <boris.feld@octobus.net> parents: 41018 diff changeset	1090 if (result < -1) {
7542466b94e2 revlog: cache delta base value under -1 Boris Feld <boris.feld@octobus.net> parents: 41018 diff changeset	1091 PyErr_Format(
7542466b94e2 revlog: cache delta base value under -1 Boris Feld <boris.feld@octobus.net> parents: 41018 diff changeset	1092 PyExc_ValueError,
41283 4948b327d3b9 cext: clang-format new code coming from stable branch Yuya Nishihara <yuya@tcha.org> parents: 41129 diff changeset	1093 "corrupted revlog, revision base out of range: %d, %d", rev,
4948b327d3b9 cext: clang-format new code coming from stable branch Yuya Nishihara <yuya@tcha.org> parents: 41129 diff changeset	1094 result);
41019 7542466b94e2 revlog: cache delta base value under -1 Boris Feld <boris.feld@octobus.net> parents: 41018 diff changeset	1095 return -2;
7542466b94e2 revlog: cache delta base value under -1 Boris Feld <boris.feld@octobus.net> parents: 41018 diff changeset	1096 }
41018 f4113489e4d4 revlog: catch revlog corruption in index_baserev Boris Feld <boris.feld@octobus.net> parents: 40813 diff changeset	1097 return result;
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1098 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1099
41085 a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1100 /**
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1101 * Find if a revision is a snapshot or not
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1102 *
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1103 * Only relevant for sparse-revlog case.
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1104 * Callers must ensure that rev is in a valid range.
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1105 */
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1106 static int index_issnapshotrev(indexObject *self, Py_ssize_t rev)
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1107 {
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1108 int ps[2];
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1109 Py_ssize_t base;
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1110 while (rev >= 0) {
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1111 base = (Py_ssize_t)index_baserev(self, rev);
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1112 if (base == rev) {
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1113 base = -1;
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1114 }
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1115 if (base == -2) {
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1116 assert(PyErr_Occurred());
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1117 return -1;
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1118 }
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1119 if (base == -1) {
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1120 return 1;
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1121 }
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1122 if (index_get_parents(self, rev, ps, (int)rev) < 0) {
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1123 assert(PyErr_Occurred());
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1124 return -1;
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1125 };
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1126 if (base == ps[0] \|\| base == ps[1]) {
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1127 return 0;
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1128 }
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1129 rev = base;
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1130 }
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1131 return rev == -1;
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1132 }
a6556b09bf83 revlog: add a native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41078 diff changeset	1133
41086 a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1134 static PyObject index_issnapshot(indexObject self, PyObject *value)
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1135 {
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1136 long rev;
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1137 int issnap;
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1138 Py_ssize_t length = index_length(self);
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1139
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1140 if (!pylong_to_long(value, &rev)) {
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1141 return NULL;
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1142 }
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1143 if (rev < -1 \|\| rev >= length) {
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1144 PyErr_Format(PyExc_ValueError, "revlog index out of range: %ld",
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1145 rev);
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1146 return NULL;
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1147 };
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1148 issnap = index_issnapshotrev(self, (Py_ssize_t)rev);
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1149 if (issnap < 0) {
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1150 return NULL;
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1151 };
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1152 return PyBool_FromLong((long)issnap);
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1153 }
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	1154
41108 38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1155 static PyObject index_findsnapshots(indexObject self, PyObject *args)
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1156 {
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1157 Py_ssize_t start_rev;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1158 PyObject *cache;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1159 Py_ssize_t base;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1160 Py_ssize_t rev;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1161 PyObject *key = NULL;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1162 PyObject *value = NULL;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1163 const Py_ssize_t length = index_length(self);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1164 if (!PyArg_ParseTuple(args, "O!n", &PyDict_Type, &cache, &start_rev)) {
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1165 return NULL;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1166 }
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1167 for (rev = start_rev; rev < length; rev++) {
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1168 int issnap;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1169 PyObject *allvalues = NULL;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1170 issnap = index_issnapshotrev(self, rev);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1171 if (issnap < 0) {
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1172 goto bail;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1173 }
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1174 if (issnap == 0) {
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1175 continue;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1176 }
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1177 base = (Py_ssize_t)index_baserev(self, rev);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1178 if (base == rev) {
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1179 base = -1;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1180 }
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1181 if (base == -2) {
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1182 assert(PyErr_Occurred());
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1183 goto bail;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1184 }
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1185 key = PyInt_FromSsize_t(base);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1186 allvalues = PyDict_GetItem(cache, key);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1187 if (allvalues == NULL && PyErr_Occurred()) {
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1188 goto bail;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1189 }
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1190 if (allvalues == NULL) {
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1191 int r;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1192 allvalues = PyList_New(0);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1193 if (!allvalues) {
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1194 goto bail;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1195 }
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1196 r = PyDict_SetItem(cache, key, allvalues);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1197 Py_DECREF(allvalues);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1198 if (r < 0) {
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1199 goto bail;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1200 }
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1201 }
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1202 value = PyInt_FromSsize_t(rev);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1203 if (PyList_Append(allvalues, value)) {
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1204 goto bail;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1205 }
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1206 Py_CLEAR(key);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1207 Py_CLEAR(value);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1208 }
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1209 Py_RETURN_NONE;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1210 bail:
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1211 Py_XDECREF(key);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1212 Py_XDECREF(value);
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1213 return NULL;
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1214 }
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	1215
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1216 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	1217 {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1218 int rev, generaldelta;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1219 PyObject *stoparg;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1220 int stoprev, iterrev, baserev = -1;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1221 int stopped;
33174 f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	1222 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	1223 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	1224
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1225 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	1226 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1227 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1228
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1229 if (PyInt_Check(stoparg)) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1230 stoprev = (int)PyInt_AsLong(stoparg);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1231 if (stoprev == -1 && PyErr_Occurred()) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1232 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1233 }
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1234 } else if (stoparg == Py_None) {
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1235 stoprev = -2;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1236 } else {
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1237 PyErr_SetString(PyExc_ValueError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1238 "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	1239 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1240 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1241
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	1242 if (rev < 0 \|\| rev >= length) {
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1243 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	1244 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1245 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1246
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1247 chain = PyList_New(0);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1248 if (chain == NULL) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1249 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1250 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1251
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1252 baserev = index_baserev(self, rev);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1253
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1254 /* This should never happen. */
33174 f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	1255 if (baserev <= -2) {
f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	1256 /* 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	1257 assert(PyErr_Occurred());
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1258 goto bail;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1259 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1260
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1261 iterrev = rev;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1262
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1263 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	1264 PyObject *value = PyInt_FromLong(iterrev);
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1265 if (value == NULL) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1266 goto bail;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1267 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1268 if (PyList_Append(chain, value)) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1269 Py_DECREF(value);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1270 goto bail;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1271 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1272 Py_DECREF(value);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1273
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1274 if (generaldelta) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1275 iterrev = baserev;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1276 } else {
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1277 iterrev--;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1278 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1279
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1280 if (iterrev < 0) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1281 break;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1282 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1283
38868 0db50770f388 index: don't add 1 to length variables Martin von Zweigbergk <martinvonz@google.com> parents: 38867 diff changeset	1284 if (iterrev >= length) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1285 PyErr_SetString(PyExc_IndexError,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1286 "revision outside index");
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1287 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1288 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1289
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1290 baserev = index_baserev(self, iterrev);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1291
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1292 /* This should never happen. */
33174 f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	1293 if (baserev <= -2) {
f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	1294 /* 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	1295 assert(PyErr_Occurred());
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1296 goto bail;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1297 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1298 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1299
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1300 if (iterrev == stoprev) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1301 stopped = 1;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1302 } else {
33174 f4f52bb362e6 revlog: address review feedback for deltachain C implementation Gregory Szorc <gregory.szorc@gmail.com> parents: 33171 diff changeset	1303 PyObject *value = PyInt_FromLong(iterrev);
33171 6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1304 if (value == NULL) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1305 goto bail;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1306 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1307 if (PyList_Append(chain, value)) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1308 Py_DECREF(value);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1309 goto bail;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1310 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1311 Py_DECREF(value);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1312
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1313 stopped = 0;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1314 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1315
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1316 if (PyList_Reverse(chain)) {
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1317 goto bail;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1318 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1319
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1320 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	1321 Py_DECREF(chain);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1322 return result;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1323
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1324 bail:
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1325 Py_DECREF(chain);
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1326 return NULL;
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1327 }
6d678ab1b10d revlog: C implementation of delta chain resolution Gregory Szorc <gregory.szorc@gmail.com> parents: 32384 diff changeset	1328
40705 4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1329 static inline int64_t
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1330 index_segment_span(indexObject *self, Py_ssize_t start_rev, Py_ssize_t end_rev)
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1331 {
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1332 int64_t start_offset;
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1333 int64_t end_offset;
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1334 int end_size;
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1335 start_offset = index_get_start(self, start_rev);
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1336 if (start_offset < 0) {
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1337 return -1;
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1338 }
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1339 end_offset = index_get_start(self, end_rev);
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1340 if (end_offset < 0) {
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1341 return -1;
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1342 }
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1343 end_size = index_get_length(self, end_rev);
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1344 if (end_size < 0) {
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1345 return -1;
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1346 }
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1347 if (end_offset < start_offset) {
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1348 PyErr_Format(PyExc_ValueError,
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1349 "corrupted revlog index: inconsistent offset "
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1350 "between revisions (%zd) and (%zd)",
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1351 start_rev, end_rev);
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1352 return -1;
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1353 }
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1354 return (end_offset - start_offset) + (int64_t)end_size;
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1355 }
4ec6a24029d2 sparse-revlog: add a `index_segment_span` function in C Boris Feld <boris.feld@octobus.net> parents: 40704 diff changeset	1356
40742 8edca70dc951 revlog: update the documentation for `trim_endidx` Boris Feld <boris.feld@octobus.net> parents: 40741 diff changeset	1357 /* returns endidx so that revs[startidx:endidx] has no empty trailing revs */
40706 0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1358 static Py_ssize_t trim_endidx(indexObject self, const Py_ssize_t revs,
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1359 Py_ssize_t startidx, Py_ssize_t endidx)
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1360 {
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1361 int length;
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1362 while (endidx > 1 && endidx > startidx) {
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1363 length = index_get_length(self, revs[endidx - 1]);
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1364 if (length < 0) {
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1365 return -1;
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1366 }
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1367 if (length != 0) {
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1368 break;
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1369 }
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1370 endidx -= 1;
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1371 }
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1372 return endidx;
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1373 }
0650be877a37 sparse-revlog: add a `trim_endidx` function in C Boris Feld <boris.feld@octobus.net> parents: 40705 diff changeset	1374
40707 cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1375 struct Gap {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1376 int64_t size;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1377 Py_ssize_t idx;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1378 };
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1379
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1380 static int gap_compare(const void left, const void right)
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1381 {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1382 const struct Gap l_left = ((const struct Gap )left);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1383 const struct Gap l_right = ((const struct Gap )right);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1384 if (l_left->size < l_right->size) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1385 return -1;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1386 } else if (l_left->size > l_right->size) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1387 return 1;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1388 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1389 return 0;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1390 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1391 static int Py_ssize_t_compare(const void left, const void right)
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1392 {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1393 const Py_ssize_t l_left = (const Py_ssize_t )left;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1394 const Py_ssize_t l_right = (const Py_ssize_t )right;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1395 if (l_left < l_right) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1396 return -1;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1397 } else if (l_left > l_right) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1398 return 1;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1399 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1400 return 0;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1401 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1402
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1403 static PyObject index_slicechunktodensity(indexObject self, PyObject *args)
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1404 {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1405 /* method arguments */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1406 PyObject list_revs = NULL; / revisions in the chain */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1407 double targetdensity = 0; /* min density to achieve */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1408 Py_ssize_t mingapsize = 0; /* threshold to ignore gaps */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1409
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1410 /* other core variables */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1411 Py_ssize_t idxlen = index_length(self);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1412 Py_ssize_t i; /* used for various iteration */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1413 PyObject result = NULL; / the final return of the function */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1414
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1415 /* generic information about the delta chain being slice */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1416 Py_ssize_t num_revs = 0; /* size of the full delta chain */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1417 Py_ssize_t revs = NULL; / native array of revision in the chain */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1418 int64_t chainpayload = 0; /* sum of all delta in the chain */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1419 int64_t deltachainspan = 0; /* distance from first byte to last byte */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1420
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1421 /* variable used for slicing the delta chain */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1422 int64_t readdata = 0; /* amount of data currently planned to be read */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1423 double density = 0; /* ration of payload data compared to read ones */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1424 int64_t previous_end;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1425 struct Gap gaps = NULL; / array of notable gap in the chain */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1426 Py_ssize_t num_gaps =
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1427 0; /* total number of notable gap recorded so far */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1428 Py_ssize_t selected_indices = NULL; / indices of gap skipped over */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1429 Py_ssize_t num_selected = 0; /* number of gaps skipped */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1430 PyObject chunk = NULL; / individual slice */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1431 PyObject allchunks = NULL; / all slices */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1432 Py_ssize_t previdx;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1433
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1434 /* parsing argument */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1435 if (!PyArg_ParseTuple(args, "O!dn", &PyList_Type, &list_revs,
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1436 &targetdensity, &mingapsize)) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1437 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1438 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1439
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1440 /* If the delta chain contains a single element, we do not need slicing
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1441 */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1442 num_revs = PyList_GET_SIZE(list_revs);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1443 if (num_revs <= 1) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1444 result = PyTuple_Pack(1, list_revs);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1445 goto done;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1446 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1447
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1448 /* Turn the python list into a native integer array (for efficiency) */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1449 revs = (Py_ssize_t *)calloc(num_revs, sizeof(Py_ssize_t));
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1450 if (revs == NULL) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1451 PyErr_NoMemory();
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1452 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1453 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1454 for (i = 0; i < num_revs; i++) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1455 Py_ssize_t revnum = PyInt_AsLong(PyList_GET_ITEM(list_revs, i));
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1456 if (revnum == -1 && PyErr_Occurred()) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1457 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1458 }
40963 2e305e54eae3 sparse-revlog: protect C code against delta chain including nullrev Boris Feld <boris.feld@octobus.net> parents: 40962 diff changeset	1459 if (revnum < nullrev \|\| revnum >= idxlen) {
40756 c85964d715fd sparse: raise a move verbose index error from the C code Boris Feld <boris.feld@octobus.net> parents: 40742 diff changeset	1460 PyErr_Format(PyExc_IndexError,
c85964d715fd sparse: raise a move verbose index error from the C code Boris Feld <boris.feld@octobus.net> parents: 40742 diff changeset	1461 "index out of range: %zd", revnum);
40707 cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1462 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1463 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1464 revs[i] = revnum;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1465 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1466
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1467 /* Compute and check various property of the unsliced delta chain */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1468 deltachainspan = index_segment_span(self, revs[0], revs[num_revs - 1]);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1469 if (deltachainspan < 0) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1470 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1471 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1472
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1473 if (deltachainspan <= mingapsize) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1474 result = PyTuple_Pack(1, list_revs);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1475 goto done;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1476 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1477 chainpayload = 0;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1478 for (i = 0; i < num_revs; i++) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1479 int tmp = index_get_length(self, revs[i]);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1480 if (tmp < 0) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1481 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1482 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1483 chainpayload += tmp;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1484 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1485
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1486 readdata = deltachainspan;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1487 density = 1.0;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1488
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1489 if (0 < deltachainspan) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1490 density = (double)chainpayload / (double)deltachainspan;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1491 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1492
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1493 if (density >= targetdensity) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1494 result = PyTuple_Pack(1, list_revs);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1495 goto done;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1496 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1497
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1498 /* if chain is too sparse, look for relevant gaps */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1499 gaps = (struct Gap *)calloc(num_revs, sizeof(struct Gap));
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1500 if (gaps == NULL) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1501 PyErr_NoMemory();
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1502 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1503 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1504
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1505 previous_end = -1;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1506 for (i = 0; i < num_revs; i++) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1507 int64_t revstart;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1508 int revsize;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1509 revstart = index_get_start(self, revs[i]);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1510 if (revstart < 0) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1511 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1512 };
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1513 revsize = index_get_length(self, revs[i]);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1514 if (revsize < 0) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1515 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1516 };
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1517 if (revsize == 0) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1518 continue;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1519 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1520 if (previous_end >= 0) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1521 int64_t gapsize = revstart - previous_end;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1522 if (gapsize > mingapsize) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1523 gaps[num_gaps].size = gapsize;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1524 gaps[num_gaps].idx = i;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1525 num_gaps += 1;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1526 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1527 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1528 previous_end = revstart + revsize;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1529 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1530 if (num_gaps == 0) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1531 result = PyTuple_Pack(1, list_revs);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1532 goto done;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1533 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1534 qsort(gaps, num_gaps, sizeof(struct Gap), &gap_compare);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1535
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1536 /* Slice the largest gap first, they improve the density the most */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1537 selected_indices =
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1538 (Py_ssize_t )malloc((num_gaps + 1) sizeof(Py_ssize_t));
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1539 if (selected_indices == NULL) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1540 PyErr_NoMemory();
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1541 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1542 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1543
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1544 for (i = num_gaps - 1; i >= 0; i--) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1545 selected_indices[num_selected] = gaps[i].idx;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1546 readdata -= gaps[i].size;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1547 num_selected += 1;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1548 if (readdata <= 0) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1549 density = 1.0;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1550 } else {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1551 density = (double)chainpayload / (double)readdata;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1552 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1553 if (density >= targetdensity) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1554 break;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1555 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1556 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1557 qsort(selected_indices, num_selected, sizeof(Py_ssize_t),
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1558 &Py_ssize_t_compare);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1559
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1560 /* create the resulting slice */
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1561 allchunks = PyList_New(0);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1562 if (allchunks == NULL) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1563 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1564 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1565 previdx = 0;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1566 selected_indices[num_selected] = num_revs;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1567 for (i = 0; i <= num_selected; i++) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1568 Py_ssize_t idx = selected_indices[i];
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1569 Py_ssize_t endidx = trim_endidx(self, revs, previdx, idx);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1570 if (endidx < 0) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1571 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1572 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1573 if (previdx < endidx) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1574 chunk = PyList_GetSlice(list_revs, previdx, endidx);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1575 if (chunk == NULL) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1576 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1577 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1578 if (PyList_Append(allchunks, chunk) == -1) {
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1579 goto bail;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1580 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1581 Py_DECREF(chunk);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1582 chunk = NULL;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1583 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1584 previdx = idx;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1585 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1586 result = allchunks;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1587 goto done;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1588
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1589 bail:
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1590 Py_XDECREF(allchunks);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1591 Py_XDECREF(chunk);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1592 done:
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1593 free(revs);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1594 free(gaps);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1595 free(selected_indices);
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1596 return result;
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1597 }
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	1598
16618 6bae941b58ad parsers: change the type of nt_level Bryan O'Sullivan <bryano@fb.com> parents: 16617 diff changeset	1599 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	1600 {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1601 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	1602 if (!(level & 1))
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1603 v >>= 4;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1604 return v & 0xf;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1605 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1606
16616 8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1607 /*
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1608 * Return values:
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1609 *
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1610 * -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	1611 * -2: not found
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1612 * rest: valid rev
8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1613 */
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1614 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	1615 int hex)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1616 {
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1617 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	1618 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	1619
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1620 /* If the input is binary, do a fast check for the nullid first. */
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1621 if (!hex && nodelen == self->nodelen && node[0] == '\0' &&
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1622 node[1] == '\0' && memcmp(node, nullid, self->nodelen) == 0)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1623 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1624
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1625 if (hex)
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1626 maxlevel = nodelen;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1627 else
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1628 maxlevel = 2 * nodelen;
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1629 if (maxlevel > 2 * self->nodelen)
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1630 maxlevel = 2 * self->nodelen;
16641 e6dfbc5df76f parsers: use the correct maximum radix tree depth Bryan O'Sullivan <bryano@fb.com> parents: 16604 diff changeset	1631
e6dfbc5df76f parsers: use the correct maximum radix tree depth Bryan O'Sullivan <bryano@fb.com> parents: 16604 diff changeset	1632 for (level = off = 0; level < maxlevel; level++) {
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1633 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	1634 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	1635 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	1636
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1637 if (v < 0) {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1638 const char *n;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1639 Py_ssize_t i;
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1640
38846 f738c502e43b index: store nullrev as -1 in nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38845 diff changeset	1641 v = -(v + 2);
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1642 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	1643 if (n == NULL)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1644 return -2;
16663 a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1645 for (i = level; i < maxlevel; i++)
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1646 if (getnybble(node, i) != nt_level(n, i))
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1647 return -2;
a955e05dd7a0 parsers: allow hex keys Bryan O'Sullivan <bryano@fb.com> parents: 16642 diff changeset	1648 return v;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1649 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1650 if (v == 0)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1651 return -2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1652 off = v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1653 }
16616 8f79aabd96f6 parsers: allow nt_find to signal an ambiguous match Bryan O'Sullivan <bryano@fb.com> parents: 16615 diff changeset	1654 /* 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	1655 return -4;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1656 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1657
38915 fff675dfb80b index: pass only nodetree to nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38914 diff changeset	1658 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	1659 {
38915 fff675dfb80b index: pass only nodetree to nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38914 diff changeset	1660 if (self->length == self->capacity) {
46224 fcc324a228fe revlog: use size_t for nodetree capacity Jun Wu <quark@fb.com> parents: 46144 diff changeset	1661 size_t newcapacity;
38938 dcd395dc98d8 index: remove side-effect from failed nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38937 diff changeset	1662 nodetreenode *newnodes;
39071 06ff7ea4f440 index: avoid duplicating capacity-growth expression Martin von Zweigbergk <martinvonz@google.com> parents: 39070 diff changeset	1663 newcapacity = self->capacity * 2;
46224 fcc324a228fe revlog: use size_t for nodetree capacity Jun Wu <quark@fb.com> parents: 46144 diff changeset	1664 if (newcapacity >= SIZE_MAX / sizeof(nodetreenode)) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1665 PyErr_SetString(PyExc_MemoryError,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1666 "overflow in nt_new");
24623 2262d7bc469e parsers: check for memory allocation overflows more carefully Bryan O'Sullivan <bryano@fb.com> parents: 24622 diff changeset	1667 return -1;
2262d7bc469e parsers: check for memory allocation overflows more carefully Bryan O'Sullivan <bryano@fb.com> parents: 24622 diff changeset	1668 }
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1669 newnodes =
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1670 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	1671 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	1672 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	1673 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1674 }
38938 dcd395dc98d8 index: remove side-effect from failed nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38937 diff changeset	1675 self->capacity = newcapacity;
dcd395dc98d8 index: remove side-effect from failed nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38937 diff changeset	1676 self->nodes = newnodes;
38915 fff675dfb80b index: pass only nodetree to nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38914 diff changeset	1677 memset(&self->nodes[self->length], 0,
fff675dfb80b index: pass only nodetree to nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38914 diff changeset	1678 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	1679 }
38915 fff675dfb80b index: pass only nodetree to nt_new() Martin von Zweigbergk <martinvonz@google.com> parents: 38914 diff changeset	1680 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	1681 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1682
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1683 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	1684 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1685 int level = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1686 int off = 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1687
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1688 while (level < 2 * self->nodelen) {
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1689 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	1690 nodetreenode *n;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1691 int v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1692
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1693 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	1694 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	1695
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1696 if (v == 0) {
38846 f738c502e43b index: store nullrev as -1 in nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38845 diff changeset	1697 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	1698 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1699 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1700 if (v < 0) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1701 const char *oldnode =
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1702 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	1703 int noff;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1704
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	1705 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	1706 return -1;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1707 if (!memcmp(oldnode, node, self->nodelen)) {
38846 f738c502e43b index: store nullrev as -1 in nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38845 diff changeset	1708 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	1709 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1710 }
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1711 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	1712 if (noff == -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1713 return -1;
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1714 /* 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	1715 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	1716 off = noff;
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1717 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	1718 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	1719 if (level > self->depth)
b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1720 self->depth = level;
b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1721 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	1722 } else {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1723 level += 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1724 off = v;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1725 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1726 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1727
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1728 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1729 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1730
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1731 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	1732 {
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1733 Py_ssize_t rev;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1734 const char *node;
39227 42cc76d0f836 cext: fix revlog compiler error on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 39226 diff changeset	1735 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	1736 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	1737 return NULL;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1738 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	1739 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	1740 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	1741 return NULL;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1742 }
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1743 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	1744 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	1745 return NULL;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1746 Py_RETURN_NONE;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1747 }
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1748
38940 b6fb71a0a005 index: make most "nt_" functions take a nodetree Martin von Zweigbergk <martinvonz@google.com>* parents: 38939 diff changeset	1749 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	1750 {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1751 /* 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	1752 */
38846 f738c502e43b index: store nullrev as -1 in nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38845 diff changeset	1753 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	1754 }
f9fc59ea3135 index: create function for deleting node from nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38821 diff changeset	1755
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1756 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	1757 {
39225 fcaffbd7e635 index: fix a comment about overflow-checking Martin von Zweigbergk <martinvonz@google.com> parents: 39219 diff changeset	1758 /* 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	1759 self->nodes = NULL;
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1760
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1761 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	1762 /* 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	1763 * 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	1764 self->capacity = (capacity < 4 ? 4 : capacity / 2);
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1765 self->nodelen = index->nodelen;
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1766 self->depth = 0;
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1767 self->splits = 0;
46224 fcc324a228fe revlog: use size_t for nodetree capacity Jun Wu <quark@fb.com> parents: 46144 diff changeset	1768 if (self->capacity > SIZE_MAX / sizeof(nodetreenode)) {
39070 4dd92a15fcca index: move check for too large capacity into nt_init() Martin von Zweigbergk <martinvonz@google.com> parents: 39069 diff changeset	1769 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	1770 return -1;
4dd92a15fcca index: move check for too large capacity into nt_init() Martin von Zweigbergk <martinvonz@google.com> parents: 39069 diff changeset	1771 }
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1772 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	1773 if (self->nodes == NULL) {
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1774 PyErr_NoMemory();
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1775 return -1;
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1776 }
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1777 self->length = 1;
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1778 return 0;
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1779 }
c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1780
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1781 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	1782 {
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1783 PyObject *index;
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1784 unsigned capacity;
40860 18a8def6e1b5 revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol Yuya Nishihara <yuya@tcha.org> parents: 40859 diff changeset	1785 if (!PyArg_ParseTuple(args, "O!I", &HgRevlogIndex_Type, &index,
18a8def6e1b5 revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol Yuya Nishihara <yuya@tcha.org> parents: 40859 diff changeset	1786 &capacity))
39218 b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1787 return -1;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1788 Py_INCREF(index);
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1789 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	1790 }
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1791
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1792 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	1793 {
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1794 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	1795 }
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1796
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1797 /*
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1798 * 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	1799 *
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1800 * Return values:
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1801 *
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1802 * -3: error (exception set)
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1803 * -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	1804 * rest: length of shortest prefix
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1805 */
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1806 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	1807 {
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1808 int level, off;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1809
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1810 for (level = off = 0; level < 2 * self->nodelen; level++) {
38943 2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1811 int k, v;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1812 nodetreenode *n = &self->nodes[off];
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1813 k = nt_level(node, level);
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1814 v = n->children[k];
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1815 if (v < 0) {
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1816 const char *n;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1817 v = -(v + 2);
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1818 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	1819 if (n == NULL)
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1820 return -3;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1821 if (memcmp(node, n, self->nodelen) != 0)
38943 2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1822 /*
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1823 * 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	1824 * 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	1825 * not exist).
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1826 */
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1827 return -2;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1828 return level + 1;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1829 }
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1830 if (v == 0)
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1831 return -2;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1832 off = v;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1833 }
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1834 /*
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1835 * 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	1836 * 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	1837 * 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	1838 */
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1839 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	1840 return -3;
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1841 }
2b89e20c450c index: move all "nt_" functions to one place Martin von Zweigbergk <martinvonz@google.com>* parents: 38942 diff changeset	1842
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1843 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	1844 {
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1845 PyObject *val;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1846 char *node;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1847 int length;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1848
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1849 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	1850 return NULL;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1851 if (node_check(self->nt.nodelen, val, &node) == -1)
39226 7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1852 return NULL;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1853
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1854 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	1855 if (length == -3)
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1856 return NULL;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1857 if (length == -2) {
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1858 raise_revlog_error();
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1859 return NULL;
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1860 }
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1861 return PyInt_FromLong(length);
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1862 }
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1863
39218 b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1864 static void nt_dealloc(nodetree *self)
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1865 {
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1866 free(self->nodes);
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1867 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	1868 }
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1869
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1870 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	1871 {
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1872 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	1873 nt_dealloc(&self->nt);
39218 b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1874 PyObject_Del(self);
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1875 }
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1876
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1877 static PyMethodDef ntobj_methods[] = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1878 {"insert", (PyCFunction)ntobj_insert, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1879 "insert an index entry"},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1880 {"shortest", (PyCFunction)ntobj_shortest, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1881 "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	1882 {NULL} /* Sentinel */
39226 7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1883 };
7a759ad2d06d shortest: use nodetree for finding shortest node within revset Martin von Zweigbergk <martinvonz@google.com> parents: 39225 diff changeset	1884
39218 b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1885 static PyTypeObject nodetreeType = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1886 PyVarObject_HEAD_INIT(NULL, 0) /* header */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1887 "parsers.nodetree", /* tp_name */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1888 sizeof(nodetreeObject), /* tp_basicsize */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1889 0, /* tp_itemsize */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1890 (destructor)ntobj_dealloc, /* tp_dealloc */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1891 0, /* tp_print */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1892 0, /* tp_getattr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1893 0, /* tp_setattr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1894 0, /* tp_compare */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1895 0, /* tp_repr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1896 0, /* tp_as_number */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1897 0, /* tp_as_sequence */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1898 0, /* tp_as_mapping */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1899 0, /* tp_hash */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1900 0, /* tp_call */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1901 0, /* tp_str */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1902 0, /* tp_getattro */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1903 0, /* tp_setattro */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1904 0, /* tp_as_buffer */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1905 Py_TPFLAGS_DEFAULT, /* tp_flags */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1906 "nodetree", /* tp_doc */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1907 0, /* tp_traverse */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1908 0, /* tp_clear */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1909 0, /* tp_richcompare */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1910 0, /* tp_weaklistoffset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1911 0, /* tp_iter */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1912 0, /* tp_iternext */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1913 ntobj_methods, /* tp_methods */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1914 0, /* tp_members */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1915 0, /* tp_getset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1916 0, /* tp_base */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1917 0, /* tp_dict */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1918 0, /* tp_descr_get */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1919 0, /* tp_descr_set */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1920 0, /* tp_dictoffset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1921 (initproc)ntobj_init, /* tp_init */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	1922 0, /* tp_alloc */
39218 b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1923 };
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	1924
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1925 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	1926 {
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1927 if (!self->ntinitialized) {
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	1928 if (nt_init(&self->nt, self, (int)self->length) == -1) {
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1929 nt_dealloc(&self->nt);
38912 d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	1930 return -1;
d1bc0e7c862b index: extract a type for the nodetree Martin von Zweigbergk <martinvonz@google.com> parents: 38911 diff changeset	1931 }
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1932 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	1933 nt_dealloc(&self->nt);
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1934 return -1;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1935 }
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1936 self->ntinitialized = 1;
38851 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38850 diff changeset	1937 self->ntrev = (int)index_length(self);
16615 96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1938 self->ntlookups = 1;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1939 self->ntmisses = 0;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1940 }
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1941 return 0;
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1942 }
96fa9dd1db38 parsers: factor out radix tree initialization Bryan O'Sullivan <bryano@fb.com> parents: 16614 diff changeset	1943
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1944 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1945 * Return values:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1946 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1947 * -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	1948 * -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	1949 * rest: valid rev
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1950 */
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1951 static int index_find_node(indexObject self, const char node)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1952 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1953 int rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1954
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	1955 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	1956 return -3;
44bbc89ec5e0 revlog: remove micro-optimization for looking up only nullid Martin von Zweigbergk <martinvonz@google.com> parents: 38819 diff changeset	1957
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1958 self->ntlookups++;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1959 rev = nt_find(&self->nt, node, self->nodelen, 0);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1960 if (rev >= -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1961 return rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1962
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1963 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1964 * 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	1965 * 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	1966 * 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	1967 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1968 * 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	1969 * 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	1970 * 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	1971 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1972 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	1973 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	1974 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	1975 if (n == NULL)
37861 a9d9802d577e revlog: don't say "not found" on internal error Martin von Zweigbergk <martinvonz@google.com> parents: 37860 diff changeset	1976 return -3;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1977 if (memcmp(node, n, self->nodelen) == 0) {
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1978 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	1979 return -3;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1980 break;
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 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1983 } else {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1984 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	1985 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	1986 if (n == NULL)
a9d9802d577e revlog: don't say "not found" on internal error Martin von Zweigbergk <martinvonz@google.com> parents: 37860 diff changeset	1987 return -3;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	1988 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	1989 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	1990 return -3;
16614 1d800eb9ba52 parsers: update ntrev when we stop scanning Bryan O'Sullivan <bryano@fb.com> parents: 16597 diff changeset	1991 }
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	1992 if (memcmp(node, n, self->nodelen) == 0) {
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1993 break;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1994 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1995 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1996 self->ntrev = rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1997 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1998
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	1999 if (rev >= 0)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2000 return rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2001 return -2;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2002 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2003
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2004 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	2005 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2006 char *node;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2007 int rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2008
40598 fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	2009 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	2010 long idx;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	2011 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	2012 return NULL;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	2013 }
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	2014 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	2015 }
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2016
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2017 if (node_check(self->nodelen, 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	2018 return NULL;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2019 rev = index_find_node(self, node);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2020 if (rev >= -1)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2021 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	2022 if (rev == -2)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2023 raise_revlog_error();
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2024 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2025 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2026
37929 9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	2027 /*
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	2028 * 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	2029 */
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2030 static int index_populate_nt(indexObject *self)
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2031 {
37929 9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	2032 int rev;
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	2033 if (self->ntrev > 0) {
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	2034 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	2035 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	2036 if (n == NULL)
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	2037 return -1;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2038 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	2039 return -1;
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	2040 }
37930 892592475094 revlog: use literal -1 instead of variable that always has that value Martin von Zweigbergk <martinvonz@google.com> parents: 37929 diff changeset	2041 self->ntrev = -1;
37929 9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	2042 }
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	2043 return 0;
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	2044 }
9c6d1d41b3e6 revlog: extract function for fully populating the radix tree Martin von Zweigbergk <martinvonz@google.com> parents: 37861 diff changeset	2045
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2046 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	2047 {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2048 const char *fullnode;
42067 b01bbb8ff1f2 cext: make revlog.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41283 diff changeset	2049 Py_ssize_t nodelen;
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2050 char *node;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2051 int rev, i;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2052
36620 186c6df3a373 py3: bulk-replace 'const char' format specifier passed to PyArg_ParseTuple() Yuya Nishihara <yuya@tcha.org> parents: 36619 diff changeset	2053 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	2054 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2055
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	2056 if (nodelen < 1) {
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2057 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	2058 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2059 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2060
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2061 if (nodelen > 2 * self->nodelen) {
17353 bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	2062 PyErr_SetString(PyExc_ValueError, "key too long");
bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	2063 return NULL;
bde1185f406c revlog: don't try to partialmatch strings those length > 40 sorcerer parents: 17165 diff changeset	2064 }
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2065
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2066 for (i = 0; i < nodelen; i++)
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2067 hexdigit(node, i);
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2068 if (PyErr_Occurred()) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2069 /* input contains non-hex characters */
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2070 PyErr_Clear();
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2071 Py_RETURN_NONE;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2072 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2073
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	2074 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	2075 return NULL;
38942 3e74c01102af index: rename "nt_(indexObject self,...)" functions to "index_" Martin von Zweigbergk <martinvonz@google.com>* parents: 38941 diff changeset	2076 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	2077 return NULL;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2078 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	2079
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2080 switch (rev) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2081 case -4:
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2082 raise_revlog_error();
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2083 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2084 case -2:
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2085 Py_RETURN_NONE;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2086 case -1:
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2087 return PyBytes_FromStringAndSize(nullid, self->nodelen);
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2088 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2089
37860 a91f31a1e281 revlog: extract function for getting node from known-to-exist rev Martin von Zweigbergk <martinvonz@google.com> parents: 37858 diff changeset	2090 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	2091 if (fullnode == NULL) {
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2092 return NULL;
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2093 }
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2094 return PyBytes_FromStringAndSize(fullnode, self->nodelen);
16665 e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2095 }
e410be860393 revlog: speed up prefix matching against nodes Bryan O'Sullivan <bryano@fb.com> parents: 16664 diff changeset	2096
37968 0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2097 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	2098 {
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2099 PyObject *val;
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2100 char *node;
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2101 int length;
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2102
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2103 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	2104 return NULL;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2105 if (node_check(self->nodelen, val, &node) == -1)
37968 0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2106 return NULL;
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2107
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2108 self->ntlookups++;
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	2109 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	2110 return NULL;
38942 3e74c01102af index: rename "nt_(indexObject self,...)" functions to "index_" Martin von Zweigbergk <martinvonz@google.com>* parents: 38941 diff changeset	2111 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	2112 return NULL;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2113 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	2114 if (length == -3)
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2115 return NULL;
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2116 if (length == -2) {
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2117 raise_revlog_error();
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2118 return NULL;
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2119 }
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2120 return PyInt_FromLong(length);
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2121 }
0304f22497fa revlog: use node tree (native code) for shortest() calculation Martin von Zweigbergk <martinvonz@google.com> parents: 37930 diff changeset	2122
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2123 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	2124 {
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	2125 PyObject *val;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2126 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	2127 int rev;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2128
16679 2950d186a927 parsers: strictly check for 20-byte hashes where they're required Bryan O'Sullivan <bryano@fb.com> parents: 16641 diff changeset	2129 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	2130 return NULL;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2131 if (node_check(self->nodelen, 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	2132 return NULL;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2133 rev = index_find_node(self, node);
27638 90e3c5129226 cleanup: remove superfluous space after space after equals (C) timeless <timeless@mozdev.org> parents: 27592 diff changeset	2134 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	2135 return NULL;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2136 if (rev == -2)
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2137 Py_RETURN_NONE;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2138 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	2139 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2140
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2141 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	2142 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2143 char *node;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2144
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2145 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	2146 long rev;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	2147 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	2148 return -1;
fa33196088c4 revlog: replace PyInt_AS_LONG with a more portable helper function Augie Fackler <augie@google.com> parents: 40562 diff changeset	2149 }
38866 aa33988ad8ab index: return False for "len(index) in index" Martin von Zweigbergk <martinvonz@google.com> parents: 38852 diff changeset	2150 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	2151 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2152
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2153 if (node_check(self->nodelen, 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	2154 return -1;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2155
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2156 switch (index_find_node(self, node)) {
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2157 case -3:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2158 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2159 case -2:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2160 return 0;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2161 default:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2162 return 1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2163 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2164 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2165
43534 0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43532 diff changeset	2166 static PyObject index_m_has_node(indexObject self, PyObject *args)
0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43532 diff changeset	2167 {
0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43532 diff changeset	2168 int ret = index_contains(self, args);
0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43532 diff changeset	2169 if (ret < 0)
0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43532 diff changeset	2170 return NULL;
0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43532 diff changeset	2171 return PyBool_FromLong((long)ret);
0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43532 diff changeset	2172 }
0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43532 diff changeset	2173
43552 bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2174 static PyObject index_m_rev(indexObject self, PyObject *val)
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2175 {
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2176 char *node;
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2177 int rev;
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2178
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2179 if (node_check(self->nodelen, val, &node) == -1)
43552 bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2180 return NULL;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2181 rev = index_find_node(self, node);
43552 bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2182 if (rev >= -1)
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2183 return PyInt_FromLong(rev);
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2184 if (rev == -2)
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2185 raise_revlog_error();
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2186 return NULL;
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2187 }
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2188
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2189 typedef uint64_t bitmask;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2190
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2191 /*
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2192 * 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	2193 * 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	2194 * "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	2195 */
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2196 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	2197 int revcount)
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2198 {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2199 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	2200 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	2201 PyObject *gca = PyList_New(0);
20555 4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	2202 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	2203 int maxrev = -1;
22399 9f490afcb067 parsers: use bitmask type consistently in find_gca_candidates Henrik Stuart <hg@hstuart.dk> parents: 21871 diff changeset	2204 bitmask sp;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2205 bitmask *seen;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2206
19727 3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	2207 if (gca == NULL)
3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	2208 return PyErr_NoMemory();
3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	2209
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2210 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	2211 if (revs[i] > maxrev)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2212 maxrev = revs[i];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2213 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2214
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2215 seen = calloc(sizeof(*seen), maxrev + 1);
19727 3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	2216 if (seen == NULL) {
3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	2217 Py_DECREF(gca);
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2218 return PyErr_NoMemory();
19727 3d07b4a2f743 parsers: correctly handle a failed allocation Bryan O'Sullivan <bryano@fb.com> parents: 19726 diff changeset	2219 }
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2220
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2221 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	2222 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	2223
20555 4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	2224 interesting = revcount;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2225
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2226 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	2227 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	2228 int parents[2];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2229
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2230 if (!sv)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2231 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2232
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2233 if (sv < poison) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2234 interesting -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2235 if (sv == allseen) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2236 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	2237 if (obj == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2238 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2239 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	2240 Py_DECREF(obj);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2241 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2242 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2243 sv \|= poison;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2244 for (i = 0; i < revcount; i++) {
20555 4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	2245 if (revs[i] == v)
4add43865a9b ancestors: remove unnecessary handling of 'left' Mads Kiilerich <madski@unity3d.com> parents: 20554 diff changeset	2246 goto done;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2247 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2248 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2249 }
25810 82d6a35cf432 parsers: fix buffer overflow by invalid parent revision read from revlog Yuya Nishihara <yuya@tcha.org> parents: 25584 diff changeset	2250 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	2251 goto bail;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2252
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2253 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	2254 int p = parents[i];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2255 if (p == -1)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2256 continue;
19030 48d6f436363e parsers: fix variable declaration position issue Matt Mackall <mpm@selenic.com> parents: 18988 diff changeset	2257 sp = seen[p];
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2258 if (sv < poison) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2259 if (sp == 0) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2260 seen[p] = sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2261 interesting++;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2262 } 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	2263 seen[p] \|= sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2264 } else {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2265 if (sp && sp < poison)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2266 interesting--;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2267 seen[p] = sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2268 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2269 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2270 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2271
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2272 done:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2273 free(seen);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2274 return gca;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2275 bail:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2276 free(seen);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2277 Py_XDECREF(gca);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2278 return NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2279 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2280
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2281 /*
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2282 * 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	2283 * path to the root.
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2284 */
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2285 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	2286 {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2287 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	2288 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	2289 int depth, interesting = NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2290 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	2291 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	2292 long *seen = NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2293 int maxrev = -1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2294 long final;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2295
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2296 if (revcount > capacity) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2297 PyErr_Format(PyExc_OverflowError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2298 "bitset size (%ld) > capacity (%ld)",
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2299 (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	2300 return NULL;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2301 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2302
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2303 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	2304 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	2305 if (n > maxrev)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2306 maxrev = n;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2307 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2308
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2309 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	2310 if (depth == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2311 return PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2312
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2313 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	2314 if (seen == NULL) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2315 PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2316 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2317 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2318
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	2319 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	2320 if (interesting == NULL) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2321 PyErr_NoMemory();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2322 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2323 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2324
19502 8704477ad3b6 ancestor.deepest: sort revs in C version Siddharth Agarwal <sid0@fb.com> parents: 19062 diff changeset	2325 if (PyList_Sort(revs) == -1)
8704477ad3b6 ancestor.deepest: sort revs in C version Siddharth Agarwal <sid0@fb.com> parents: 19062 diff changeset	2326 goto bail;
8704477ad3b6 ancestor.deepest: sort revs in C version Siddharth Agarwal <sid0@fb.com> parents: 19062 diff changeset	2327
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2328 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	2329 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	2330 long b = 1l << i;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2331 depth[n] = 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2332 seen[n] = b;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2333 interesting[b] = 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2334 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2335
33475 f501322512b6 parsers: fix invariant bug in find_deepest (issue5623) Sune Foldager <cryo@cyanite.org> parents: 33174 diff changeset	2336 /* 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	2337 * interesting. */
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2338 ninteresting = (int)revcount;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2339
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2340 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	2341 int dv = depth[v];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2342 int parents[2];
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2343 long sv;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2344
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2345 if (dv == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2346 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2347
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2348 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	2349 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	2350 goto bail;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2351
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2352 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	2353 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	2354 long sp;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2355 int dp;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2356
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2357 if (p == -1)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2358 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2359
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2360 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	2361 sp = seen[p];
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2362 if (dp <= dv) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2363 depth[p] = dv + 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2364 if (sp != sv) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2365 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	2366 seen[p] = sv;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2367 if (sp) {
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2368 interesting[sp] -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2369 if (interesting[sp] == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2370 ninteresting -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2371 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2372 }
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2373 } 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	2374 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	2375 if (nsp == sp)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2376 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2377 seen[p] = nsp;
19503 f2dfda6ac152 ancestor.deepest: decrement ninteresting correctly (issue3984) Wei, Elson <elson.wei@gmail.com> parents: 19502 diff changeset	2378 interesting[sp] -= 1;
33475 f501322512b6 parsers: fix invariant bug in find_deepest (issue5623) Sune Foldager <cryo@cyanite.org> parents: 33174 diff changeset	2379 if (interesting[sp] == 0)
19503 f2dfda6ac152 ancestor.deepest: decrement ninteresting correctly (issue3984) Wei, Elson <elson.wei@gmail.com> parents: 19502 diff changeset	2380 ninteresting -= 1;
33475 f501322512b6 parsers: fix invariant bug in find_deepest (issue5623) Sune Foldager <cryo@cyanite.org> parents: 33174 diff changeset	2381 if (interesting[nsp] == 0)
f501322512b6 parsers: fix invariant bug in find_deepest (issue5623) Sune Foldager <cryo@cyanite.org> parents: 33174 diff changeset	2382 ninteresting += 1;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2383 interesting[nsp] += 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2384 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2385 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2386 interesting[sv] -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2387 if (interesting[sv] == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2388 ninteresting -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2389 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2390
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2391 final = 0;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2392 j = ninteresting;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2393 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	2394 if (interesting[i] == 0)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2395 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2396 final \|= i;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2397 j -= 1;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2398 }
21730 8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	2399 if (final == 0) {
8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	2400 keys = PyList_New(0);
8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	2401 goto bail;
8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	2402 }
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2403
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2404 dict = PyDict_New();
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2405 if (dict == NULL)
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2406 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2407
19504 2fa303619b4d ancestor.deepest: ignore ninteresting while building result (issue3984) Siddharth Agarwal <sid0@fb.com> parents: 19503 diff changeset	2408 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	2409 PyObject *key;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2410
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2411 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	2412 continue;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2413
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2414 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	2415 Py_INCREF(key);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2416 Py_INCREF(Py_None);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2417 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	2418 Py_DECREF(key);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2419 Py_DECREF(Py_None);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2420 goto bail;
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2421 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2422 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2423
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2424 keys = PyDict_Keys(dict);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2425
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2426 bail:
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2427 free(depth);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2428 free(seen);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2429 free(interesting);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2430 Py_XDECREF(dict);
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2431
21730 8da100383dc3 parsers.c: fix a couple of memory leaks Danek Duvall <danek.duvall@oracle.com> parents: 21103 diff changeset	2432 return keys;
18988 5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2433 }
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2434
5bae936764bb parsers: a C implementation of the new ancestors algorithm Bryan O'Sullivan <bryano@fb.com> parents: 18900 diff changeset	2435 /*
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2436 * Given a (possibly overlapping) set of revs, return all the
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2437 * common ancestors heads: heads(::args[0] and ::a[1] and ...)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2438 */
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2439 static PyObject index_commonancestorsheads(indexObject self, PyObject *args)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2440 {
21103 628c16489d1c parsers: remove unnecessary gca variable in index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 21102 diff changeset	2441 PyObject *ret = NULL;
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2442 Py_ssize_t argcount, i, len;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2443 bitmask repeat = 0;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2444 int revcount = 0;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2445 int *revs;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2446
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2447 argcount = PySequence_Length(args);
31469 a43fd9ec2a39 parsers: use Python memory allocator in commonancestorsheads() Gregory Szorc <gregory.szorc@gmail.com> parents: 31426 diff changeset	2448 revs = PyMem_Malloc(argcount * sizeof(*revs));
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2449 if (argcount > 0 && revs == NULL)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2450 return PyErr_NoMemory();
38851 781b2720d2ac index: don't include nullid in len() Martin von Zweigbergk <martinvonz@google.com> parents: 38850 diff changeset	2451 len = index_length(self);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2452
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2453 for (i = 0; i < argcount; i++) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2454 static const int capacity = 24;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2455 PyObject *obj = PySequence_GetItem(args, i);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2456 bitmask x;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2457 long val;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2458
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2459 if (!PyInt_Check(obj)) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2460 PyErr_SetString(PyExc_TypeError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2461 "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	2462 Py_DECREF(obj);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2463 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2464 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2465 val = PyInt_AsLong(obj);
23945 33d6aaf84c9e parsers.c: fix a memory leak in index_commonancestorsheads Augie Fackler <augie@google.com> parents: 23944 diff changeset	2466 Py_DECREF(obj);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2467 if (val == -1) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2468 ret = PyList_New(0);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2469 goto done;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2470 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2471 if (val < 0 \|\| val >= len) {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2472 PyErr_SetString(PyExc_IndexError, "index out of range");
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2473 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2474 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2475 /* this cheesy bloom filter lets us avoid some more
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2476 * expensive duplicate checks in the common set-is-disjoint
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2477 * case */
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2478 x = 1ull << (val & 0x3f);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2479 if (repeat & x) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2480 int k;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2481 for (k = 0; k < revcount; k++) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2482 if (val == revs[k])
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2483 goto duplicate;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2484 }
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2485 } else
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2486 repeat \|= x;
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2487 if (revcount >= capacity) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2488 PyErr_Format(PyExc_OverflowError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2489 "bitset size (%d) > capacity (%d)",
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2490 revcount, capacity);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2491 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2492 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2493 revs[revcount++] = (int)val;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2494 duplicate:;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2495 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2496
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2497 if (revcount == 0) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2498 ret = PyList_New(0);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2499 goto done;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2500 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2501 if (revcount == 1) {
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2502 PyObject *obj;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2503 ret = PyList_New(1);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2504 if (ret == NULL)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2505 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2506 obj = PyInt_FromLong(revs[0]);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2507 if (obj == NULL)
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2508 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2509 PyList_SET_ITEM(ret, 0, obj);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2510 goto done;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2511 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2512
21103 628c16489d1c parsers: remove unnecessary gca variable in index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 21102 diff changeset	2513 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	2514 if (ret == NULL)
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2515 goto bail;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2516
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2517 done:
31469 a43fd9ec2a39 parsers: use Python memory allocator in commonancestorsheads() Gregory Szorc <gregory.szorc@gmail.com> parents: 31426 diff changeset	2518 PyMem_Free(revs);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2519 return ret;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2520
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2521 bail:
31469 a43fd9ec2a39 parsers: use Python memory allocator in commonancestorsheads() Gregory Szorc <gregory.szorc@gmail.com> parents: 31426 diff changeset	2522 PyMem_Free(revs);
21102 4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2523 Py_XDECREF(ret);
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2524 return NULL;
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2525 }
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2526
4eb6553789e1 parsers: introduce index_commonancestorsheads Mads Kiilerich <madski@unity3d.com> parents: 20797 diff changeset	2527 /*
24004 8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2528 * 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	2529 * 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	2530 */
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2531 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	2532 {
26048 0be2f81aadc3 parsers: fix two leaks in index_ancestors Augie Fackler <augie@google.com> parents: 26044 diff changeset	2533 PyObject *ret;
24004 8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2534 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	2535 if (gca == NULL)
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2536 return NULL;
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2537
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2538 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	2539 return gca;
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2540 }
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2541
26048 0be2f81aadc3 parsers: fix two leaks in index_ancestors Augie Fackler <augie@google.com> parents: 26044 diff changeset	2542 ret = find_deepest(self, gca);
0be2f81aadc3 parsers: fix two leaks in index_ancestors Augie Fackler <augie@google.com> parents: 26044 diff changeset	2543 Py_DECREF(gca);
0be2f81aadc3 parsers: fix two leaks in index_ancestors Augie Fackler <augie@google.com> parents: 26044 diff changeset	2544 return ret;
24004 8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2545 }
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2546
8a5267cd5286 parsers: rewrite index_ancestors() in terms of index_commonancestorsheads() Martin von Zweigbergk <martinvonz@google.com> parents: 23948 diff changeset	2547 /*
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2548 * 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	2549 */
38942 3e74c01102af index: rename "nt_(indexObject self,...)" functions to "index_" Martin von Zweigbergk <martinvonz@google.com>* parents: 38941 diff changeset	2550 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	2551 {
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2552 Py_ssize_t i, len;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2553
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2554 len = self->length + self->new_length;
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2555 i = start - self->length;
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2556 if (i < 0)
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2557 return;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2558
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2559 for (i = start; i < len; i++)
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2560 nt_delete_node(&self->nt, index_deref(self, i) + 32);
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2561
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2562 self->new_length = 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	2563 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2564
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2565 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2566 * Delete a numeric range of revs, which must be at the end of the
43582 ae5e39512ca0 revlog: delete references to deleted nullid sentinel value Martin von Zweigbergk <martinvonz@google.com> parents: 43554 diff changeset	2567 * range.
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2568 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2569 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	2570 {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2571 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	2572 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	2573 int ret = 0;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2574
30171 7a3b59f0329a parsers: avoid PySliceObject cast on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 30169 diff changeset	2575 /* 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	2576 #ifdef IS_PY3K
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2577 if (PySlice_GetIndicesEx(item, length, &start, &stop, &step,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2578 &slicelength) < 0)
30171 7a3b59f0329a parsers: avoid PySliceObject cast on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 30169 diff changeset	2579 #else
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2580 if (PySlice_GetIndicesEx((PySliceObject *)item, length, &start, &stop,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2581 &step, &slicelength) < 0)
30171 7a3b59f0329a parsers: avoid PySliceObject cast on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 30169 diff changeset	2582 #endif
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2583 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2584
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2585 if (slicelength <= 0)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2586 return 0;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2587
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2588 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	2589 stop = start;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2590
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2591 if (step < 0) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2592 stop = start + 1;
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2593 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	2594 step = -step;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2595 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2596
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2597 if (step != 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2598 PyErr_SetString(PyExc_ValueError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2599 "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	2600 return -1;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2601 }
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2602
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2603 if (stop != length - 1) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2604 PyErr_SetString(PyExc_IndexError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2605 "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	2606 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2607 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2608
39068 52e9bf215f96 index: don't include nullid in the internal "length" field Martin von Zweigbergk <martinvonz@google.com> parents: 38944 diff changeset	2609 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	2610 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	2611 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	2612
43532 53581e220ba3 revlog: clean up the node of all revision stripped in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42096 diff changeset	2613 for (i = start; 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	2614 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	2615 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	2616 return -1;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2617
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2618 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	2619 }
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2620 if (self->new_length)
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2621 index_invalidate_added(self, self->length);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2622 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	2623 self->ntrev = (int)start;
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2624 } else if (self->new_length) {
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2625 self->new_length = 0;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2626 }
43847 49fa0b31ee1d cext-revlog: fixed __delitem__ for uninitialized nodetree Georges Racinet <georges.racinet@octobus.net> parents: 43582 diff changeset	2627
39068 52e9bf215f96 index: don't include nullid in the internal "length" field Martin von Zweigbergk <martinvonz@google.com> parents: 38944 diff changeset	2628 self->length = start;
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2629 goto done;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2630 }
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2631
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2632 if (self->ntinitialized) {
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2633 index_invalidate_added(self, start);
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2634 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	2635 self->ntrev = (int)start;
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2636 } else {
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2637 self->new_length = 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	2638 }
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2639 done:
16787 bda96ce993f9 parsers: cache the result of index_headrevs Bryan O'Sullivan <bryano@fb.com> parents: 16786 diff changeset	2640 Py_CLEAR(self->headrevs);
16784 12a852c7c763 parsers: reduce raw_length when truncating Bryan O'Sullivan <bryano@fb.com> parents: 16732 diff changeset	2641 return ret;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2642 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2643
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2644 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2645 * Supported ops:
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2646 *
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2647 * slice deletion
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2648 * 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	2649 * 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	2650 */
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2651 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	2652 PyObject *value)
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2653 {
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2654 char *node;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2655 long rev;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2656
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2657 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	2658 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	2659
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2660 if (node_check(self->nodelen, 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	2661 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2662
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2663 if (value == NULL)
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2664 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	2665 : 0;
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2666 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	2667 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	2668 if (!PyErr_Occurred())
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2669 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	2670 return -1;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2671 }
23468 ee311681e591 parsers: ensure revlog index node tree is initialized before insertion Mike Edgar <adgar@google.com> parents: 23087 diff changeset	2672
38941 c0b6a7c78a21 index: split up nt_init() in two Martin von Zweigbergk <martinvonz@google.com> parents: 38940 diff changeset	2673 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	2674 return -1;
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2675 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	2676 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2677
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2678 /*
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2679 * 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	2680 * 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	2681 */
22401 9ba8a93e55f5 parsers: ensure correct return type for inline_scan Henrik Stuart <hg@hstuart.dk> parents: 22400 diff changeset	2682 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	2683 {
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2684 const char data = (const char )self->buf.buf;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2685 Py_ssize_t pos = 0;
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2686 Py_ssize_t end = self->buf.len;
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	2687 long incr = self->entry_size;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2688 Py_ssize_t len = 0;
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	2689
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	2690 while (pos + self->entry_size <= end && pos >= 0) {
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2691 uint32_t comp_len, sidedata_comp_len = 0;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2692 /* 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	2693 comp_len = getbe32(data + pos + 8);
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	2694 if (self->entry_size == v2_entry_size) {
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2695 sidedata_comp_len = getbe32(data + pos + 72);
358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2696 }
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	2697 incr = self->entry_size + comp_len + sidedata_comp_len;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2698 if (offsets)
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2699 offsets[len] = data + pos;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2700 len++;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2701 pos += incr;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2702 }
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	2703
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	2704 if (pos != end) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2705 if (!PyErr_Occurred())
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2706 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	2707 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2708 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2709
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2710 return len;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2711 }
13254 5ef5eb1f3515 revlog: only build the nodemap on demand Matt Mackall <mpm@selenic.com> parents: 11361 diff changeset	2712
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2713 static int index_init(indexObject self, PyObject args, PyObject *kwargs)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2714 {
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2715 PyObject data_obj, inlined_obj, *revlogv2;
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2716 Py_ssize_t size;
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2717
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2718 static char *kwlist[] = {"data", "inlined", "revlogv2", NULL};
358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2719
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2720 /* 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	2721 */
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2722 self->added = NULL;
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2723 self->new_length = 0;
0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2724 self->added_length = 0;
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2725 self->data = NULL;
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2726 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	2727 self->headrevs = NULL;
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	2728 self->filteredrevs = Py_None;
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	2729 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	2730 self->ntinitialized = 0;
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2731 self->offsets = NULL;
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2732 self->nodelen = 20;
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2733 self->nullentry = NULL;
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2734
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2735 revlogv2 = NULL;
358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2736 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO\|O", kwlist,
358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2737 &data_obj, &inlined_obj, &revlogv2))
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2738 return -1;
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2739 if (!PyObject_CheckBuffer(data_obj)) {
6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2740 PyErr_SetString(PyExc_TypeError,
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2741 "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	2742 return -1;
8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2743 }
46144 e4f6dae01b3b cext: shut-up sign compare warnings Joerg Sonnenberger <joerg@bec.de> parents: 46141 diff changeset	2744 if (self->nodelen < 20 \|\| self->nodelen > (Py_ssize_t)sizeof(nullid)) {
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2745 PyErr_SetString(PyExc_RuntimeError, "unsupported node size");
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2746 return -1;
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2747 }
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2748
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2749 if (revlogv2 && PyObject_IsTrue(revlogv2)) {
47141 ac72eee94035 revlog: introduce an explicit `format_version` member in the index struct Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47140 diff changeset	2750 self->format_version = format_v2;
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	2751 self->entry_size = v2_entry_size;
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2752 } else {
47141 ac72eee94035 revlog: introduce an explicit `format_version` member in the index struct Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47140 diff changeset	2753 self->format_version = format_v1;
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	2754 self->entry_size = v1_entry_size;
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2755 }
358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2756
47142 4292bed8da7c revlog: make the index always return the same tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47141 diff changeset	2757 self->nullentry =
4292bed8da7c revlog: make the index always return the same tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47141 diff changeset	2758 Py_BuildValue(PY23("iiiiiiis#ii", "iiiiiiiy#ii"), 0, 0, 0, -1, -1,
4292bed8da7c revlog: make the index always return the same tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47141 diff changeset	2759 -1, -1, nullid, self->nodelen, 0, 0);
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2760
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2761 if (!self->nullentry)
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2762 return -1;
41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2763 PyObject_GC_UnTrack(self->nullentry);
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2764
6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2765 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	2766 return -1;
6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2767 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	2768
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2769 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	2770 self->data = data_obj;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2771
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2772 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	2773 self->ntrev = -1;
16597 b767382a8675 parsers: fix refcount bug on corrupt index Matt Mackall <mpm@selenic.com> parents: 16572 diff changeset	2774 Py_INCREF(self->data);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2775
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2776 if (self->inlined) {
22401 9ba8a93e55f5 parsers: ensure correct return type for inline_scan Henrik Stuart <hg@hstuart.dk> parents: 22400 diff changeset	2777 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	2778 if (len == -1)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2779 goto bail;
39068 52e9bf215f96 index: don't include nullid in the internal "length" field Martin von Zweigbergk <martinvonz@google.com> parents: 38944 diff changeset	2780 self->length = len;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2781 } else {
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	2782 if (size % self->entry_size) {
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2783 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	2784 goto bail;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2785 }
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	2786 self->length = size / self->entry_size;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2787 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2788
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2789 return 0;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2790 bail:
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2791 return -1;
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2792 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2793
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2794 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	2795 {
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2796 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	2797 return (PyObject *)self;
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2798 }
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2799
38944 c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2800 static void _index_clearcaches(indexObject *self)
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2801 {
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2802 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	2803 PyMem_Free((void *)self->offsets);
38944 c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2804 self->offsets = NULL;
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2805 }
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2806 if (self->ntinitialized) {
9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2807 nt_dealloc(&self->nt);
38944 c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2808 }
39291 9f097214fbf3 index: embed nodetree in index object to avoid reference cycle Martin von Zweigbergk <martinvonz@google.com> parents: 39228 diff changeset	2809 self->ntinitialized = 0;
38944 c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2810 Py_CLEAR(self->headrevs);
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2811 }
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2812
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2813 static PyObject index_clearcaches(indexObject self)
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2814 {
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2815 _index_clearcaches(self);
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2816 self->ntrev = -1;
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2817 self->ntlookups = self->ntmisses = 0;
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2818 Py_RETURN_NONE;
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2819 }
c1de67691d5b index: move index_clearcaches() further down Martin von Zweigbergk <martinvonz@google.com> parents: 38943 diff changeset	2820
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2821 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	2822 {
16370 28bb4daf070c parsers: fix a memleak, and add a clearcaches method to the index Bryan O'Sullivan <bryano@fb.com> parents: 16363 diff changeset	2823 _index_clearcaches(self);
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 22403 diff changeset	2824 Py_XDECREF(self->filteredrevs);
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2825 if (self->buf.buf) {
6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2826 PyBuffer_Release(&self->buf);
6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2827 memset(&self->buf, 0, sizeof(self->buf));
6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2828 }
20109 e57c532c3835 parse_index2: fix crash on bad argument type (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 19728 diff changeset	2829 Py_XDECREF(self->data);
45936 0ce15a8c7b8b revlog: store new index entries as binary Joerg Sonnenberger <joerg@bec.de> parents: 45811 diff changeset	2830 PyMem_Free(self->added);
46141 41733a1c3532 cext: isolate hash size in the revlog handling in a single place Joerg Sonnenberger <joerg@bec.de> parents: 46078 diff changeset	2831 Py_XDECREF(self->nullentry);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2832 PyObject_Del(self);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2833 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2834
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2835 static PySequenceMethods index_sequence_methods = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2836 (lenfunc)index_length, /* sq_length */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2837 0, /* sq_concat */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2838 0, /* sq_repeat */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2839 (ssizeargfunc)index_get, /* sq_item */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2840 0, /* sq_slice */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2841 0, /* sq_ass_item */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2842 0, /* sq_ass_slice */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2843 (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	2844 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2845
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2846 static PyMappingMethods index_mapping_methods = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2847 (lenfunc)index_length, /* mp_length */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2848 (binaryfunc)index_getitem, /* mp_subscript */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2849 (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	2850 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2851
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2852 static PyMethodDef index_methods[] = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2853 {"ancestors", (PyCFunction)index_ancestors, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2854 "return the gca set of the given revs"},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2855 {"commonancestorsheads", (PyCFunction)index_commonancestorsheads,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2856 METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2857 "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	2858 {"clearcaches", (PyCFunction)index_clearcaches, METH_NOARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2859 "clear the index caches"},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2860 {"get", (PyCFunction)index_m_get, METH_VARARGS, "get an index entry"},
43554 b56de57c45ce index: add a `get_rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43552 diff changeset	2861 {"get_rev", (PyCFunction)index_m_get, METH_VARARGS,
b56de57c45ce index: add a `get_rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43552 diff changeset	2862 "return `rev` associated with a node or None"},
43534 0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43532 diff changeset	2863 {"has_node", (PyCFunction)index_m_has_node, METH_O,
0c659fc20207 index: add a `has_node` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43532 diff changeset	2864 "return True if the node exist in the index"},
43552 bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2865 {"rev", (PyCFunction)index_m_rev, METH_O,
bd87114ce341 index: add a `rev` method (API) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43534 diff changeset	2866 "return `rev` associated with a node or raise RevlogError"},
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2867 {"computephasesmapsets", (PyCFunction)compute_phases_map_sets, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2868 "compute phases"},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2869 {"reachableroots2", (PyCFunction)reachableroots2, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2870 "reachableroots"},
46717 502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	2871 {"replace_sidedata_info", (PyCFunction)index_replace_sidedata_info,
502e795b55ac revlog-index: add `replace_sidedata_info` method Rapha?l Gom?s <rgomes@octobus.net> parents: 46708 diff changeset	2872 METH_VARARGS, "replace an existing index entry with a new value"},
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2873 {"headrevs", (PyCFunction)index_headrevs, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2874 "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	2875 {"headrevsfiltered", (PyCFunction)index_headrevs, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2876 "get filtered head revisions"}, /* Can always do filtering */
41086 a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	2877 {"issnapshot", (PyCFunction)index_issnapshot, METH_O,
a28833d79aca revlog: use the native implementation of issnapshot Boris Feld <boris.feld@octobus.net> parents: 41085 diff changeset	2878 "True if the object is a snapshot"},
41108 38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	2879 {"findsnapshots", (PyCFunction)index_findsnapshots, METH_VARARGS,
38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41086 diff changeset	2880 "Gather snapshot data in a cache dict"},
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2881 {"deltachain", (PyCFunction)index_deltachain, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2882 "determine revisions with deltas to reconstruct fulltext"},
40707 cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	2883 {"slicechunktodensity", (PyCFunction)index_slicechunktodensity,
cc76ca9fca20 sparse-revlog: introduce native (C) implementation of slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40706 diff changeset	2884 METH_VARARGS, "determine revisions with deltas to reconstruct fulltext"},
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2885 {"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	2886 {"partialmatch", (PyCFunction)index_partialmatch, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2887 "match a potentially ambiguous node ID"},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2888 {"shortest", (PyCFunction)index_shortest, METH_VARARGS,
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2889 "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	2890 {"stats", (PyCFunction)index_stats, METH_NOARGS, "stats for the index"},
47037 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	2891 {"entry_binary", (PyCFunction)index_entry_binary, METH_O,
47034 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	2892 "return an entry in binary form"},
47037 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	2893 {"pack_header", (PyCFunction)index_pack_header, METH_VARARGS,
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47035 diff changeset	2894 "pack the revlog header information into binary"},
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2895 {NULL} /* Sentinel */
16414 e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2896 };
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2897
e8d37b78acfb parsers: use base-16 trie for faster node->rev mapping Bryan O'Sullivan <bryano@fb.com> parents: 16393 diff changeset	2898 static PyGetSetDef index_getset[] = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2899 {"nodemap", (getter)index_nodemap, NULL, "nodemap", NULL},
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2900 {NULL} /* Sentinel */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2901 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2902
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46875 diff changeset	2903 static PyMemberDef index_members[] = {
47140 c55afa35a5c8 revlog: rename `hdrsize` to `entry_size` in the C code Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	2904 {"entry_size", T_LONG, offsetof(indexObject, entry_size), 0,
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46875 diff changeset	2905 "size of an index entry"},
3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46875 diff changeset	2906 {NULL} /* Sentinel */
3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46875 diff changeset	2907 };
3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46875 diff changeset	2908
40860 18a8def6e1b5 revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol Yuya Nishihara <yuya@tcha.org> parents: 40859 diff changeset	2909 PyTypeObject HgRevlogIndex_Type = {
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2910 PyVarObject_HEAD_INIT(NULL, 0) /* header */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2911 "parsers.index", /* tp_name */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2912 sizeof(indexObject), /* tp_basicsize */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2913 0, /* tp_itemsize */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2914 (destructor)index_dealloc, /* tp_dealloc */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2915 0, /* tp_print */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2916 0, /* tp_getattr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2917 0, /* tp_setattr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2918 0, /* tp_compare */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2919 0, /* tp_repr */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2920 0, /* tp_as_number */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2921 &index_sequence_methods, /* tp_as_sequence */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2922 &index_mapping_methods, /* tp_as_mapping */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2923 0, /* tp_hash */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2924 0, /* tp_call */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2925 0, /* tp_str */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2926 0, /* tp_getattro */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2927 0, /* tp_setattro */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2928 0, /* tp_as_buffer */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2929 Py_TPFLAGS_DEFAULT, /* tp_flags */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2930 "revlog index", /* tp_doc */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2931 0, /* tp_traverse */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2932 0, /* tp_clear */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2933 0, /* tp_richcompare */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2934 0, /* tp_weaklistoffset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2935 0, /* tp_iter */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2936 0, /* tp_iternext */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2937 index_methods, /* tp_methods */
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46875 diff changeset	2938 index_members, /* tp_members */
40562 e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2939 index_getset, /* tp_getset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2940 0, /* tp_base */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2941 0, /* tp_dict */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2942 0, /* tp_descr_get */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2943 0, /* tp_descr_set */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2944 0, /* tp_dictoffset */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2945 (initproc)index_init, /* tp_init */
e5ad3ef90aa1 revlog: give formatting to clang-format Augie Fackler <augie@google.com> parents: 40561 diff changeset	2946 0, /* tp_alloc */
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2947 };
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2948
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2949 /*
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2950 * returns a tuple of the form (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	2951 * follows:
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2952 *
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2953 * index: an index object that lazily parses Revlog (v1 or v2) records
30577 6146d5acee69 parsers: use buffer to store revlog index Jun Wu <quark@fb.com> parents: 30171 diff changeset	2954 * 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	2955 * 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	2956 *
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2957 * added complications are for backwards compatibility
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2958 */
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2959 PyObject parse_index2(PyObject self, PyObject args, PyObject kwargs)
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2960 {
45173 2bc5d1531235 revlog: fix excessive decref on tuple creation failure in parse_index2() Yuya Nishihara <yuya@tcha.org> parents: 45141 diff changeset	2961 PyObject *cache = NULL;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2962 indexObject *idx;
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2963 int ret;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2964
40860 18a8def6e1b5 revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol Yuya Nishihara <yuya@tcha.org> parents: 40859 diff changeset	2965 idx = PyObject_New(indexObject, &HgRevlogIndex_Type);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2966 if (idx == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2967 goto bail;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2968
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 46328 diff changeset	2969 ret = index_init(idx, args, kwargs);
16572 8d44b5a2974f parsers: fix refcount leak, simplify init of index (issue3417) Bryan O'Sullivan <bryano@fb.com> parents: 16437 diff changeset	2970 if (ret == -1)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2971 goto bail;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2972
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2973 if (idx->inlined) {
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2974 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	2975 if (cache == NULL)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2976 goto bail;
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2977 } else {
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2978 cache = Py_None;
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2979 Py_INCREF(cache);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2980 }
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2981
45173 2bc5d1531235 revlog: fix excessive decref on tuple creation failure in parse_index2() Yuya Nishihara <yuya@tcha.org> parents: 45141 diff changeset	2982 return Py_BuildValue("NN", idx, cache);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2983
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2984 bail:
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	2985 Py_XDECREF(idx);
7108 1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2986 Py_XDECREF(cache);
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2987 return NULL;
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2988 }
1ca878d7b849 C implementation of revlog index parsing Bernhard Leiner <bleiner@gmail.com> parents: 7093 diff changeset	2989
43959 f384d68d8ea8 revlog: made C Capsule an array of function pointers Georges Racinet <georges.racinet@octobus.net> parents: 43847 diff changeset	2990 static Revlog_CAPI CAPI = {
44066 f5d2720f3bea revlog-native: introduced ABI version in capsule Georges Racinet <georges.racinet@octobus.net> parents: 43959 diff changeset	2991 /* increment the abi_version field upon each change in the Revlog_CAPI
f5d2720f3bea revlog-native: introduced ABI version in capsule Georges Racinet <georges.racinet@octobus.net> parents: 43959 diff changeset	2992 struct or in the ABI of the listed functions */
44502 166349510398 revlog: using two new functions in C capsule from Rust code Georges Racinet <georges.racinet@octobus.net> parents: 44486 diff changeset	2993 2,
166349510398 revlog: using two new functions in C capsule from Rust code Georges Racinet <georges.racinet@octobus.net> parents: 44486 diff changeset	2994 index_length,
166349510398 revlog: using two new functions in C capsule from Rust code Georges Racinet <georges.racinet@octobus.net> parents: 44486 diff changeset	2995 index_node,
43959 f384d68d8ea8 revlog: made C Capsule an array of function pointers Georges Racinet <georges.racinet@octobus.net> parents: 43847 diff changeset	2996 HgRevlogIndex_GetParents,
f384d68d8ea8 revlog: made C Capsule an array of function pointers Georges Racinet <georges.racinet@octobus.net> parents: 43847 diff changeset	2997 };
f384d68d8ea8 revlog: made C Capsule an array of function pointers Georges Racinet <georges.racinet@octobus.net> parents: 43847 diff changeset	2998
32378 7d0c69505a66 cext: extract revlog/index parsing code to own C file Gregory Szorc <gregory.szorc@gmail.com> parents: 32372 diff changeset	2999 void revlog_module_init(PyObject *mod)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	3000 {
41052 4c25038c112c rust-cpython: implement Graph using C parents function Georges Racinet <gracinet@anybox.fr> parents: 40963 diff changeset	3001 PyObject *caps = NULL;
40860 18a8def6e1b5 revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol Yuya Nishihara <yuya@tcha.org> parents: 40859 diff changeset	3002 HgRevlogIndex_Type.tp_new = PyType_GenericNew;
18a8def6e1b5 revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol Yuya Nishihara <yuya@tcha.org> parents: 40859 diff changeset	3003 if (PyType_Ready(&HgRevlogIndex_Type) < 0)
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	3004 return;
40860 18a8def6e1b5 revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol Yuya Nishihara <yuya@tcha.org> parents: 40859 diff changeset	3005 Py_INCREF(&HgRevlogIndex_Type);
18a8def6e1b5 revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol Yuya Nishihara <yuya@tcha.org> parents: 40859 diff changeset	3006 PyModule_AddObject(mod, "index", (PyObject *)&HgRevlogIndex_Type);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	3007
39218 b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	3008 nodetreeType.tp_new = PyType_GenericNew;
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	3009 if (PyType_Ready(&nodetreeType) < 0)
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	3010 return;
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	3011 Py_INCREF(&nodetreeType);
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	3012 PyModule_AddObject(mod, "nodetree", (PyObject *)&nodetreeType);
b85b377e7fc2 index: make node tree a Python object Martin von Zweigbergk <martinvonz@google.com> parents: 39075 diff changeset	3013
43959 f384d68d8ea8 revlog: made C Capsule an array of function pointers Georges Racinet <georges.racinet@octobus.net> parents: 43847 diff changeset	3014 caps = PyCapsule_New(&CAPI, "mercurial.cext.parsers.revlog_CAPI", NULL);
41052 4c25038c112c rust-cpython: implement Graph using C parents function Georges Racinet <gracinet@anybox.fr> parents: 40963 diff changeset	3015 if (caps != NULL)
43959 f384d68d8ea8 revlog: made C Capsule an array of function pointers Georges Racinet <georges.racinet@octobus.net> parents: 43847 diff changeset	3016 PyModule_AddObject(mod, "revlog_CAPI", caps);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	3017 }

Mercurial > public > mercurial-scm > hg

annotate mercurial/cext/revlog.c @ 47143:47ffc754989a