##// END OF EJS Templates
revlog: implement a "default compression" mode...
revlog: implement a "default compression" mode The revlog docker is now storing a default compression engine. When a chunk use that compression, a dedicated mode is used in the revlog entry and we can directly route it to the right decompressor. We should probably make PLAIN and DEFAULT mode the only available mode for revlogv2, but this is something for later. Differential Revision: https://phab.mercurial-scm.org/D10652

File last commit:

r48025:6bfa6c2c default
r48029:ff9fd710 default
Show More
revlog.c
3040 lines | 74.1 KiB | text/x-c | CLexer
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 /*
parsers.c - efficient content parsing
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 Copyright 2008 Olivia Mackall <olivia@selenic.com> and others
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
This software may be used and distributed according to the terms of
the GNU General Public License, incorporated herein by reference.
*/
Gregory Szorc
cext: make revlog.c PY_SSIZE_T_CLEAN...
r42234 #define PY_SSIZE_T_CLEAN
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 #include <Python.h>
Gregory Szorc
revlog: address review feedback for deltachain C implementation...
r33171 #include <assert.h>
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 #include <ctype.h>
Boris Feld
sparse-revlog: add a `index_get_length` function in C...
r40740 #include <limits.h>
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 #include <stddef.h>
Boris Feld
sparse-revlog: introduce native (C) implementation of slicechunktodensity...
r40743 #include <stdlib.h>
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 #include <string.h>
revlog: replace revlog._io.size with a new revlog.index.entry_size...
r47736 #include <structmember.h>
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Gregory Szorc
cext: reorder #include...
r34439 #include "bitmanipulation.h"
Yuya Nishihara
cext: factor out header for charencode.c...
r33753 #include "charencode.h"
clang-format: reorder includes to appease the formatter...
r47046 #include "compat.h"
Yuya Nishihara
revlog: export symbol of indexType...
r40894 #include "revlog.h"
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 #include "util.h"
#ifdef IS_PY3K
/* The mapping of Python types is meant to be temporary to get Python
* 3 to compile. We should remove this once Python 3 support is fully
* supported and proper types are used in the extensions themselves. */
#define PyInt_Check PyLong_Check
#define PyInt_FromLong PyLong_FromLong
#define PyInt_FromSsize_t PyLong_FromSsize_t
#define PyInt_AsLong PyLong_AsLong
#endif
Martin von Zweigbergk
index: add pointer from nodetree back to index...
r38974 typedef struct indexObjectStruct indexObject;
Martin von Zweigbergk
index: extract a type for the nodetree...
r38948 typedef struct {
int children[16];
} nodetreenode;
Georges Racinet
revlog: made C Capsule an array of function pointers...
r44411 typedef struct {
Georges Racinet
revlog-native: introduced ABI version in capsule...
r44523 int abi_version;
Georges Racinet
revlog: using two new functions in C capsule from Rust code...
r44989 Py_ssize_t (*index_length)(const indexObject *);
const char *(*index_node)(indexObject *, Py_ssize_t);
Georges Racinet
revlog: made C Capsule an array of function pointers...
r44411 int (*index_parents)(PyObject *, int, int *);
} Revlog_CAPI;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 /*
* A base-16 trie for fast node->rev mapping.
*
* Positive value is index of the next node in the trie
Martin von Zweigbergk
index: store nullrev as -1 in nodetree...
r38882 * Negative value is a leaf: -(rev + 2)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 * Zero is empty
*/
typedef struct {
Martin von Zweigbergk
index: add pointer from nodetree back to index...
r38974 indexObject *index;
Martin von Zweigbergk
index: extract a type for the nodetree...
r38948 nodetreenode *nodes;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 Py_ssize_t nodelen;
Jun Wu
revlog: use size_t for nodetree capacity...
r46841 size_t length; /* # nodes in use */
size_t capacity; /* # nodes allocated */
int depth; /* maximum depth of tree */
int splits; /* # splits performed */
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 } nodetree;
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 typedef struct {
Augie Fackler
revlog: add a comment to help clang-format produce less-awful results...
r40593 PyObject_HEAD /* ; */
Augie Fackler
revlog: give formatting to clang-format...
r40595 nodetree nt;
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 } nodetreeObject;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 /*
* This class has two behaviors.
*
* When used in a list-like way (with integer keys), we decode an
Martin von Zweigbergk
revlog: delete references to deleted nullid sentinel value...
r43981 * entry in a RevlogNG index file on demand. We have limited support for
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 * integer-keyed insert and delete, only at elements right before the
Martin von Zweigbergk
revlog: delete references to deleted nullid sentinel value...
r43981 * end.
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 *
* With string keys, we lazily perform a reverse mapping from node to
* rev, using a base-16 trie.
*/
Martin von Zweigbergk
index: add pointer from nodetree back to index...
r38974 struct indexObjectStruct {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 PyObject_HEAD
Augie Fackler
revlog: give formatting to clang-format...
r40595 /* Type-specific fields go here. */
PyObject *data; /* raw bytes of index */
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 Py_ssize_t nodelen; /* digest size of the hash, 20 for SHA-1 */
PyObject *nullentry; /* fast path for references to null */
Augie Fackler
revlog: give formatting to clang-format...
r40595 Py_buffer buf; /* buffer of data */
const char **offsets; /* populated on demand */
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 Py_ssize_t length; /* current on-disk number of elements */
unsigned new_length; /* number of added elements */
unsigned added_length; /* space reserved for added elements */
char *added; /* populated on demand */
Augie Fackler
revlog: give formatting to clang-format...
r40595 PyObject *headrevs; /* cache, invalidated on changes */
PyObject *filteredrevs; /* filtered revs set */
nodetree nt; /* base-16 trie */
int ntinitialized; /* 0 or 1 */
int ntrev; /* last rev scanned */
int ntlookups; /* # lookups */
int ntmisses; /* # lookups that miss the cache */
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 int inlined;
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 long entry_size; /* size of index headers. Differs in v1 v.s. v2 format
*/
revlog: introduce an explicit `format_version` member in the index struct...
r47912 char format_version; /* size of index headers. Differs in v1 v.s. v2
format */
Martin von Zweigbergk
index: add pointer from nodetree back to index...
r38974 };
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
static Py_ssize_t index_length(const indexObject *self)
{
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 return self->length + self->new_length;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 static const char nullid[32] = {0};
Boris Feld
revlog: introduce a constant for nullrev in `revlog.c`...
r40996 static const Py_ssize_t nullrev = -1;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
static Py_ssize_t inline_scan(indexObject *self, const char **offsets);
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 static int index_find_node(indexObject *self, const char *node);
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 #if LONG_MAX == 0x7fffffffL
revlog: add a "data compression mode" entry in the index tuple...
r48023 static const char *const tuple_format = PY23("Kiiiiiis#KiB", "Kiiiiiiy#KiB");
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 #else
revlog: add a "data compression mode" entry in the index tuple...
r48023 static const char *const tuple_format = PY23("kiiiiiis#kiB", "kiiiiiiy#kiB");
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 #endif
/* A RevlogNG v1 index entry is 64 bytes long. */
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 static const long v1_entry_size = 64;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Raphaël Gomès
cext: add support for revlogv2...
r47442 /* A Revlogv2 index entry is 96 bytes long. */
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 static const long v2_entry_size = 96;
Raphaël Gomès
cext: add support for revlogv2...
r47442
revlog: introduce an explicit `format_version` member in the index struct...
r47912 static const long format_v1 = 1; /* Internal only, could be any number */
static const long format_v2 = 2; /* Internal only, could be any number */
revlog: add a "data compression mode" entry in the index tuple...
r48023 static const char comp_mode_inline = 2;
Martin von Zweigbergk
index: move raise_revlog_error() further up...
r39253 static void raise_revlog_error(void)
{
PyObject *mod = NULL, *dict = NULL, *errclass = NULL;
mod = PyImport_ImportModule("mercurial.error");
if (mod == NULL) {
goto cleanup;
}
dict = PyModule_GetDict(mod);
if (dict == NULL) {
goto cleanup;
}
Py_INCREF(dict);
errclass = PyDict_GetItemString(dict, "RevlogError");
if (errclass == NULL) {
PyErr_SetString(PyExc_SystemError,
Augie Fackler
revlog: give formatting to clang-format...
r40595 "could not find RevlogError");
Martin von Zweigbergk
index: move raise_revlog_error() further up...
r39253 goto cleanup;
}
/* value of exception is ignored by callers */
PyErr_SetString(errclass, "RevlogError");
cleanup:
Py_XDECREF(dict);
Py_XDECREF(mod);
}
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 /*
* Return a pointer to the beginning of a RevlogNG record.
*/
static const char *index_deref(indexObject *self, Py_ssize_t pos)
{
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 if (pos >= self->length)
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 return self->added + (pos - self->length) * self->entry_size;
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (self->inlined && pos > 0) {
if (self->offsets == NULL) {
Matt Harbison
cext: move variable declaration to the top of the block for C89 support...
r45070 Py_ssize_t ret;
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 self->offsets =
PyMem_Malloc(self->length * sizeof(*self->offsets));
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (self->offsets == NULL)
return (const char *)PyErr_NoMemory();
Matt Harbison
cext: move variable declaration to the top of the block for C89 support...
r45070 ret = inline_scan(self, self->offsets);
cext-index: propagate inline_scan error in `index_deref`...
r45051 if (ret == -1) {
return NULL;
};
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
return self->offsets[pos];
}
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 return (const char *)(self->buf.buf) + pos * self->entry_size;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Yuya Nishihara
revlog: fix out-of-bounds access by negative parents read from revlog (SEC)...
r40848 /*
* Get parents of the given rev.
*
* The specified rev must be valid and must not be nullrev. A returned
* parent revision may be nullrev, but is guaranteed to be in valid range.
*/
Augie Fackler
revlog: give formatting to clang-format...
r40595 static inline int index_get_parents(indexObject *self, Py_ssize_t rev, int *ps,
int maxrev)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 const char *data = index_deref(self, rev);
ps[0] = getbe32(data + 24);
ps[1] = getbe32(data + 28);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 /* If index file is corrupted, ps[] may point to invalid revisions. So
* there is a risk of buffer overflow to trust them unconditionally. */
Yuya Nishihara
revlog: fix out-of-bounds access by negative parents read from revlog (SEC)...
r40848 if (ps[0] < -1 || ps[0] > maxrev || ps[1] < -1 || ps[1] > maxrev) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 PyErr_SetString(PyExc_ValueError, "parent out of range");
return -1;
}
return 0;
}
Yuya Nishihara
revlog: add public CPython function to get parent revisions...
r40896 /*
* Get parents of the given rev.
*
* If the specified rev is out of range, IndexError will be raised. If the
* revlog entry is corrupted, ValueError may be raised.
*
* Returns 0 on success or -1 on failure.
*/
cext: make HgRevlogIndex_GetParents private again...
r44957 static int HgRevlogIndex_GetParents(PyObject *op, int rev, int *ps)
Yuya Nishihara
revlog: add public CPython function to get parent revisions...
r40896 {
int tiprev;
if (!op || !HgRevlogIndex_Check(op) || !ps) {
PyErr_BadInternalCall();
return -1;
}
tiprev = (int)index_length((indexObject *)op) - 1;
if (rev < -1 || rev > tiprev) {
PyErr_Format(PyExc_IndexError, "rev out of range: %d", rev);
return -1;
} else if (rev == -1) {
ps[0] = ps[1] = -1;
return 0;
} else {
return index_get_parents((indexObject *)op, rev, ps, tiprev);
}
}
Boris Feld
sparse-revlog: add a `index_get_start` function in C...
r40739 static inline int64_t index_get_start(indexObject *self, Py_ssize_t rev)
{
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 const char *data;
Boris Feld
sparse-revlog: add a `index_get_start` function in C...
r40739 uint64_t offset;
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548
if (rev == nullrev)
Boris Feld
sparse-revlog: handle nullrev in index_get_start...
r40997 return 0;
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548
data = index_deref(self, rev);
offset = getbe32(data + 4);
if (rev == 0) {
/* mask out version number for the first entry */
offset &= 0xFFFF;
Boris Feld
sparse-revlog: add a `index_get_start` function in C...
r40739 } else {
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 uint32_t offset_high = getbe32(data);
offset |= ((uint64_t)offset_high) << 32;
Boris Feld
sparse-revlog: add a `index_get_start` function in C...
r40739 }
return (int64_t)(offset >> 16);
}
Boris Feld
sparse-revlog: add a `index_get_length` function in C...
r40740 static inline int index_get_length(indexObject *self, Py_ssize_t rev)
{
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 const char *data;
int tmp;
if (rev == nullrev)
Boris Feld
sparse-revlog: handle nullrev in index_get_length...
r40998 return 0;
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548
data = index_deref(self, rev);
tmp = (int)getbe32(data + 8);
if (tmp < 0) {
PyErr_Format(PyExc_OverflowError,
"revlog entry size out of bound (%d)", tmp);
return -1;
Boris Feld
sparse-revlog: handle nullrev in index_get_length...
r40998 }
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 return tmp;
Boris Feld
sparse-revlog: add a `index_get_length` function in C...
r40740 }
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
/*
* RevlogNG format (all in big endian, data may be inlined):
* 6 bytes: offset
* 2 bytes: flags
* 4 bytes: compressed length
* 4 bytes: uncompressed length
* 4 bytes: base revision
* 4 bytes: link revision
* 4 bytes: parent 1 revision
* 4 bytes: parent 2 revision
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 * 32 bytes: nodeid (only 20 bytes used with SHA-1)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 */
static PyObject *index_get(indexObject *self, Py_ssize_t pos)
{
Raphaël Gomès
cext: add support for revlogv2...
r47442 uint64_t offset_flags, sidedata_offset;
int comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2,
sidedata_comp_len;
revlog: add a "data compression mode" entry in the index tuple...
r48023 char data_comp_mode;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 const char *c_node_id;
const char *data;
Martin von Zweigbergk
index: don't add 1 to length variables...
r38904 Py_ssize_t length = index_length(self);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Boris Feld
revlog: introduce a constant for nullrev in `revlog.c`...
r40996 if (pos == nullrev) {
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 Py_INCREF(self->nullentry);
return self->nullentry;
Martin von Zweigbergk
index: handle index[-1] as nullid more explicitly...
r38883 }
Martin von Zweigbergk
index: don't add 1 to length variables...
r38904 if (pos < 0 || pos >= length) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 PyErr_SetString(PyExc_IndexError, "revlog index out of range");
return NULL;
}
data = index_deref(self, pos);
if (data == NULL)
return NULL;
offset_flags = getbe32(data + 4);
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 /*
* The first entry on-disk needs the version number masked out,
* but this doesn't apply if entries are added to an empty index.
*/
if (self->length && pos == 0)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 offset_flags &= 0xFFFF;
else {
uint32_t offset_high = getbe32(data);
offset_flags |= ((uint64_t)offset_high) << 32;
}
comp_len = getbe32(data + 8);
uncomp_len = getbe32(data + 12);
base_rev = getbe32(data + 16);
link_rev = getbe32(data + 20);
parent_1 = getbe32(data + 24);
parent_2 = getbe32(data + 28);
c_node_id = data + 32;
revlog: use `format_version` to dispatch different version in index_get...
r48024 if (self->format_version == format_v1) {
revlog: make the index always return the same tuple...
r47913 sidedata_offset = 0;
sidedata_comp_len = 0;
revlogv2: preserve the compression mode on disk...
r48025 data_comp_mode = comp_mode_inline;
Raphaël Gomès
cext: add support for revlogv2...
r47442 } else {
sidedata_offset = getbe64(data + 64);
sidedata_comp_len = getbe32(data + 72);
revlogv2: preserve the compression mode on disk...
r48025 data_comp_mode = data[76];
Raphaël Gomès
cext: add support for revlogv2...
r47442 }
revlog: make the index always return the same tuple...
r47913
revlog: always "append" full size tuple...
r47914 return Py_BuildValue(tuple_format, offset_flags, comp_len, uncomp_len,
base_rev, link_rev, parent_1, parent_2, c_node_id,
revlog: add a "data compression mode" entry in the index tuple...
r48023 self->nodelen, sidedata_offset, sidedata_comp_len,
data_comp_mode);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
revlog: add a `entry_binary` method on index...
r47808 /*
revlog: have an explicit "pack_header" method...
r47811 * Pack header information in binary
*/
static PyObject *index_pack_header(indexObject *self, PyObject *args)
{
int header;
char out[4];
if (!PyArg_ParseTuple(args, "I", &header)) {
return NULL;
}
revlogv2: store version information in the docket only...
r48009 if (self->format_version != format_v1) {
PyErr_Format(PyExc_RuntimeError,
"version header should go in the docket, not the "
"index: %lu",
header);
return NULL;
}
revlog: have an explicit "pack_header" method...
r47811 putbe32(header, out);
return PyBytes_FromStringAndSize(out, 4);
}
/*
revlog: add a `entry_binary` method on index...
r47808 * Return the raw binary string representing a revision
*/
revlog: have an explicit "pack_header" method...
r47811 static PyObject *index_entry_binary(indexObject *self, PyObject *value)
revlog: add a `entry_binary` method on index...
r47808 {
long rev;
const char *data;
Py_ssize_t length = index_length(self);
revlog: have an explicit "pack_header" method...
r47811 if (!pylong_to_long(value, &rev)) {
revlog: add a `entry_binary` method on index...
r47808 return NULL;
}
if (rev < 0 || rev >= length) {
PyErr_Format(PyExc_ValueError, "revlog index out of range: %ld",
rev);
return NULL;
};
data = index_deref(self, rev);
if (data == NULL)
return NULL;
revlogv2: store version information in the docket only...
r48009 if (rev == 0 && self->format_version == format_v1) {
revlog: have an explicit "pack_header" method...
r47811 /* the header is eating the start of the first entry */
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 return PyBytes_FromStringAndSize(data + 4,
self->entry_size - 4);
revlog: add a `entry_binary` method on index...
r47808 }
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 return PyBytes_FromStringAndSize(data, self->entry_size);
revlog: add a `entry_binary` method on index...
r47808 }
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
/*
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 * Return the hash of node corresponding to the given rev.
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 */
static const char *index_node(indexObject *self, Py_ssize_t pos)
{
Martin von Zweigbergk
index: don't add 1 to length variables...
r38904 Py_ssize_t length = index_length(self);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 const char *data;
Boris Feld
revlog: introduce a constant for nullrev in `revlog.c`...
r40996 if (pos == nullrev)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return nullid;
Martin von Zweigbergk
index: don't add 1 to length variables...
r38904 if (pos >= length)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return NULL;
data = index_deref(self, pos);
return data ? data + 32 : NULL;
}
Martin von Zweigbergk
revlog: extract function for getting node from known-to-exist rev...
r37877 /*
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 * Return the hash of the node corresponding to the given rev. The
Martin von Zweigbergk
revlog: extract function for getting node from known-to-exist rev...
r37877 * rev is assumed to be existing. If not, an exception is set.
*/
static const char *index_node_existing(indexObject *self, Py_ssize_t pos)
{
const char *node = index_node(self, pos);
if (node == NULL) {
PyErr_Format(PyExc_IndexError, "could not access rev %d",
(int)pos);
}
return node;
}
Martin von Zweigbergk
index: make most "nt_*" functions take a nodetree...
r38975 static int nt_insert(nodetree *self, const char *node, int rev);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 static int node_check(Py_ssize_t nodelen, PyObject *obj, char **node)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 Py_ssize_t thisnodelen;
if (PyBytes_AsStringAndSize(obj, node, &thisnodelen) == -1)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -1;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (nodelen == thisnodelen)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return 0;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 PyErr_Format(PyExc_ValueError, "node len %zd != expected node len %zd",
thisnodelen, nodelen);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -1;
}
Martin von Zweigbergk
index: replace insert(-1, e) method by append(e) method...
r38886 static PyObject *index_append(indexObject *self, PyObject *obj)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
Raphaël Gomès
cext: add support for revlogv2...
r47442 uint64_t offset_flags, sidedata_offset;
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 int rev, comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2;
revlog: add a "data compression mode" entry in the index tuple...
r48023 char data_comp_mode;
Raphaël Gomès
cext: add support for revlogv2...
r47442 Py_ssize_t c_node_id_len, sidedata_comp_len;
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 const char *c_node_id;
char *data;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
revlog: always "append" full size tuple...
r47914 if (!PyArg_ParseTuple(obj, tuple_format, &offset_flags, &comp_len,
&uncomp_len, &base_rev, &link_rev, &parent_1,
&parent_2, &c_node_id, &c_node_id_len,
revlog: add a "data compression mode" entry in the index tuple...
r48023 &sidedata_offset, &sidedata_comp_len,
&data_comp_mode)) {
PyErr_SetString(PyExc_TypeError, "11-tuple required");
revlog: always "append" full size tuple...
r47914 return NULL;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Raphaël Gomès
cext: add support for revlogv2...
r47442
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (c_node_id_len != self->nodelen) {
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 PyErr_SetString(PyExc_TypeError, "invalid node");
return NULL;
}
revlogv2: preserve the compression mode on disk...
r48025 if (self->format_version == format_v1 &&
data_comp_mode != comp_mode_inline) {
revlog: add a "data compression mode" entry in the index tuple...
r48023 PyErr_Format(PyExc_ValueError,
"invalid data compression mode: %i",
data_comp_mode);
return NULL;
}
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 if (self->new_length == self->added_length) {
size_t new_added_length =
self->added_length ? self->added_length * 2 : 4096;
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 void *new_added = PyMem_Realloc(
self->added, new_added_length * self->entry_size);
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 if (!new_added)
return PyErr_NoMemory();
self->added = new_added;
self->added_length = new_added_length;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 rev = self->length + self->new_length;
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 data = self->added + self->entry_size * self->new_length++;
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 putbe32(offset_flags >> 32, data);
putbe32(offset_flags & 0xffffffffU, data + 4);
putbe32(comp_len, data + 8);
putbe32(uncomp_len, data + 12);
putbe32(base_rev, data + 16);
putbe32(link_rev, data + 20);
putbe32(parent_1, data + 24);
putbe32(parent_2, data + 28);
memcpy(data + 32, c_node_id, c_node_id_len);
Raphaël Gomès
cext: add support for revlogv2...
r47442 /* Padding since SHA-1 is only 20 bytes for now */
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 memset(data + 32 + c_node_id_len, 0, 32 - c_node_id_len);
revlog: always "append" full size tuple...
r47914 if (self->format_version == format_v2) {
Raphaël Gomès
cext: add support for revlogv2...
r47442 putbe64(sidedata_offset, data + 64);
putbe32(sidedata_comp_len, data + 72);
revlogv2: preserve the compression mode on disk...
r48025 data[76] = (char)data_comp_mode;
Raphaël Gomès
cext: add support for revlogv2...
r47442 /* Padding for 96 bytes alignment */
revlogv2: preserve the compression mode on disk...
r48025 memset(data + 77, 0, self->entry_size - 77);
Raphaël Gomès
cext: add support for revlogv2...
r47442 }
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 if (self->ntinitialized)
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 nt_insert(&self->nt, c_node_id, rev);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Py_CLEAR(self->headrevs);
Py_RETURN_NONE;
}
Raphaël Gomès
revlog-index: add `replace_sidedata_info` method...
r47451 /* Replace an existing index entry's sidedata offset and length with new ones.
This cannot be used outside of the context of sidedata rewriting,
inside the transaction that creates the given revision. */
static PyObject *index_replace_sidedata_info(indexObject *self, PyObject *args)
{
Raphaël Gomès
sidedata: enable sidedata computers to optionally rewrite flags...
r47844 uint64_t offset_flags, sidedata_offset;
Raphaël Gomès
revlog-index: add `replace_sidedata_info` method...
r47451 int rev;
Py_ssize_t sidedata_comp_len;
char *data;
clang-format: run the formatter on mercurial/cext/revlog.c...
r47637 #if LONG_MAX == 0x7fffffffL
Raphaël Gomès
sidedata: enable sidedata computers to optionally rewrite flags...
r47844 const char *const sidedata_format = PY23("nKiK", "nKiK");
clang-format: run the formatter on mercurial/cext/revlog.c...
r47637 #else
Raphaël Gomès
sidedata: enable sidedata computers to optionally rewrite flags...
r47844 const char *const sidedata_format = PY23("nkik", "nkik");
clang-format: run the formatter on mercurial/cext/revlog.c...
r47637 #endif
Raphaël Gomès
revlog-index: add `replace_sidedata_info` method...
r47451
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 if (self->entry_size == v1_entry_size || self->inlined) {
Raphaël Gomès
revlog-index: add `replace_sidedata_info` method...
r47451 /*
There is a bug in the transaction handling when going from an
inline revlog to a separate index and data file. Turn it off until
it's fixed, since v2 revlogs sometimes get rewritten on exchange.
See issue6485.
*/
raise_revlog_error();
return NULL;
}
if (!PyArg_ParseTuple(args, sidedata_format, &rev, &sidedata_offset,
Raphaël Gomès
sidedata: enable sidedata computers to optionally rewrite flags...
r47844 &sidedata_comp_len, &offset_flags))
Raphaël Gomès
revlog-index: add `replace_sidedata_info` method...
r47451 return NULL;
if (rev < 0 || rev >= index_length(self)) {
PyErr_SetString(PyExc_IndexError, "revision outside index");
return NULL;
}
if (rev < self->length) {
PyErr_SetString(
PyExc_IndexError,
"cannot rewrite entries outside of this transaction");
return NULL;
}
clang-format: run the formatter on mercurial/cext/revlog.c...
r47637 /* Find the newly added node, offset from the "already on-disk" length
*/
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 data = self->added + self->entry_size * (rev - self->length);
Raphaël Gomès
sidedata: enable sidedata computers to optionally rewrite flags...
r47844 putbe64(offset_flags, data);
Raphaël Gomès
revlog-index: add `replace_sidedata_info` method...
r47451 putbe64(sidedata_offset, data + 64);
putbe32(sidedata_comp_len, data + 72);
Py_RETURN_NONE;
}
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 static PyObject *index_stats(indexObject *self)
{
PyObject *obj = PyDict_New();
Yuya Nishihara
py3: convert revlog stats to a dict of (bytes, int) pairs...
r40476 PyObject *s = NULL;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 PyObject *t = NULL;
if (obj == NULL)
return NULL;
Augie Fackler
revlog: give formatting to clang-format...
r40595 #define istat(__n, __d) \
do { \
s = PyBytes_FromString(__d); \
t = PyInt_FromSsize_t(self->__n); \
if (!s || !t) \
goto bail; \
if (PyDict_SetItem(obj, s, t) == -1) \
goto bail; \
Py_CLEAR(s); \
Py_CLEAR(t); \
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 } while (0)
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 if (self->added_length)
istat(new_length, "index entries added");
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 istat(length, "revs in memory");
istat(ntlookups, "node trie lookups");
istat(ntmisses, "node trie misses");
istat(ntrev, "node trie last rev scanned");
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 if (self->ntinitialized) {
istat(nt.capacity, "node trie capacity");
istat(nt.depth, "node trie depth");
istat(nt.length, "node trie count");
istat(nt.splits, "node trie splits");
Martin von Zweigbergk
index: move more fields onto nodetree type...
r38949 }
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
#undef istat
return obj;
bail:
Py_XDECREF(obj);
Yuya Nishihara
py3: convert revlog stats to a dict of (bytes, int) pairs...
r40476 Py_XDECREF(s);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 Py_XDECREF(t);
return NULL;
}
/*
* When we cache a list, we want to be sure the caller can't mutate
* the cached copy.
*/
static PyObject *list_copy(PyObject *list)
{
Py_ssize_t len = PyList_GET_SIZE(list);
PyObject *newlist = PyList_New(len);
Py_ssize_t i;
if (newlist == NULL)
return NULL;
for (i = 0; i < len; i++) {
PyObject *obj = PyList_GET_ITEM(list, i);
Py_INCREF(obj);
PyList_SET_ITEM(newlist, i, obj);
}
return newlist;
}
Gregory Szorc
cext: wrap before brace for functions...
r34441 static int check_filter(PyObject *filter, Py_ssize_t arg)
{
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (filter) {
PyObject *arglist, *result;
int isfiltered;
arglist = Py_BuildValue("(n)", arg);
if (!arglist) {
return -1;
}
Augie Fackler
revlog: migrate from PyEval_CallObject to PyObject_Call...
r46886 result = PyObject_Call(filter, arglist, NULL);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 Py_DECREF(arglist);
if (!result) {
return -1;
}
/* PyObject_IsTrue returns 1 if true, 0 if false, -1 if error,
* same as this function, so we can just return it directly.*/
isfiltered = PyObject_IsTrue(result);
Py_DECREF(result);
return isfiltered;
} else {
return 0;
}
}
static inline void set_phase_from_parents(char *phases, int parent_1,
int parent_2, Py_ssize_t i)
{
if (parent_1 >= 0 && phases[parent_1] > phases[i])
phases[i] = phases[parent_1];
if (parent_2 >= 0 && phases[parent_2] > phases[i])
phases[i] = phases[parent_2];
}
static PyObject *reachableroots2(indexObject *self, PyObject *args)
{
/* Input */
long minroot;
PyObject *includepatharg = NULL;
int includepath = 0;
/* heads and roots are lists */
PyObject *heads = NULL;
PyObject *roots = NULL;
PyObject *reachable = NULL;
PyObject *val;
Martin von Zweigbergk
index: don't include nullid in len()...
r38887 Py_ssize_t len = index_length(self);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 long revnum;
Py_ssize_t k;
Py_ssize_t i;
Py_ssize_t l;
int r;
int parents[2];
/* Internal data structure:
Augie Fackler
revlog: give formatting to clang-format...
r40595 * tovisit: array of length len+1 (all revs + nullrev), filled upto
* lentovisit
Augie Fackler
revlog: add blank line in comment to help clang-format...
r40594 *
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 * revstates: array of length len+1 (all revs + nullrev) */
int *tovisit = NULL;
long lentovisit = 0;
enum { RS_SEEN = 1, RS_ROOT = 2, RS_REACHABLE = 4 };
char *revstates = NULL;
/* Get arguments */
if (!PyArg_ParseTuple(args, "lO!O!O!", &minroot, &PyList_Type, &heads,
Augie Fackler
revlog: give formatting to clang-format...
r40595 &PyList_Type, &roots, &PyBool_Type,
&includepatharg))
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 goto bail;
if (includepatharg == Py_True)
includepath = 1;
/* Initialize return set */
reachable = PyList_New(0);
if (reachable == NULL)
goto bail;
/* Initialize internal datastructures */
tovisit = (int *)malloc((len + 1) * sizeof(int));
if (tovisit == NULL) {
PyErr_NoMemory();
goto bail;
}
revstates = (char *)calloc(len + 1, 1);
if (revstates == NULL) {
PyErr_NoMemory();
goto bail;
}
l = PyList_GET_SIZE(roots);
for (i = 0; i < l; i++) {
revnum = PyInt_AsLong(PyList_GET_ITEM(roots, i));
if (revnum == -1 && PyErr_Occurred())
goto bail;
/* If root is out of range, e.g. wdir(), it must be unreachable
* from heads. So we can just ignore it. */
if (revnum + 1 < 0 || revnum + 1 >= len + 1)
continue;
revstates[revnum + 1] |= RS_ROOT;
}
/* Populate tovisit with all the heads */
l = PyList_GET_SIZE(heads);
for (i = 0; i < l; i++) {
revnum = PyInt_AsLong(PyList_GET_ITEM(heads, i));
if (revnum == -1 && PyErr_Occurred())
goto bail;
if (revnum + 1 < 0 || revnum + 1 >= len + 1) {
PyErr_SetString(PyExc_IndexError, "head out of range");
goto bail;
}
if (!(revstates[revnum + 1] & RS_SEEN)) {
tovisit[lentovisit++] = (int)revnum;
revstates[revnum + 1] |= RS_SEEN;
}
}
/* Visit the tovisit list and find the reachable roots */
k = 0;
while (k < lentovisit) {
/* Add the node to reachable if it is a root*/
revnum = tovisit[k++];
if (revstates[revnum + 1] & RS_ROOT) {
revstates[revnum + 1] |= RS_REACHABLE;
val = PyInt_FromLong(revnum);
if (val == NULL)
goto bail;
r = PyList_Append(reachable, val);
Py_DECREF(val);
if (r < 0)
goto bail;
if (includepath == 0)
continue;
}
/* Add its parents to the list of nodes to visit */
Boris Feld
revlog: introduce a constant for nullrev in `revlog.c`...
r40996 if (revnum == nullrev)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 continue;
r = index_get_parents(self, revnum, parents, (int)len - 1);
if (r < 0)
goto bail;
for (i = 0; i < 2; i++) {
Augie Fackler
revlog: give formatting to clang-format...
r40595 if (!(revstates[parents[i] + 1] & RS_SEEN) &&
parents[i] >= minroot) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 tovisit[lentovisit++] = parents[i];
revstates[parents[i] + 1] |= RS_SEEN;
}
}
}
/* Find all the nodes in between the roots we found and the heads
* and add them to the reachable set */
if (includepath == 1) {
long minidx = minroot;
if (minidx < 0)
minidx = 0;
for (i = minidx; i < len; i++) {
if (!(revstates[i + 1] & RS_SEEN))
continue;
r = index_get_parents(self, i, parents, (int)len - 1);
/* Corrupted index file, error is set from
* index_get_parents */
if (r < 0)
goto bail;
if (((revstates[parents[0] + 1] |
Augie Fackler
revlog: give formatting to clang-format...
r40595 revstates[parents[1] + 1]) &
RS_REACHABLE) &&
!(revstates[i + 1] & RS_REACHABLE)) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 revstates[i + 1] |= RS_REACHABLE;
Matt Harbison
cext: fix most truncation warnings in revlog on Windows...
r39109 val = PyInt_FromSsize_t(i);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (val == NULL)
goto bail;
r = PyList_Append(reachable, val);
Py_DECREF(val);
if (r < 0)
goto bail;
}
}
}
free(revstates);
free(tovisit);
return reachable;
bail:
Py_XDECREF(reachable);
free(revstates);
free(tovisit);
return NULL;
}
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 static int add_roots_get_min(indexObject *self, PyObject *roots, char *phases,
char phase)
{
Py_ssize_t len = index_length(self);
PyObject *item;
PyObject *iterator;
int rev, minrev = -1;
char *node;
Yuya Nishihara
phases: fix error return with no exception from computephases()...
r45735 if (!PySet_Check(roots)) {
PyErr_SetString(PyExc_TypeError,
"roots must be a set of nodes");
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 return -2;
Yuya Nishihara
phases: fix error return with no exception from computephases()...
r45735 }
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 iterator = PyObject_GetIter(roots);
if (iterator == NULL)
return -2;
while ((item = PyIter_Next(iterator))) {
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (node_check(self->nodelen, item, &node) == -1)
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 goto failed;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 rev = index_find_node(self, node);
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 /* null is implicitly public, so negative is invalid */
if (rev < 0 || rev >= len)
goto failed;
phases[rev] = phase;
if (minrev == -1 || minrev > rev)
minrev = rev;
Py_DECREF(item);
}
Py_DECREF(iterator);
return minrev;
failed:
Py_DECREF(iterator);
Py_DECREF(item);
return -2;
}
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 static PyObject *compute_phases_map_sets(indexObject *self, PyObject *args)
{
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 /* 0: public (untracked), 1: draft, 2: secret, 32: archive,
96: internal */
static const char trackedphases[] = {1, 2, 32, 96};
PyObject *roots = Py_None;
Yuya Nishihara
phases: rename variable used for owned dict of phasesets...
r45739 PyObject *phasesetsdict = NULL;
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 PyObject *phasesets[4] = {NULL, NULL, NULL, NULL};
Martin von Zweigbergk
index: don't include nullid in len()...
r38887 Py_ssize_t len = index_length(self);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 char *phases = NULL;
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 int minphaserev = -1, rev, i;
const int numphases = (int)(sizeof(phasesets) / sizeof(phasesets[0]));
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
if (!PyArg_ParseTuple(args, "O", &roots))
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 return NULL;
if (roots == NULL || !PyDict_Check(roots)) {
PyErr_SetString(PyExc_TypeError, "roots must be a dictionary");
return NULL;
Yuya Nishihara
cext: fix computephasesmapsets() not to return without setting an exception...
r36641 }
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 phases = calloc(len, 1);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (phases == NULL) {
PyErr_NoMemory();
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 return NULL;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691
for (i = 0; i < numphases; ++i) {
Yuya Nishihara
phases: move short-lived PyObject pointers to local scope...
r45740 PyObject *pyphase = PyInt_FromLong(trackedphases[i]);
PyObject *phaseroots = NULL;
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 if (pyphase == NULL)
goto release;
phaseroots = PyDict_GetItem(roots, pyphase);
Py_DECREF(pyphase);
if (phaseroots == NULL)
continue;
Yuya Nishihara
phases: fix clang-format error
r45736 rev = add_roots_get_min(self, phaseroots, phases,
trackedphases[i]);
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 if (rev == -2)
goto release;
if (rev != -1 && (minphaserev == -1 || rev < minphaserev))
minphaserev = rev;
}
for (i = 0; i < numphases; ++i) {
phasesets[i] = PySet_New(NULL);
if (phasesets[i] == NULL)
goto release;
}
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 if (minphaserev == -1)
minphaserev = len;
for (rev = minphaserev; rev < len; ++rev) {
Yuya Nishihara
phases: move short-lived PyObject pointers to local scope...
r45740 PyObject *pyphase = NULL;
PyObject *pyrev = NULL;
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 int parents[2];
/*
* The parent lookup could be skipped for phaseroots, but
* phase --force would historically not recompute them
* correctly, leaving descendents with a lower phase around.
* As such, unconditionally recompute the phase.
*/
if (index_get_parents(self, rev, parents, (int)len - 1) < 0)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 goto release;
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 set_phase_from_parents(phases, parents[0], parents[1], rev);
switch (phases[rev]) {
case 0:
continue;
case 1:
pyphase = phasesets[0];
break;
case 2:
pyphase = phasesets[1];
break;
case 32:
pyphase = phasesets[2];
break;
case 96:
pyphase = phasesets[3];
break;
default:
Yuya Nishihara
phases: make sure an exception should be set on error return...
r45737 /* this should never happen since the phase number is
* specified by this function. */
PyErr_SetString(PyExc_SystemError,
"bad phase number in internal list");
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 goto release;
Yuya Nishihara
cext: fix computephasesmapsets() not to return without setting an exception...
r36641 }
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 pyrev = PyInt_FromLong(rev);
if (pyrev == NULL)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 goto release;
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 if (PySet_Add(pyphase, pyrev) == -1) {
Py_DECREF(pyrev);
goto release;
}
Py_DECREF(pyrev);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Yuya Nishihara
phases: rename variable used for owned dict of phasesets...
r45739
phasesetsdict = _dict_new_presized(numphases);
if (phasesetsdict == NULL)
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 goto release;
Joerg Sonnenberger
cext: remove unused variables...
r45701 for (i = 0; i < numphases; ++i) {
Yuya Nishihara
phases: move short-lived PyObject pointers to local scope...
r45740 PyObject *pyphase = PyInt_FromLong(trackedphases[i]);
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 if (pyphase == NULL)
goto release;
Yuya Nishihara
phases: rename variable used for owned dict of phasesets...
r45739 if (PyDict_SetItem(phasesetsdict, pyphase, phasesets[i]) ==
-1) {
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 Py_DECREF(pyphase);
goto release;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 Py_DECREF(phasesets[i]);
phasesets[i] = NULL;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691
Yuya Nishihara
phases: rename variable used for owned dict of phasesets...
r45739 return Py_BuildValue("nN", len, phasesetsdict);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
release:
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 for (i = 0; i < numphases; ++i)
Py_XDECREF(phasesets[i]);
Yuya Nishihara
phases: rename variable used for owned dict of phasesets...
r45739 Py_XDECREF(phasesetsdict);
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 free(phases);
Joerg Sonnenberger
phases: sparsify phaseroots and phasesets...
r45691 return NULL;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
static PyObject *index_headrevs(indexObject *self, PyObject *args)
{
Py_ssize_t i, j, len;
char *nothead = NULL;
PyObject *heads = NULL;
PyObject *filter = NULL;
PyObject *filteredrevs = Py_None;
if (!PyArg_ParseTuple(args, "|O", &filteredrevs)) {
return NULL;
}
if (self->headrevs && filteredrevs == self->filteredrevs)
return list_copy(self->headrevs);
Py_DECREF(self->filteredrevs);
self->filteredrevs = filteredrevs;
Py_INCREF(filteredrevs);
if (filteredrevs != Py_None) {
filter = PyObject_GetAttrString(filteredrevs, "__contains__");
if (!filter) {
Augie Fackler
revlog: give formatting to clang-format...
r40595 PyErr_SetString(
PyExc_TypeError,
"filteredrevs has no attribute __contains__");
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 goto bail;
}
}
Martin von Zweigbergk
index: don't include nullid in len()...
r38887 len = index_length(self);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 heads = PyList_New(0);
if (heads == NULL)
goto bail;
if (len == 0) {
PyObject *nullid = PyInt_FromLong(-1);
if (nullid == NULL || PyList_Append(heads, nullid) == -1) {
Py_XDECREF(nullid);
goto bail;
}
goto done;
}
nothead = calloc(len, 1);
if (nothead == NULL) {
PyErr_NoMemory();
goto bail;
}
for (i = len - 1; i >= 0; i--) {
int isfiltered;
int parents[2];
Augie Fackler
revlog: give formatting to clang-format...
r40595 /* If nothead[i] == 1, it means we've seen an unfiltered child
* of this node already, and therefore this node is not
* filtered. So we can skip the expensive check_filter step.
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 */
if (nothead[i] != 1) {
isfiltered = check_filter(filter, i);
if (isfiltered == -1) {
PyErr_SetString(PyExc_TypeError,
Augie Fackler
revlog: give formatting to clang-format...
r40595 "unable to check filter");
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 goto bail;
}
if (isfiltered) {
nothead[i] = 1;
continue;
}
}
if (index_get_parents(self, i, parents, (int)len - 1) < 0)
goto bail;
for (j = 0; j < 2; j++) {
if (parents[j] >= 0)
nothead[parents[j]] = 1;
}
}
for (i = 0; i < len; i++) {
PyObject *head;
if (nothead[i])
continue;
head = PyInt_FromSsize_t(i);
if (head == NULL || PyList_Append(heads, head) == -1) {
Py_XDECREF(head);
goto bail;
}
}
done:
self->headrevs = heads;
Py_XDECREF(filter);
free(nothead);
return list_copy(self->headrevs);
bail:
Py_XDECREF(filter);
Py_XDECREF(heads);
free(nothead);
return NULL;
}
Gregory Szorc
revlog: address review feedback for deltachain C implementation...
r33171 /**
* Obtain the base revision index entry.
*
* Callers must ensure that rev >= 0 or illegal memory access may occur.
*/
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 static inline int index_baserev(indexObject *self, int rev)
{
const char *data;
Boris Feld
revlog: catch revlog corruption in index_baserev...
r41108 int result;
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 data = index_deref(self, rev);
if (data == NULL)
return -2;
result = getbe32(data + 16);
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168
Boris Feld
revlog: catch revlog corruption in index_baserev...
r41108 if (result > rev) {
PyErr_Format(
PyExc_ValueError,
"corrupted revlog, revision base above revision: %d, %d",
rev, result);
return -2;
}
Boris Feld
revlog: cache delta base value under -1...
r41114 if (result < -1) {
PyErr_Format(
PyExc_ValueError,
Yuya Nishihara
cext: clang-format new code coming from stable branch
r41319 "corrupted revlog, revision base out of range: %d, %d", rev,
result);
Boris Feld
revlog: cache delta base value under -1...
r41114 return -2;
}
Boris Feld
revlog: catch revlog corruption in index_baserev...
r41108 return result;
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 }
Boris Feld
revlog: add a native implementation of issnapshot...
r41117 /**
* Find if a revision is a snapshot or not
*
* Only relevant for sparse-revlog case.
* Callers must ensure that rev is in a valid range.
*/
static int index_issnapshotrev(indexObject *self, Py_ssize_t rev)
{
int ps[2];
Py_ssize_t base;
while (rev >= 0) {
base = (Py_ssize_t)index_baserev(self, rev);
if (base == rev) {
base = -1;
}
if (base == -2) {
assert(PyErr_Occurred());
return -1;
}
if (base == -1) {
return 1;
}
if (index_get_parents(self, rev, ps, (int)rev) < 0) {
assert(PyErr_Occurred());
return -1;
};
if (base == ps[0] || base == ps[1]) {
return 0;
}
rev = base;
}
return rev == -1;
}
Boris Feld
revlog: use the native implementation of issnapshot...
r41118 static PyObject *index_issnapshot(indexObject *self, PyObject *value)
{
long rev;
int issnap;
Py_ssize_t length = index_length(self);
if (!pylong_to_long(value, &rev)) {
return NULL;
}
if (rev < -1 || rev >= length) {
PyErr_Format(PyExc_ValueError, "revlog index out of range: %ld",
rev);
return NULL;
};
issnap = index_issnapshotrev(self, (Py_ssize_t)rev);
if (issnap < 0) {
return NULL;
};
return PyBool_FromLong((long)issnap);
}
Boris Feld
delta: have a native implementation of _findsnapshot...
r41141 static PyObject *index_findsnapshots(indexObject *self, PyObject *args)
{
Py_ssize_t start_rev;
PyObject *cache;
Py_ssize_t base;
Py_ssize_t rev;
PyObject *key = NULL;
PyObject *value = NULL;
const Py_ssize_t length = index_length(self);
if (!PyArg_ParseTuple(args, "O!n", &PyDict_Type, &cache, &start_rev)) {
return NULL;
}
for (rev = start_rev; rev < length; rev++) {
int issnap;
PyObject *allvalues = NULL;
issnap = index_issnapshotrev(self, rev);
if (issnap < 0) {
goto bail;
}
if (issnap == 0) {
continue;
}
base = (Py_ssize_t)index_baserev(self, rev);
if (base == rev) {
base = -1;
}
if (base == -2) {
assert(PyErr_Occurred());
goto bail;
}
key = PyInt_FromSsize_t(base);
allvalues = PyDict_GetItem(cache, key);
if (allvalues == NULL && PyErr_Occurred()) {
goto bail;
}
if (allvalues == NULL) {
int r;
allvalues = PyList_New(0);
if (!allvalues) {
goto bail;
}
r = PyDict_SetItem(cache, key, allvalues);
Py_DECREF(allvalues);
if (r < 0) {
goto bail;
}
}
value = PyInt_FromSsize_t(rev);
if (PyList_Append(allvalues, value)) {
goto bail;
}
Py_CLEAR(key);
Py_CLEAR(value);
}
Py_RETURN_NONE;
bail:
Py_XDECREF(key);
Py_XDECREF(value);
return NULL;
}
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 static PyObject *index_deltachain(indexObject *self, PyObject *args)
{
int rev, generaldelta;
PyObject *stoparg;
int stoprev, iterrev, baserev = -1;
int stopped;
Gregory Szorc
revlog: address review feedback for deltachain C implementation...
r33171 PyObject *chain = NULL, *result = NULL;
Martin von Zweigbergk
index: don't add 1 to length variables...
r38904 const Py_ssize_t length = index_length(self);
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168
if (!PyArg_ParseTuple(args, "iOi", &rev, &stoparg, &generaldelta)) {
return NULL;
}
if (PyInt_Check(stoparg)) {
stoprev = (int)PyInt_AsLong(stoparg);
if (stoprev == -1 && PyErr_Occurred()) {
return NULL;
}
Augie Fackler
revlog: give formatting to clang-format...
r40595 } else if (stoparg == Py_None) {
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 stoprev = -2;
Augie Fackler
revlog: give formatting to clang-format...
r40595 } else {
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 PyErr_SetString(PyExc_ValueError,
Augie Fackler
revlog: give formatting to clang-format...
r40595 "stoprev must be integer or None");
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 return NULL;
}
Martin von Zweigbergk
index: don't add 1 to length variables...
r38904 if (rev < 0 || rev >= length) {
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 PyErr_SetString(PyExc_ValueError, "revlog index out of range");
return NULL;
}
chain = PyList_New(0);
if (chain == NULL) {
return NULL;
}
baserev = index_baserev(self, rev);
/* This should never happen. */
Gregory Szorc
revlog: address review feedback for deltachain C implementation...
r33171 if (baserev <= -2) {
/* Error should be set by index_deref() */
assert(PyErr_Occurred());
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 goto bail;
}
iterrev = rev;
while (iterrev != baserev && iterrev != stoprev) {
Gregory Szorc
revlog: address review feedback for deltachain C implementation...
r33171 PyObject *value = PyInt_FromLong(iterrev);
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 if (value == NULL) {
goto bail;
}
if (PyList_Append(chain, value)) {
Py_DECREF(value);
goto bail;
}
Py_DECREF(value);
if (generaldelta) {
iterrev = baserev;
Augie Fackler
revlog: give formatting to clang-format...
r40595 } else {
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 iterrev--;
}
if (iterrev < 0) {
break;
}
Martin von Zweigbergk
index: don't add 1 to length variables...
r38904 if (iterrev >= length) {
Augie Fackler
revlog: give formatting to clang-format...
r40595 PyErr_SetString(PyExc_IndexError,
"revision outside index");
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 return NULL;
}
baserev = index_baserev(self, iterrev);
/* This should never happen. */
Gregory Szorc
revlog: address review feedback for deltachain C implementation...
r33171 if (baserev <= -2) {
/* Error should be set by index_deref() */
assert(PyErr_Occurred());
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 goto bail;
}
}
if (iterrev == stoprev) {
stopped = 1;
Augie Fackler
revlog: give formatting to clang-format...
r40595 } else {
Gregory Szorc
revlog: address review feedback for deltachain C implementation...
r33171 PyObject *value = PyInt_FromLong(iterrev);
Gregory Szorc
revlog: C implementation of delta chain resolution...
r33168 if (value == NULL) {
goto bail;
}
if (PyList_Append(chain, value)) {
Py_DECREF(value);
goto bail;
}
Py_DECREF(value);
stopped = 0;
}
if (PyList_Reverse(chain)) {
goto bail;
}
result = Py_BuildValue("OO", chain, stopped ? Py_True : Py_False);
Py_DECREF(chain);
return result;
bail:
Py_DECREF(chain);
return NULL;
}
Boris Feld
sparse-revlog: add a `index_segment_span` function in C...
r40741 static inline int64_t
index_segment_span(indexObject *self, Py_ssize_t start_rev, Py_ssize_t end_rev)
{
int64_t start_offset;
int64_t end_offset;
int end_size;
start_offset = index_get_start(self, start_rev);
if (start_offset < 0) {
return -1;
}
end_offset = index_get_start(self, end_rev);
if (end_offset < 0) {
return -1;
}
end_size = index_get_length(self, end_rev);
if (end_size < 0) {
return -1;
}
if (end_offset < start_offset) {
PyErr_Format(PyExc_ValueError,
"corrupted revlog index: inconsistent offset "
"between revisions (%zd) and (%zd)",
start_rev, end_rev);
return -1;
}
return (end_offset - start_offset) + (int64_t)end_size;
}
Boris Feld
revlog: update the documentation for `trim_endidx`...
r40773 /* returns endidx so that revs[startidx:endidx] has no empty trailing revs */
Boris Feld
sparse-revlog: add a `trim_endidx` function in C...
r40742 static Py_ssize_t trim_endidx(indexObject *self, const Py_ssize_t *revs,
Py_ssize_t startidx, Py_ssize_t endidx)
{
int length;
while (endidx > 1 && endidx > startidx) {
length = index_get_length(self, revs[endidx - 1]);
if (length < 0) {
return -1;
}
if (length != 0) {
break;
}
endidx -= 1;
}
return endidx;
}
Boris Feld
sparse-revlog: introduce native (C) implementation of slicechunktodensity...
r40743 struct Gap {
int64_t size;
Py_ssize_t idx;
};
static int gap_compare(const void *left, const void *right)
{
const struct Gap *l_left = ((const struct Gap *)left);
const struct Gap *l_right = ((const struct Gap *)right);
if (l_left->size < l_right->size) {
return -1;
} else if (l_left->size > l_right->size) {
return 1;
}
return 0;
}
static int Py_ssize_t_compare(const void *left, const void *right)
{
const Py_ssize_t l_left = *(const Py_ssize_t *)left;
const Py_ssize_t l_right = *(const Py_ssize_t *)right;
if (l_left < l_right) {
return -1;
} else if (l_left > l_right) {
return 1;
}
return 0;
}
static PyObject *index_slicechunktodensity(indexObject *self, PyObject *args)
{
/* method arguments */
PyObject *list_revs = NULL; /* revisions in the chain */
double targetdensity = 0; /* min density to achieve */
Py_ssize_t mingapsize = 0; /* threshold to ignore gaps */
/* other core variables */
Py_ssize_t idxlen = index_length(self);
Py_ssize_t i; /* used for various iteration */
PyObject *result = NULL; /* the final return of the function */
/* generic information about the delta chain being slice */
Py_ssize_t num_revs = 0; /* size of the full delta chain */
Py_ssize_t *revs = NULL; /* native array of revision in the chain */
int64_t chainpayload = 0; /* sum of all delta in the chain */
int64_t deltachainspan = 0; /* distance from first byte to last byte */
/* variable used for slicing the delta chain */
int64_t readdata = 0; /* amount of data currently planned to be read */
double density = 0; /* ration of payload data compared to read ones */
int64_t previous_end;
struct Gap *gaps = NULL; /* array of notable gap in the chain */
Py_ssize_t num_gaps =
0; /* total number of notable gap recorded so far */
Py_ssize_t *selected_indices = NULL; /* indices of gap skipped over */
Py_ssize_t num_selected = 0; /* number of gaps skipped */
PyObject *chunk = NULL; /* individual slice */
PyObject *allchunks = NULL; /* all slices */
Py_ssize_t previdx;
/* parsing argument */
if (!PyArg_ParseTuple(args, "O!dn", &PyList_Type, &list_revs,
&targetdensity, &mingapsize)) {
goto bail;
}
/* If the delta chain contains a single element, we do not need slicing
*/
num_revs = PyList_GET_SIZE(list_revs);
if (num_revs <= 1) {
result = PyTuple_Pack(1, list_revs);
goto done;
}
/* Turn the python list into a native integer array (for efficiency) */
revs = (Py_ssize_t *)calloc(num_revs, sizeof(Py_ssize_t));
if (revs == NULL) {
PyErr_NoMemory();
goto bail;
}
for (i = 0; i < num_revs; i++) {
Py_ssize_t revnum = PyInt_AsLong(PyList_GET_ITEM(list_revs, i));
if (revnum == -1 && PyErr_Occurred()) {
goto bail;
}
Boris Feld
sparse-revlog: protect C code against delta chain including nullrev...
r40999 if (revnum < nullrev || revnum >= idxlen) {
Boris Feld
sparse: raise a move verbose index error from the C code...
r40787 PyErr_Format(PyExc_IndexError,
"index out of range: %zd", revnum);
Boris Feld
sparse-revlog: introduce native (C) implementation of slicechunktodensity...
r40743 goto bail;
}
revs[i] = revnum;
}
/* Compute and check various property of the unsliced delta chain */
deltachainspan = index_segment_span(self, revs[0], revs[num_revs - 1]);
if (deltachainspan < 0) {
goto bail;
}
if (deltachainspan <= mingapsize) {
result = PyTuple_Pack(1, list_revs);
goto done;
}
chainpayload = 0;
for (i = 0; i < num_revs; i++) {
int tmp = index_get_length(self, revs[i]);
if (tmp < 0) {
goto bail;
}
chainpayload += tmp;
}
readdata = deltachainspan;
density = 1.0;
if (0 < deltachainspan) {
density = (double)chainpayload / (double)deltachainspan;
}
if (density >= targetdensity) {
result = PyTuple_Pack(1, list_revs);
goto done;
}
/* if chain is too sparse, look for relevant gaps */
gaps = (struct Gap *)calloc(num_revs, sizeof(struct Gap));
if (gaps == NULL) {
PyErr_NoMemory();
goto bail;
}
previous_end = -1;
for (i = 0; i < num_revs; i++) {
int64_t revstart;
int revsize;
revstart = index_get_start(self, revs[i]);
if (revstart < 0) {
goto bail;
};
revsize = index_get_length(self, revs[i]);
if (revsize < 0) {
goto bail;
};
if (revsize == 0) {
continue;
}
if (previous_end >= 0) {
int64_t gapsize = revstart - previous_end;
if (gapsize > mingapsize) {
gaps[num_gaps].size = gapsize;
gaps[num_gaps].idx = i;
num_gaps += 1;
}
}
previous_end = revstart + revsize;
}
if (num_gaps == 0) {
result = PyTuple_Pack(1, list_revs);
goto done;
}
qsort(gaps, num_gaps, sizeof(struct Gap), &gap_compare);
/* Slice the largest gap first, they improve the density the most */
selected_indices =
(Py_ssize_t *)malloc((num_gaps + 1) * sizeof(Py_ssize_t));
if (selected_indices == NULL) {
PyErr_NoMemory();
goto bail;
}
for (i = num_gaps - 1; i >= 0; i--) {
selected_indices[num_selected] = gaps[i].idx;
readdata -= gaps[i].size;
num_selected += 1;
if (readdata <= 0) {
density = 1.0;
} else {
density = (double)chainpayload / (double)readdata;
}
if (density >= targetdensity) {
break;
}
}
qsort(selected_indices, num_selected, sizeof(Py_ssize_t),
&Py_ssize_t_compare);
/* create the resulting slice */
allchunks = PyList_New(0);
if (allchunks == NULL) {
goto bail;
}
previdx = 0;
selected_indices[num_selected] = num_revs;
for (i = 0; i <= num_selected; i++) {
Py_ssize_t idx = selected_indices[i];
Py_ssize_t endidx = trim_endidx(self, revs, previdx, idx);
if (endidx < 0) {
goto bail;
}
if (previdx < endidx) {
chunk = PyList_GetSlice(list_revs, previdx, endidx);
if (chunk == NULL) {
goto bail;
}
if (PyList_Append(allchunks, chunk) == -1) {
goto bail;
}
Py_DECREF(chunk);
chunk = NULL;
}
previdx = idx;
}
result = allchunks;
goto done;
bail:
Py_XDECREF(allchunks);
Py_XDECREF(chunk);
done:
free(revs);
free(gaps);
free(selected_indices);
return result;
}
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 static inline int nt_level(const char *node, Py_ssize_t level)
{
Augie Fackler
revlog: give formatting to clang-format...
r40595 int v = node[level >> 1];
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (!(level & 1))
v >>= 4;
return v & 0xf;
}
/*
* Return values:
*
* -4: match is ambiguous (multiple candidates)
* -2: not found
* rest: valid rev
*/
Martin von Zweigbergk
index: make most "nt_*" functions take a nodetree...
r38975 static int nt_find(nodetree *self, const char *node, Py_ssize_t nodelen,
Augie Fackler
revlog: give formatting to clang-format...
r40595 int hex)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
int (*getnybble)(const char *, Py_ssize_t) = hex ? hexdigit : nt_level;
int level, maxlevel, off;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 /* If the input is binary, do a fast check for the nullid first. */
if (!hex && nodelen == self->nodelen && node[0] == '\0' &&
node[1] == '\0' && memcmp(node, nullid, self->nodelen) == 0)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -1;
if (hex)
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 maxlevel = nodelen;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 else
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 maxlevel = 2 * nodelen;
if (maxlevel > 2 * self->nodelen)
maxlevel = 2 * self->nodelen;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
for (level = off = 0; level < maxlevel; level++) {
int k = getnybble(node, level);
Martin von Zweigbergk
index: make most "nt_*" functions take a nodetree...
r38975 nodetreenode *n = &self->nodes[off];
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 int v = n->children[k];
if (v < 0) {
const char *n;
Py_ssize_t i;
Martin von Zweigbergk
index: store nullrev as -1 in nodetree...
r38882 v = -(v + 2);
Martin von Zweigbergk
index: make most "nt_*" functions take a nodetree...
r38975 n = index_node(self->index, v);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (n == NULL)
return -2;
for (i = level; i < maxlevel; i++)
if (getnybble(node, i) != nt_level(n, i))
return -2;
return v;
}
if (v == 0)
return -2;
off = v;
}
/* multiple matches against an ambiguous prefix */
return -4;
}
Martin von Zweigbergk
index: pass only nodetree to nt_new()...
r38951 static int nt_new(nodetree *self)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
Martin von Zweigbergk
index: pass only nodetree to nt_new()...
r38951 if (self->length == self->capacity) {
Jun Wu
revlog: use size_t for nodetree capacity...
r46841 size_t newcapacity;
Martin von Zweigbergk
index: remove side-effect from failed nt_new()...
r38973 nodetreenode *newnodes;
Martin von Zweigbergk
index: avoid duplicating capacity-growth expression...
r39106 newcapacity = self->capacity * 2;
Jun Wu
revlog: use size_t for nodetree capacity...
r46841 if (newcapacity >= SIZE_MAX / sizeof(nodetreenode)) {
Augie Fackler
revlog: give formatting to clang-format...
r40595 PyErr_SetString(PyExc_MemoryError,
"overflow in nt_new");
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -1;
}
Augie Fackler
revlog: give formatting to clang-format...
r40595 newnodes =
realloc(self->nodes, newcapacity * sizeof(nodetreenode));
Martin von Zweigbergk
index: remove side-effect from failed nt_new()...
r38973 if (newnodes == NULL) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 PyErr_SetString(PyExc_MemoryError, "out of memory");
return -1;
}
Martin von Zweigbergk
index: remove side-effect from failed nt_new()...
r38973 self->capacity = newcapacity;
self->nodes = newnodes;
Martin von Zweigbergk
index: pass only nodetree to nt_new()...
r38951 memset(&self->nodes[self->length], 0,
sizeof(nodetreenode) * (self->capacity - self->length));
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Martin von Zweigbergk
index: pass only nodetree to nt_new()...
r38951 return self->length++;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Martin von Zweigbergk
index: make most "nt_*" functions take a nodetree...
r38975 static int nt_insert(nodetree *self, const char *node, int rev)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
int level = 0;
int off = 0;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 while (level < 2 * self->nodelen) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 int k = nt_level(node, level);
Martin von Zweigbergk
index: extract a type for the nodetree...
r38948 nodetreenode *n;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 int v;
Martin von Zweigbergk
index: make most "nt_*" functions take a nodetree...
r38975 n = &self->nodes[off];
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 v = n->children[k];
if (v == 0) {
Martin von Zweigbergk
index: store nullrev as -1 in nodetree...
r38882 n->children[k] = -rev - 2;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return 0;
}
if (v < 0) {
Augie Fackler
revlog: give formatting to clang-format...
r40595 const char *oldnode =
index_node_existing(self->index, -(v + 2));
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 int noff;
Martin von Zweigbergk
revlog: handle errors from index_node() in nt_insert() and index_slice_del()...
r38020 if (oldnode == NULL)
return -1;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (!memcmp(oldnode, node, self->nodelen)) {
Martin von Zweigbergk
index: store nullrev as -1 in nodetree...
r38882 n->children[k] = -rev - 2;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return 0;
}
Martin von Zweigbergk
index: make most "nt_*" functions take a nodetree...
r38975 noff = nt_new(self);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (noff == -1)
return -1;
Martin von Zweigbergk
index: make most "nt_*" functions take a nodetree...
r38975 /* self->nodes may have been changed by realloc */
self->nodes[off].children[k] = noff;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 off = noff;
Martin von Zweigbergk
index: make most "nt_*" functions take a nodetree...
r38975 n = &self->nodes[off];
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 n->children[nt_level(oldnode, ++level)] = v;
Martin von Zweigbergk
index: make most "nt_*" functions take a nodetree...
r38975 if (level > self->depth)
self->depth = level;
self->splits += 1;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 } else {
level += 1;
off = v;
}
}
return -1;
}
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 static PyObject *ntobj_insert(nodetreeObject *self, PyObject *args)
Martin von Zweigbergk
shortest: use nodetree for finding shortest node within revset...
r39262 {
Py_ssize_t rev;
const char *node;
Matt Harbison
cext: fix revlog compiler error on Windows
r39263 Py_ssize_t length;
Martin von Zweigbergk
shortest: use nodetree for finding shortest node within revset...
r39262 if (!PyArg_ParseTuple(args, "n", &rev))
return NULL;
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 length = index_length(self->nt.index);
Martin von Zweigbergk
shortest: use nodetree for finding shortest node within revset...
r39262 if (rev < 0 || rev >= length) {
PyErr_SetString(PyExc_ValueError, "revlog index out of range");
return NULL;
}
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 node = index_node_existing(self->nt.index, rev);
if (nt_insert(&self->nt, node, (int)rev) == -1)
Martin von Zweigbergk
shortest: use nodetree for finding shortest node within revset...
r39262 return NULL;
Py_RETURN_NONE;
}
Martin von Zweigbergk
index: make most "nt_*" functions take a nodetree...
r38975 static int nt_delete_node(nodetree *self, const char *node)
Martin von Zweigbergk
index: create function for deleting node from nodetree...
r38881 {
Augie Fackler
revlog: give formatting to clang-format...
r40595 /* rev==-2 happens to get encoded as 0, which is interpreted as not set
*/
Martin von Zweigbergk
index: store nullrev as -1 in nodetree...
r38882 return nt_insert(self, node, -2);
Martin von Zweigbergk
index: create function for deleting node from nodetree...
r38881 }
Martin von Zweigbergk
index: split up nt_init() in two...
r38976 static int nt_init(nodetree *self, indexObject *index, unsigned capacity)
{
Martin von Zweigbergk
index: fix a comment about overflow-checking...
r39259 /* Initialize before overflow-checking to avoid nt_dealloc() crash. */
Martin von Zweigbergk
index: make node tree a Python object...
r39252 self->nodes = NULL;
Martin von Zweigbergk
index: split up nt_init() in two...
r38976 self->index = index;
Martin von Zweigbergk
index: make capacity argument to nt_init be measured in revisions...
r39107 /* The input capacity is in terms of revisions, while the field is in
* terms of nodetree nodes. */
self->capacity = (capacity < 4 ? 4 : capacity / 2);
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 self->nodelen = index->nodelen;
Martin von Zweigbergk
index: split up nt_init() in two...
r38976 self->depth = 0;
self->splits = 0;
Jun Wu
revlog: use size_t for nodetree capacity...
r46841 if (self->capacity > SIZE_MAX / sizeof(nodetreenode)) {
Martin von Zweigbergk
index: move check for too large capacity into nt_init()...
r39105 PyErr_SetString(PyExc_ValueError, "overflow in init_nt");
return -1;
}
Martin von Zweigbergk
index: split up nt_init() in two...
r38976 self->nodes = calloc(self->capacity, sizeof(nodetreenode));
if (self->nodes == NULL) {
PyErr_NoMemory();
return -1;
}
self->length = 1;
return 0;
}
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 static int ntobj_init(nodetreeObject *self, PyObject *args)
Martin von Zweigbergk
index: make node tree a Python object...
r39252 {
PyObject *index;
unsigned capacity;
Yuya Nishihara
revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol...
r40895 if (!PyArg_ParseTuple(args, "O!I", &HgRevlogIndex_Type, &index,
&capacity))
Martin von Zweigbergk
index: make node tree a Python object...
r39252 return -1;
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 Py_INCREF(index);
Augie Fackler
revlog: give formatting to clang-format...
r40595 return nt_init(&self->nt, (indexObject *)index, capacity);
Martin von Zweigbergk
index: make node tree a Python object...
r39252 }
Augie Fackler
revlog: give formatting to clang-format...
r40595 static int nt_partialmatch(nodetree *self, const char *node, Py_ssize_t nodelen)
Martin von Zweigbergk
index: move all "nt_*" functions to one place...
r38978 {
return nt_find(self, node, nodelen, 1);
}
/*
* Find the length of the shortest unique prefix of node.
*
* Return values:
*
* -3: error (exception set)
* -2: not found (no exception set)
* rest: length of shortest prefix
*/
static int nt_shortest(nodetree *self, const char *node)
{
int level, off;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 for (level = off = 0; level < 2 * self->nodelen; level++) {
Martin von Zweigbergk
index: move all "nt_*" functions to one place...
r38978 int k, v;
nodetreenode *n = &self->nodes[off];
k = nt_level(node, level);
v = n->children[k];
if (v < 0) {
const char *n;
v = -(v + 2);
n = index_node_existing(self->index, v);
if (n == NULL)
return -3;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (memcmp(node, n, self->nodelen) != 0)
Martin von Zweigbergk
index: move all "nt_*" functions to one place...
r38978 /*
* Found a unique prefix, but it wasn't for the
* requested node (i.e the requested node does
* not exist).
*/
return -2;
return level + 1;
}
if (v == 0)
return -2;
off = v;
}
/*
* The node was still not unique after 40 hex digits, so this won't
* happen. Also, if we get here, then there's a programming error in
* this file that made us insert a node longer than 40 hex digits.
*/
PyErr_SetString(PyExc_Exception, "broken node tree");
return -3;
}
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 static PyObject *ntobj_shortest(nodetreeObject *self, PyObject *args)
Martin von Zweigbergk
shortest: use nodetree for finding shortest node within revset...
r39262 {
PyObject *val;
char *node;
int length;
if (!PyArg_ParseTuple(args, "O", &val))
return NULL;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (node_check(self->nt.nodelen, val, &node) == -1)
Martin von Zweigbergk
shortest: use nodetree for finding shortest node within revset...
r39262 return NULL;
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 length = nt_shortest(&self->nt, node);
Martin von Zweigbergk
shortest: use nodetree for finding shortest node within revset...
r39262 if (length == -3)
return NULL;
if (length == -2) {
raise_revlog_error();
return NULL;
}
return PyInt_FromLong(length);
}
Martin von Zweigbergk
index: make node tree a Python object...
r39252 static void nt_dealloc(nodetree *self)
{
free(self->nodes);
self->nodes = NULL;
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 }
static void ntobj_dealloc(nodetreeObject *self)
{
Py_XDECREF(self->nt.index);
nt_dealloc(&self->nt);
Martin von Zweigbergk
index: make node tree a Python object...
r39252 PyObject_Del(self);
}
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 static PyMethodDef ntobj_methods[] = {
Augie Fackler
revlog: give formatting to clang-format...
r40595 {"insert", (PyCFunction)ntobj_insert, METH_VARARGS,
"insert an index entry"},
{"shortest", (PyCFunction)ntobj_shortest, METH_VARARGS,
"find length of shortest hex nodeid of a binary ID"},
{NULL} /* Sentinel */
Martin von Zweigbergk
shortest: use nodetree for finding shortest node within revset...
r39262 };
Martin von Zweigbergk
index: make node tree a Python object...
r39252 static PyTypeObject nodetreeType = {
Augie Fackler
revlog: give formatting to clang-format...
r40595 PyVarObject_HEAD_INIT(NULL, 0) /* header */
"parsers.nodetree", /* tp_name */
sizeof(nodetreeObject), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)ntobj_dealloc, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_compare */
0, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
"nodetree", /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
ntobj_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
(initproc)ntobj_init, /* tp_init */
0, /* tp_alloc */
Martin von Zweigbergk
index: make node tree a Python object...
r39252 };
Martin von Zweigbergk
index: split up nt_init() in two...
r38976 static int index_init_nt(indexObject *self)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 if (!self->ntinitialized) {
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 if (nt_init(&self->nt, self, (int)self->length) == -1) {
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 nt_dealloc(&self->nt);
Martin von Zweigbergk
index: extract a type for the nodetree...
r38948 return -1;
}
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 if (nt_insert(&self->nt, nullid, -1) == -1) {
nt_dealloc(&self->nt);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -1;
}
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 self->ntinitialized = 1;
Martin von Zweigbergk
index: don't include nullid in len()...
r38887 self->ntrev = (int)index_length(self);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 self->ntlookups = 1;
self->ntmisses = 0;
}
return 0;
}
/*
* Return values:
*
* -3: error (exception set)
* -2: not found (no exception set)
* rest: valid rev
*/
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 static int index_find_node(indexObject *self, const char *node)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
int rev;
Martin von Zweigbergk
index: split up nt_init() in two...
r38976 if (index_init_nt(self) == -1)
Martin von Zweigbergk
revlog: remove micro-optimization for looking up only nullid...
r38856 return -3;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 self->ntlookups++;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 rev = nt_find(&self->nt, node, self->nodelen, 0);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (rev >= -1)
return rev;
/*
* For the first handful of lookups, we scan the entire index,
* and cache only the matching nodes. This optimizes for cases
* like "hg tip", where only a few nodes are accessed.
*
* After that, we cache every node we visit, using a single
* scan amortized over multiple lookups. This gives the best
* bulk performance, e.g. for "hg log".
*/
if (self->ntmisses++ < 4) {
for (rev = self->ntrev - 1; rev >= 0; rev--) {
Martin von Zweigbergk
revlog: don't say "not found" on internal error...
r37878 const char *n = index_node_existing(self, rev);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (n == NULL)
Martin von Zweigbergk
revlog: don't say "not found" on internal error...
r37878 return -3;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (memcmp(node, n, self->nodelen) == 0) {
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 if (nt_insert(&self->nt, n, rev) == -1)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -3;
break;
}
}
} else {
for (rev = self->ntrev - 1; rev >= 0; rev--) {
Martin von Zweigbergk
revlog: don't say "not found" on internal error...
r37878 const char *n = index_node_existing(self, rev);
if (n == NULL)
return -3;
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 if (nt_insert(&self->nt, n, rev) == -1) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 self->ntrev = rev + 1;
return -3;
}
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (memcmp(node, n, self->nodelen) == 0) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 break;
}
}
self->ntrev = rev;
}
if (rev >= 0)
return rev;
return -2;
}
static PyObject *index_getitem(indexObject *self, PyObject *value)
{
char *node;
int rev;
Augie Fackler
revlog: replace PyInt_AS_LONG with a more portable helper function...
r40634 if (PyInt_Check(value)) {
long idx;
if (!pylong_to_long(value, &idx)) {
return NULL;
}
return index_get(self, idx);
}
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (node_check(self->nodelen, value, &node) == -1)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return NULL;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 rev = index_find_node(self, node);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (rev >= -1)
return PyInt_FromLong(rev);
if (rev == -2)
raise_revlog_error();
return NULL;
}
Martin von Zweigbergk
revlog: extract function for fully populating the radix tree...
r37948 /*
* Fully populate the radix tree.
*/
Augie Fackler
revlog: give formatting to clang-format...
r40595 static int index_populate_nt(indexObject *self)
{
Martin von Zweigbergk
revlog: extract function for fully populating the radix tree...
r37948 int rev;
if (self->ntrev > 0) {
for (rev = self->ntrev - 1; rev >= 0; rev--) {
const char *n = index_node_existing(self, rev);
if (n == NULL)
return -1;
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 if (nt_insert(&self->nt, n, rev) == -1)
Martin von Zweigbergk
revlog: extract function for fully populating the radix tree...
r37948 return -1;
}
Martin von Zweigbergk
revlog: use literal -1 instead of variable that always has that value...
r37949 self->ntrev = -1;
Martin von Zweigbergk
revlog: extract function for fully populating the radix tree...
r37948 }
return 0;
}
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 static PyObject *index_partialmatch(indexObject *self, PyObject *args)
{
const char *fullnode;
Gregory Szorc
cext: make revlog.c PY_SSIZE_T_CLEAN...
r42234 Py_ssize_t nodelen;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 char *node;
int rev, i;
Yuya Nishihara
py3: bulk-replace 'const char*' format specifier passed to PyArg_ParseTuple*()...
r36638 if (!PyArg_ParseTuple(args, PY23("s#", "y#"), &node, &nodelen))
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return NULL;
Martin von Zweigbergk
revlog: use radix tree also for matching keys shorter than 4 hex digits...
r37875 if (nodelen < 1) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 PyErr_SetString(PyExc_ValueError, "key too short");
return NULL;
}
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (nodelen > 2 * self->nodelen) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 PyErr_SetString(PyExc_ValueError, "key too long");
return NULL;
}
for (i = 0; i < nodelen; i++)
hexdigit(node, i);
if (PyErr_Occurred()) {
/* input contains non-hex characters */
PyErr_Clear();
Py_RETURN_NONE;
}
Martin von Zweigbergk
index: split up nt_init() in two...
r38976 if (index_init_nt(self) == -1)
Martin von Zweigbergk
index: make "nt_*" functions work on an initialized nodetree...
r38947 return NULL;
Martin von Zweigbergk
index: rename "nt_*(indexObject *self,...)" functions to "index_*"...
r38977 if (index_populate_nt(self) == -1)
Martin von Zweigbergk
index: make "nt_*" functions work on an initialized nodetree...
r38947 return NULL;
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 rev = nt_partialmatch(&self->nt, node, nodelen);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
switch (rev) {
case -4:
raise_revlog_error();
return NULL;
case -2:
Py_RETURN_NONE;
case -1:
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 return PyBytes_FromStringAndSize(nullid, self->nodelen);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Martin von Zweigbergk
revlog: extract function for getting node from known-to-exist rev...
r37877 fullnode = index_node_existing(self, rev);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (fullnode == NULL) {
return NULL;
}
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 return PyBytes_FromStringAndSize(fullnode, self->nodelen);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Martin von Zweigbergk
revlog: use node tree (native code) for shortest() calculation...
r37987 static PyObject *index_shortest(indexObject *self, PyObject *args)
{
PyObject *val;
char *node;
int length;
if (!PyArg_ParseTuple(args, "O", &val))
return NULL;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (node_check(self->nodelen, val, &node) == -1)
Martin von Zweigbergk
revlog: use node tree (native code) for shortest() calculation...
r37987 return NULL;
self->ntlookups++;
Martin von Zweigbergk
index: split up nt_init() in two...
r38976 if (index_init_nt(self) == -1)
Martin von Zweigbergk
index: make "nt_*" functions work on an initialized nodetree...
r38947 return NULL;
Martin von Zweigbergk
index: rename "nt_*(indexObject *self,...)" functions to "index_*"...
r38977 if (index_populate_nt(self) == -1)
Martin von Zweigbergk
index: make "nt_*" functions work on an initialized nodetree...
r38947 return NULL;
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 length = nt_shortest(&self->nt, node);
Martin von Zweigbergk
revlog: use node tree (native code) for shortest() calculation...
r37987 if (length == -3)
return NULL;
if (length == -2) {
raise_revlog_error();
return NULL;
}
return PyInt_FromLong(length);
}
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 static PyObject *index_m_get(indexObject *self, PyObject *args)
{
PyObject *val;
char *node;
int rev;
if (!PyArg_ParseTuple(args, "O", &val))
return NULL;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (node_check(self->nodelen, val, &node) == -1)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return NULL;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 rev = index_find_node(self, node);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (rev == -3)
return NULL;
if (rev == -2)
Py_RETURN_NONE;
return PyInt_FromLong(rev);
}
static int index_contains(indexObject *self, PyObject *value)
{
char *node;
if (PyInt_Check(value)) {
Augie Fackler
revlog: replace PyInt_AS_LONG with a more portable helper function...
r40634 long rev;
if (!pylong_to_long(value, &rev)) {
return -1;
}
Martin von Zweigbergk
index: return False for "len(index) in index"...
r38902 return rev >= -1 && rev < index_length(self);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (node_check(self->nodelen, value, &node) == -1)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -1;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 switch (index_find_node(self, node)) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 case -3:
return -1;
case -2:
return 0;
default:
return 1;
}
}
index: add a `has_node` method (API)...
r43934 static PyObject *index_m_has_node(indexObject *self, PyObject *args)
{
int ret = index_contains(self, args);
if (ret < 0)
return NULL;
return PyBool_FromLong((long)ret);
}
index: add a `rev` method (API)...
r43952 static PyObject *index_m_rev(indexObject *self, PyObject *val)
{
char *node;
int rev;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (node_check(self->nodelen, val, &node) == -1)
index: add a `rev` method (API)...
r43952 return NULL;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 rev = index_find_node(self, node);
index: add a `rev` method (API)...
r43952 if (rev >= -1)
return PyInt_FromLong(rev);
if (rev == -2)
raise_revlog_error();
return NULL;
}
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 typedef uint64_t bitmask;
/*
* Given a disjoint set of revs, return all candidates for the
* greatest common ancestor. In revset notation, this is the set
* "heads(::a and ::b and ...)"
*/
static PyObject *find_gca_candidates(indexObject *self, const int *revs,
Augie Fackler
revlog: give formatting to clang-format...
r40595 int revcount)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
const bitmask allseen = (1ull << revcount) - 1;
const bitmask poison = 1ull << revcount;
PyObject *gca = PyList_New(0);
int i, v, interesting;
int maxrev = -1;
bitmask sp;
bitmask *seen;
if (gca == NULL)
return PyErr_NoMemory();
for (i = 0; i < revcount; i++) {
if (revs[i] > maxrev)
maxrev = revs[i];
}
seen = calloc(sizeof(*seen), maxrev + 1);
if (seen == NULL) {
Py_DECREF(gca);
return PyErr_NoMemory();
}
for (i = 0; i < revcount; i++)
seen[revs[i]] = 1ull << i;
interesting = revcount;
for (v = maxrev; v >= 0 && interesting; v--) {
bitmask sv = seen[v];
int parents[2];
if (!sv)
continue;
if (sv < poison) {
interesting -= 1;
if (sv == allseen) {
PyObject *obj = PyInt_FromLong(v);
if (obj == NULL)
goto bail;
if (PyList_Append(gca, obj) == -1) {
Py_DECREF(obj);
goto bail;
}
sv |= poison;
for (i = 0; i < revcount; i++) {
if (revs[i] == v)
goto done;
}
}
}
if (index_get_parents(self, v, parents, maxrev) < 0)
goto bail;
for (i = 0; i < 2; i++) {
int p = parents[i];
if (p == -1)
continue;
sp = seen[p];
if (sv < poison) {
if (sp == 0) {
seen[p] = sv;
interesting++;
Augie Fackler
revlog: give formatting to clang-format...
r40595 } else if (sp != sv)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 seen[p] |= sv;
} else {
if (sp && sp < poison)
interesting--;
seen[p] = sv;
}
}
}
done:
free(seen);
return gca;
bail:
free(seen);
Py_XDECREF(gca);
return NULL;
}
/*
* Given a disjoint set of revs, return the subset with the longest
* path to the root.
*/
static PyObject *find_deepest(indexObject *self, PyObject *revs)
{
const Py_ssize_t revcount = PyList_GET_SIZE(revs);
static const Py_ssize_t capacity = 24;
int *depth, *interesting = NULL;
int i, j, v, ninteresting;
PyObject *dict = NULL, *keys = NULL;
long *seen = NULL;
int maxrev = -1;
long final;
if (revcount > capacity) {
PyErr_Format(PyExc_OverflowError,
Augie Fackler
revlog: give formatting to clang-format...
r40595 "bitset size (%ld) > capacity (%ld)",
(long)revcount, (long)capacity);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return NULL;
}
for (i = 0; i < revcount; i++) {
int n = (int)PyInt_AsLong(PyList_GET_ITEM(revs, i));
if (n > maxrev)
maxrev = n;
}
depth = calloc(sizeof(*depth), maxrev + 1);
if (depth == NULL)
return PyErr_NoMemory();
seen = calloc(sizeof(*seen), maxrev + 1);
if (seen == NULL) {
PyErr_NoMemory();
goto bail;
}
Matt Harbison
cext: fix Windows warning about implicit conversion of 32-bit shift to 64 bit...
r39108 interesting = calloc(sizeof(*interesting), ((size_t)1) << revcount);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (interesting == NULL) {
PyErr_NoMemory();
goto bail;
}
if (PyList_Sort(revs) == -1)
goto bail;
for (i = 0; i < revcount; i++) {
int n = (int)PyInt_AsLong(PyList_GET_ITEM(revs, i));
long b = 1l << i;
depth[n] = 1;
seen[n] = b;
interesting[b] = 1;
}
Sune Foldager
parsers: fix invariant bug in find_deepest (issue5623)...
r33475 /* invariant: ninteresting is the number of non-zero entries in
* interesting. */
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 ninteresting = (int)revcount;
for (v = maxrev; v >= 0 && ninteresting > 1; v--) {
int dv = depth[v];
int parents[2];
long sv;
if (dv == 0)
continue;
sv = seen[v];
if (index_get_parents(self, v, parents, maxrev) < 0)
goto bail;
for (i = 0; i < 2; i++) {
int p = parents[i];
long sp;
int dp;
if (p == -1)
continue;
dp = depth[p];
sp = seen[p];
if (dp <= dv) {
depth[p] = dv + 1;
if (sp != sv) {
interesting[sv] += 1;
seen[p] = sv;
if (sp) {
interesting[sp] -= 1;
if (interesting[sp] == 0)
ninteresting -= 1;
}
}
Augie Fackler
revlog: give formatting to clang-format...
r40595 } else if (dv == dp - 1) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 long nsp = sp | sv;
if (nsp == sp)
continue;
seen[p] = nsp;
interesting[sp] -= 1;
Sune Foldager
parsers: fix invariant bug in find_deepest (issue5623)...
r33475 if (interesting[sp] == 0)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 ninteresting -= 1;
Sune Foldager
parsers: fix invariant bug in find_deepest (issue5623)...
r33475 if (interesting[nsp] == 0)
ninteresting += 1;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 interesting[nsp] += 1;
}
}
interesting[sv] -= 1;
if (interesting[sv] == 0)
ninteresting -= 1;
}
final = 0;
j = ninteresting;
for (i = 0; i < (int)(2 << revcount) && j > 0; i++) {
if (interesting[i] == 0)
continue;
final |= i;
j -= 1;
}
if (final == 0) {
keys = PyList_New(0);
goto bail;
}
dict = PyDict_New();
if (dict == NULL)
goto bail;
for (i = 0; i < revcount; i++) {
PyObject *key;
if ((final & (1 << i)) == 0)
continue;
key = PyList_GET_ITEM(revs, i);
Py_INCREF(key);
Py_INCREF(Py_None);
if (PyDict_SetItem(dict, key, Py_None) == -1) {
Py_DECREF(key);
Py_DECREF(Py_None);
goto bail;
}
}
keys = PyDict_Keys(dict);
bail:
free(depth);
free(seen);
free(interesting);
Py_XDECREF(dict);
return keys;
}
/*
* Given a (possibly overlapping) set of revs, return all the
* common ancestors heads: heads(::args[0] and ::a[1] and ...)
*/
static PyObject *index_commonancestorsheads(indexObject *self, PyObject *args)
{
PyObject *ret = NULL;
Py_ssize_t argcount, i, len;
bitmask repeat = 0;
int revcount = 0;
int *revs;
argcount = PySequence_Length(args);
revs = PyMem_Malloc(argcount * sizeof(*revs));
if (argcount > 0 && revs == NULL)
return PyErr_NoMemory();
Martin von Zweigbergk
index: don't include nullid in len()...
r38887 len = index_length(self);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
for (i = 0; i < argcount; i++) {
static const int capacity = 24;
PyObject *obj = PySequence_GetItem(args, i);
bitmask x;
long val;
if (!PyInt_Check(obj)) {
PyErr_SetString(PyExc_TypeError,
Augie Fackler
revlog: give formatting to clang-format...
r40595 "arguments must all be ints");
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 Py_DECREF(obj);
goto bail;
}
val = PyInt_AsLong(obj);
Py_DECREF(obj);
if (val == -1) {
ret = PyList_New(0);
goto done;
}
if (val < 0 || val >= len) {
Augie Fackler
revlog: give formatting to clang-format...
r40595 PyErr_SetString(PyExc_IndexError, "index out of range");
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 goto bail;
}
/* this cheesy bloom filter lets us avoid some more
* expensive duplicate checks in the common set-is-disjoint
* case */
x = 1ull << (val & 0x3f);
if (repeat & x) {
int k;
for (k = 0; k < revcount; k++) {
if (val == revs[k])
goto duplicate;
}
Augie Fackler
revlog: give formatting to clang-format...
r40595 } else
repeat |= x;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (revcount >= capacity) {
PyErr_Format(PyExc_OverflowError,
Augie Fackler
revlog: give formatting to clang-format...
r40595 "bitset size (%d) > capacity (%d)",
revcount, capacity);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 goto bail;
}
revs[revcount++] = (int)val;
duplicate:;
}
if (revcount == 0) {
ret = PyList_New(0);
goto done;
}
if (revcount == 1) {
PyObject *obj;
ret = PyList_New(1);
if (ret == NULL)
goto bail;
obj = PyInt_FromLong(revs[0]);
if (obj == NULL)
goto bail;
PyList_SET_ITEM(ret, 0, obj);
goto done;
}
ret = find_gca_candidates(self, revs, revcount);
if (ret == NULL)
goto bail;
done:
PyMem_Free(revs);
return ret;
bail:
PyMem_Free(revs);
Py_XDECREF(ret);
return NULL;
}
/*
* Given a (possibly overlapping) set of revs, return the greatest
* common ancestors: those with the longest path to the root.
*/
static PyObject *index_ancestors(indexObject *self, PyObject *args)
{
PyObject *ret;
PyObject *gca = index_commonancestorsheads(self, args);
if (gca == NULL)
return NULL;
if (PyList_GET_SIZE(gca) <= 1) {
return gca;
}
ret = find_deepest(self, gca);
Py_DECREF(gca);
return ret;
}
/*
* Invalidate any trie entries introduced by added revs.
*/
Martin von Zweigbergk
index: rename "nt_*(indexObject *self,...)" functions to "index_*"...
r38977 static void index_invalidate_added(indexObject *self, Py_ssize_t start)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 Py_ssize_t i, len;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 len = self->length + self->new_length;
i = start - self->length;
if (i < 0)
return;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 for (i = start; i < len; i++)
nt_delete_node(&self->nt, index_deref(self, i) + 32);
self->new_length = start - self->length;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
/*
* Delete a numeric range of revs, which must be at the end of the
Martin von Zweigbergk
revlog: delete references to deleted nullid sentinel value...
r43981 * range.
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 */
static int index_slice_del(indexObject *self, PyObject *item)
{
Py_ssize_t start, stop, step, slicelength;
Martin von Zweigbergk
index: don't include nullid in len()...
r38887 Py_ssize_t length = index_length(self) + 1;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 int ret = 0;
/* Argument changed from PySliceObject* to PyObject* in Python 3. */
#ifdef IS_PY3K
Augie Fackler
revlog: give formatting to clang-format...
r40595 if (PySlice_GetIndicesEx(item, length, &start, &stop, &step,
&slicelength) < 0)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 #else
Augie Fackler
revlog: give formatting to clang-format...
r40595 if (PySlice_GetIndicesEx((PySliceObject *)item, length, &start, &stop,
&step, &slicelength) < 0)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 #endif
return -1;
if (slicelength <= 0)
return 0;
if ((step < 0 && start < stop) || (step > 0 && start > stop))
stop = start;
if (step < 0) {
stop = start + 1;
Augie Fackler
revlog: give formatting to clang-format...
r40595 start = stop + step * (slicelength - 1) - 1;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 step = -step;
}
if (step != 1) {
PyErr_SetString(PyExc_ValueError,
Augie Fackler
revlog: give formatting to clang-format...
r40595 "revlog index delete requires step size of 1");
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -1;
}
if (stop != length - 1) {
PyErr_SetString(PyExc_IndexError,
Augie Fackler
revlog: give formatting to clang-format...
r40595 "revlog index deletion indices are invalid");
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -1;
}
Martin von Zweigbergk
index: don't include nullid in the internal "length" field...
r39103 if (start < self->length) {
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 if (self->ntinitialized) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 Py_ssize_t i;
revlog: clean up the node of all revision stripped in the C code...
r43932 for (i = start; i < self->length; i++) {
Martin von Zweigbergk
revlog: handle errors from index_node() in nt_insert() and index_slice_del()...
r38020 const char *node = index_node_existing(self, i);
if (node == NULL)
return -1;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 nt_delete_node(&self->nt, node);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 if (self->new_length)
index_invalidate_added(self, self->length);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (self->ntrev > start)
self->ntrev = (int)start;
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 } else if (self->new_length) {
self->new_length = 0;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
Georges Racinet
cext-revlog: fixed __delitem__ for uninitialized nodetree...
r44306
Martin von Zweigbergk
index: don't include nullid in the internal "length" field...
r39103 self->length = start;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 goto done;
}
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 if (self->ntinitialized) {
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 index_invalidate_added(self, start);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (self->ntrev > start)
self->ntrev = (int)start;
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 } else {
self->new_length = start - self->length;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
done:
Py_CLEAR(self->headrevs);
return ret;
}
/*
* Supported ops:
*
* slice deletion
* string assignment (extend node->rev mapping)
* string deletion (shrink node->rev mapping)
*/
static int index_assign_subscript(indexObject *self, PyObject *item,
Augie Fackler
revlog: give formatting to clang-format...
r40595 PyObject *value)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
char *node;
long rev;
if (PySlice_Check(item) && value == NULL)
return index_slice_del(self, item);
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (node_check(self->nodelen, item, &node) == -1)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -1;
if (value == NULL)
Augie Fackler
revlog: give formatting to clang-format...
r40595 return self->ntinitialized ? nt_delete_node(&self->nt, node)
: 0;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 rev = PyInt_AsLong(value);
if (rev > INT_MAX || rev < 0) {
if (!PyErr_Occurred())
PyErr_SetString(PyExc_ValueError, "rev out of range");
return -1;
}
Martin von Zweigbergk
index: split up nt_init() in two...
r38976 if (index_init_nt(self) == -1)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -1;
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 return nt_insert(&self->nt, node, (int)rev);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
/*
* Find all RevlogNG entries in an index that has inline data. Update
* the optional "offsets" table with those entries.
*/
static Py_ssize_t inline_scan(indexObject *self, const char **offsets)
{
const char *data = (const char *)self->buf.buf;
Py_ssize_t pos = 0;
Py_ssize_t end = self->buf.len;
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 long incr = self->entry_size;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 Py_ssize_t len = 0;
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 while (pos + self->entry_size <= end && pos >= 0) {
Raphaël Gomès
cext: add support for revlogv2...
r47442 uint32_t comp_len, sidedata_comp_len = 0;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 /* 3rd element of header is length of compressed inline data */
comp_len = getbe32(data + pos + 8);
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 if (self->entry_size == v2_entry_size) {
Raphaël Gomès
cext: add support for revlogv2...
r47442 sidedata_comp_len = getbe32(data + pos + 72);
}
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 incr = self->entry_size + comp_len + sidedata_comp_len;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (offsets)
offsets[len] = data + pos;
len++;
pos += incr;
}
if (pos != end) {
if (!PyErr_Occurred())
PyErr_SetString(PyExc_ValueError, "corrupt index file");
return -1;
}
return len;
}
Raphaël Gomès
cext: add support for revlogv2...
r47442 static int index_init(indexObject *self, PyObject *args, PyObject *kwargs)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
Raphaël Gomès
cext: add support for revlogv2...
r47442 PyObject *data_obj, *inlined_obj, *revlogv2;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 Py_ssize_t size;
Raphaël Gomès
cext: add support for revlogv2...
r47442 static char *kwlist[] = {"data", "inlined", "revlogv2", NULL};
Augie Fackler
revlog: give formatting to clang-format...
r40595 /* Initialize before argument-checking to avoid index_dealloc() crash.
*/
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 self->added = NULL;
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 self->new_length = 0;
self->added_length = 0;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 self->data = NULL;
memset(&self->buf, 0, sizeof(self->buf));
self->headrevs = NULL;
self->filteredrevs = Py_None;
Py_INCREF(Py_None);
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 self->ntinitialized = 0;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 self->offsets = NULL;
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 self->nodelen = 20;
self->nullentry = NULL;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Raphaël Gomès
cext: add support for revlogv2...
r47442 revlogv2 = NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|O", kwlist,
&data_obj, &inlined_obj, &revlogv2))
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -1;
if (!PyObject_CheckBuffer(data_obj)) {
PyErr_SetString(PyExc_TypeError,
Augie Fackler
revlog: give formatting to clang-format...
r40595 "data does not support buffer interface");
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return -1;
}
Joerg Sonnenberger
cext: shut-up sign compare warnings...
r46760 if (self->nodelen < 20 || self->nodelen > (Py_ssize_t)sizeof(nullid)) {
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 PyErr_SetString(PyExc_RuntimeError, "unsupported node size");
return -1;
}
Raphaël Gomès
cext: add support for revlogv2...
r47442 if (revlogv2 && PyObject_IsTrue(revlogv2)) {
revlog: introduce an explicit `format_version` member in the index struct...
r47912 self->format_version = format_v2;
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 self->entry_size = v2_entry_size;
Raphaël Gomès
cext: add support for revlogv2...
r47442 } else {
revlog: introduce an explicit `format_version` member in the index struct...
r47912 self->format_version = format_v1;
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 self->entry_size = v1_entry_size;
Raphaël Gomès
cext: add support for revlogv2...
r47442 }
revlog: add a "data compression mode" entry in the index tuple...
r48023 self->nullentry = Py_BuildValue(PY23("iiiiiiis#iiB", "iiiiiiiy#iiB"), 0,
0, 0, -1, -1, -1, -1, nullid,
self->nodelen, 0, 0, comp_mode_inline);
Raphaël Gomès
cext: add support for revlogv2...
r47442
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 if (!self->nullentry)
return -1;
PyObject_GC_UnTrack(self->nullentry);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
if (PyObject_GetBuffer(data_obj, &self->buf, PyBUF_SIMPLE) == -1)
return -1;
size = self->buf.len;
self->inlined = inlined_obj && PyObject_IsTrue(inlined_obj);
self->data = data_obj;
self->ntlookups = self->ntmisses = 0;
self->ntrev = -1;
Py_INCREF(self->data);
if (self->inlined) {
Py_ssize_t len = inline_scan(self, NULL);
if (len == -1)
goto bail;
Martin von Zweigbergk
index: don't include nullid in the internal "length" field...
r39103 self->length = len;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 } else {
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 if (size % self->entry_size) {
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 PyErr_SetString(PyExc_ValueError, "corrupt index file");
goto bail;
}
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 self->length = size / self->entry_size;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }
return 0;
bail:
return -1;
}
static PyObject *index_nodemap(indexObject *self)
{
Py_INCREF(self);
return (PyObject *)self;
}
Martin von Zweigbergk
index: move index_clearcaches() further down...
r38979 static void _index_clearcaches(indexObject *self)
{
if (self->offsets) {
Matt Harbison
cext: fix a warning about differing const qualifiers on Windows...
r39110 PyMem_Free((void *)self->offsets);
Martin von Zweigbergk
index: move index_clearcaches() further down...
r38979 self->offsets = NULL;
}
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 if (self->ntinitialized) {
nt_dealloc(&self->nt);
Martin von Zweigbergk
index: move index_clearcaches() further down...
r38979 }
Martin von Zweigbergk
index: embed nodetree in index object to avoid reference cycle...
r39327 self->ntinitialized = 0;
Martin von Zweigbergk
index: move index_clearcaches() further down...
r38979 Py_CLEAR(self->headrevs);
}
static PyObject *index_clearcaches(indexObject *self)
{
_index_clearcaches(self);
self->ntrev = -1;
self->ntlookups = self->ntmisses = 0;
Py_RETURN_NONE;
}
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 static void index_dealloc(indexObject *self)
{
_index_clearcaches(self);
Py_XDECREF(self->filteredrevs);
if (self->buf.buf) {
PyBuffer_Release(&self->buf);
memset(&self->buf, 0, sizeof(self->buf));
}
Py_XDECREF(self->data);
Joerg Sonnenberger
revlog: store new index entries as binary...
r46548 PyMem_Free(self->added);
Joerg Sonnenberger
cext: isolate hash size in the revlog handling in a single place...
r46757 Py_XDECREF(self->nullentry);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 PyObject_Del(self);
}
static PySequenceMethods index_sequence_methods = {
Augie Fackler
revlog: give formatting to clang-format...
r40595 (lenfunc)index_length, /* sq_length */
0, /* sq_concat */
0, /* sq_repeat */
(ssizeargfunc)index_get, /* sq_item */
0, /* sq_slice */
0, /* sq_ass_item */
0, /* sq_ass_slice */
(objobjproc)index_contains, /* sq_contains */
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 };
static PyMappingMethods index_mapping_methods = {
Augie Fackler
revlog: give formatting to clang-format...
r40595 (lenfunc)index_length, /* mp_length */
(binaryfunc)index_getitem, /* mp_subscript */
(objobjargproc)index_assign_subscript, /* mp_ass_subscript */
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 };
static PyMethodDef index_methods[] = {
Augie Fackler
revlog: give formatting to clang-format...
r40595 {"ancestors", (PyCFunction)index_ancestors, METH_VARARGS,
"return the gca set of the given revs"},
{"commonancestorsheads", (PyCFunction)index_commonancestorsheads,
METH_VARARGS,
"return the heads of the common ancestors of the given revs"},
{"clearcaches", (PyCFunction)index_clearcaches, METH_NOARGS,
"clear the index caches"},
{"get", (PyCFunction)index_m_get, METH_VARARGS, "get an index entry"},
index: add a `get_rev` method (API)...
r43954 {"get_rev", (PyCFunction)index_m_get, METH_VARARGS,
"return `rev` associated with a node or None"},
index: add a `has_node` method (API)...
r43934 {"has_node", (PyCFunction)index_m_has_node, METH_O,
"return True if the node exist in the index"},
index: add a `rev` method (API)...
r43952 {"rev", (PyCFunction)index_m_rev, METH_O,
"return `rev` associated with a node or raise RevlogError"},
Augie Fackler
revlog: give formatting to clang-format...
r40595 {"computephasesmapsets", (PyCFunction)compute_phases_map_sets, METH_VARARGS,
"compute phases"},
{"reachableroots2", (PyCFunction)reachableroots2, METH_VARARGS,
"reachableroots"},
Raphaël Gomès
revlog-index: add `replace_sidedata_info` method...
r47451 {"replace_sidedata_info", (PyCFunction)index_replace_sidedata_info,
METH_VARARGS, "replace an existing index entry with a new value"},
Augie Fackler
revlog: give formatting to clang-format...
r40595 {"headrevs", (PyCFunction)index_headrevs, METH_VARARGS,
"get head revisions"}, /* Can do filtering since 3.2 */
{"headrevsfiltered", (PyCFunction)index_headrevs, METH_VARARGS,
"get filtered head revisions"}, /* Can always do filtering */
Boris Feld
revlog: use the native implementation of issnapshot...
r41118 {"issnapshot", (PyCFunction)index_issnapshot, METH_O,
"True if the object is a snapshot"},
Boris Feld
delta: have a native implementation of _findsnapshot...
r41141 {"findsnapshots", (PyCFunction)index_findsnapshots, METH_VARARGS,
"Gather snapshot data in a cache dict"},
Augie Fackler
revlog: give formatting to clang-format...
r40595 {"deltachain", (PyCFunction)index_deltachain, METH_VARARGS,
"determine revisions with deltas to reconstruct fulltext"},
Boris Feld
sparse-revlog: introduce native (C) implementation of slicechunktodensity...
r40743 {"slicechunktodensity", (PyCFunction)index_slicechunktodensity,
METH_VARARGS, "determine revisions with deltas to reconstruct fulltext"},
Augie Fackler
revlog: give formatting to clang-format...
r40595 {"append", (PyCFunction)index_append, METH_O, "append an index entry"},
{"partialmatch", (PyCFunction)index_partialmatch, METH_VARARGS,
"match a potentially ambiguous node ID"},
{"shortest", (PyCFunction)index_shortest, METH_VARARGS,
"find length of shortest hex nodeid of a binary ID"},
{"stats", (PyCFunction)index_stats, METH_NOARGS, "stats for the index"},
revlog: have an explicit "pack_header" method...
r47811 {"entry_binary", (PyCFunction)index_entry_binary, METH_O,
revlog: add a `entry_binary` method on index...
r47808 "return an entry in binary form"},
revlog: have an explicit "pack_header" method...
r47811 {"pack_header", (PyCFunction)index_pack_header, METH_VARARGS,
"pack the revlog header information into binary"},
Augie Fackler
revlog: give formatting to clang-format...
r40595 {NULL} /* Sentinel */
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 };
static PyGetSetDef index_getset[] = {
Augie Fackler
revlog: give formatting to clang-format...
r40595 {"nodemap", (getter)index_nodemap, NULL, "nodemap", NULL},
{NULL} /* Sentinel */
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 };
revlog: replace revlog._io.size with a new revlog.index.entry_size...
r47736 static PyMemberDef index_members[] = {
revlog: rename `hdrsize` to `entry_size` in the C code...
r47911 {"entry_size", T_LONG, offsetof(indexObject, entry_size), 0,
revlog: replace revlog._io.size with a new revlog.index.entry_size...
r47736 "size of an index entry"},
{NULL} /* Sentinel */
};
Yuya Nishihara
revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol...
r40895 PyTypeObject HgRevlogIndex_Type = {
Augie Fackler
revlog: give formatting to clang-format...
r40595 PyVarObject_HEAD_INIT(NULL, 0) /* header */
"parsers.index", /* tp_name */
sizeof(indexObject), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)index_dealloc, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_compare */
0, /* tp_repr */
0, /* tp_as_number */
&index_sequence_methods, /* tp_as_sequence */
&index_mapping_methods, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
"revlog index", /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
index_methods, /* tp_methods */
revlog: replace revlog._io.size with a new revlog.index.entry_size...
r47736 index_members, /* tp_members */
Augie Fackler
revlog: give formatting to clang-format...
r40595 index_getset, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
(initproc)index_init, /* tp_init */
0, /* tp_alloc */
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 };
/*
Raphaël Gomès
cext: add support for revlogv2...
r47442 * returns a tuple of the form (index, cache) with elements as
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 * follows:
*
Raphaël Gomès
cext: add support for revlogv2...
r47442 * index: an index object that lazily parses Revlog (v1 or v2) records
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 * cache: if data is inlined, a tuple (0, index_file_content), else None
* index_file_content could be a string, or a buffer
*
* added complications are for backwards compatibility
*/
Raphaël Gomès
cext: add support for revlogv2...
r47442 PyObject *parse_index2(PyObject *self, PyObject *args, PyObject *kwargs)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 {
Yuya Nishihara
revlog: fix excessive decref on tuple creation failure in parse_index2()...
r45733 PyObject *cache = NULL;
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 indexObject *idx;
int ret;
Yuya Nishihara
revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol...
r40895 idx = PyObject_New(indexObject, &HgRevlogIndex_Type);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (idx == NULL)
goto bail;
Raphaël Gomès
cext: add support for revlogv2...
r47442 ret = index_init(idx, args, kwargs);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 if (ret == -1)
goto bail;
if (idx->inlined) {
cache = Py_BuildValue("iO", 0, idx->data);
if (cache == NULL)
goto bail;
} else {
cache = Py_None;
Py_INCREF(cache);
}
Yuya Nishihara
revlog: fix excessive decref on tuple creation failure in parse_index2()...
r45733 return Py_BuildValue("NN", idx, cache);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
bail:
Py_XDECREF(idx);
Py_XDECREF(cache);
return NULL;
}
Georges Racinet
revlog: made C Capsule an array of function pointers...
r44411 static Revlog_CAPI CAPI = {
Georges Racinet
revlog-native: introduced ABI version in capsule...
r44523 /* increment the abi_version field upon each change in the Revlog_CAPI
struct or in the ABI of the listed functions */
Georges Racinet
revlog: using two new functions in C capsule from Rust code...
r44989 2,
index_length,
index_node,
Georges Racinet
revlog: made C Capsule an array of function pointers...
r44411 HgRevlogIndex_GetParents,
};
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 void revlog_module_init(PyObject *mod)
{
Georges Racinet
rust-cpython: implement Graph using C parents function...
r41082 PyObject *caps = NULL;
Yuya Nishihara
revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol...
r40895 HgRevlogIndex_Type.tp_new = PyType_GenericNew;
if (PyType_Ready(&HgRevlogIndex_Type) < 0)
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 return;
Yuya Nishihara
revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol...
r40895 Py_INCREF(&HgRevlogIndex_Type);
PyModule_AddObject(mod, "index", (PyObject *)&HgRevlogIndex_Type);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378
Martin von Zweigbergk
index: make node tree a Python object...
r39252 nodetreeType.tp_new = PyType_GenericNew;
if (PyType_Ready(&nodetreeType) < 0)
return;
Py_INCREF(&nodetreeType);
PyModule_AddObject(mod, "nodetree", (PyObject *)&nodetreeType);
Georges Racinet
revlog: made C Capsule an array of function pointers...
r44411 caps = PyCapsule_New(&CAPI, "mercurial.cext.parsers.revlog_CAPI", NULL);
Georges Racinet
rust-cpython: implement Graph using C parents function...
r41082 if (caps != NULL)
Georges Racinet
revlog: made C Capsule an array of function pointers...
r44411 PyModule_AddObject(mod, "revlog_CAPI", caps);
Gregory Szorc
cext: extract revlog/index parsing code to own C file...
r32378 }