mercurial: mercurial/cext/parsers.c@be9bf75a837c (annotated)

6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1	/*
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2	parsers.c - efficient content parsing
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	3
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Raphaël Gomès <rgomes@octobus.net> parents: 46708 diff changeset	4	Copyright 2008 Olivia Mackall <olivia@selenic.com> and others
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	5
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	6	This software may be used and distributed according to the terms of
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	7	the GNU General Public License, incorporated herein by reference.
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	8	*/
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	9
42068 896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	10	#define PY_SSIZE_T_CLEAN
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	11	#include <Python.h>
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	12	#include <ctype.h>
17356 511dfb34b412 parsers: fix an integer size warning issued by clang Bryan O'Sullivan <bryano@fb.com> parents: 17353 diff changeset	13	#include <stddef.h>
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	14	#include <string.h>
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	15
34438 b90e8da190da cext: reorder #include Gregory Szorc <gregory.szorc@gmail.com> parents: 33926 diff changeset	16	#include "bitmanipulation.h"
33758 0f4ac3b6dee4 cext: factor out header for charencode.c Yuya Nishihara <yuya@tcha.org> parents: 33757 diff changeset	17	#include "charencode.h"
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	18	#include "util.h"
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	19
32386 7640584e697c cext: mark constant variables Yuya Nishihara <yuya@tcha.org> parents: 32384 diff changeset	20	static const char *const versionerrortext = "Python minor version mismatch";
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	21
47514 559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	22	static const int dirstate_v1_from_p2 = -2;
47516 b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	23	static const int dirstate_v1_nonnormal = -1;
47666 e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	24	static const int ambiguous_time = -1;
47514 559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	25
25584 72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	26	static PyObject dict_new_presized(PyObject self, PyObject *args)
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	27	{
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	28	Py_ssize_t expected_size;
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	29
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	30	if (!PyArg_ParseTuple(args, "n:make_presized_dict", &expected_size)) {
25584 72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	31	return NULL;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	32	}
25584 72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	33
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	34	return _dict_new_presized(expected_size);
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	35	}
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	36
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	37	static PyObject dirstate_item_new(PyTypeObject subtype, PyObject *args,
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	38	PyObject *kwds)
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	39	{
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	40	/* We do all the initialization here and not a tp_init function because
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	41	* dirstate_item is immutable. */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	42	dirstateItemObject *t;
47895 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	43	int wc_tracked;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	44	int p1_tracked;
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	45	int p2_info;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	46	int has_meaningful_data;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	47	int has_meaningful_mtime;
48398 111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	48	int mtime_second_ambiguous;
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	49	int mode;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	50	int size;
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	51	int mtime_s;
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	52	int mtime_ns;
47895 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	53	PyObject *parentfiledata;
48378 3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	54	PyObject *mtime;
48253 948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	55	PyObject *fallback_exec;
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	56	PyObject *fallback_symlink;
47895 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	57	static char *keywords_name[] = {
48253 948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	58	"wc_tracked", "p1_tracked", "p2_info",
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	59	"has_meaningful_data", "has_meaningful_mtime", "parentfiledata",
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	60	"fallback_exec", "fallback_symlink", NULL,
47895 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	61	};
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	62	wc_tracked = 0;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	63	p1_tracked = 0;
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	64	p2_info = 0;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	65	has_meaningful_mtime = 1;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	66	has_meaningful_data = 1;
48398 111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	67	mtime_second_ambiguous = 0;
47895 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	68	parentfiledata = Py_None;
48253 948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	69	fallback_exec = Py_None;
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	70	fallback_symlink = Py_None;
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	71	if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|iiiiiOOO", keywords_name,
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	72	&wc_tracked, &p1_tracked, &p2_info,
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	73	&has_meaningful_data,
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	74	&has_meaningful_mtime, &parentfiledata,
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	75	&fallback_exec, &fallback_symlink)) {
47895 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	76	return NULL;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	77	}
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	78	t = (dirstateItemObject *)subtype->tp_alloc(subtype, 1);
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	79	if (!t) {
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	80	return NULL;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	81	}
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	82
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	83	t->flags = 0;
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	84	if (wc_tracked) {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	85	t->flags \|= dirstate_flag_wc_tracked;
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	86	}
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	87	if (p1_tracked) {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	88	t->flags \|= dirstate_flag_p1_tracked;
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	89	}
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	90	if (p2_info) {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	91	t->flags \|= dirstate_flag_p2_info;
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	92	}
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	93
48253 948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	94	if (fallback_exec != Py_None) {
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	95	t->flags \|= dirstate_flag_has_fallback_exec;
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	96	if (PyObject_IsTrue(fallback_exec)) {
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	97	t->flags \|= dirstate_flag_fallback_exec;
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	98	}
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	99	}
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	100	if (fallback_symlink != Py_None) {
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	101	t->flags \|= dirstate_flag_has_fallback_symlink;
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	102	if (PyObject_IsTrue(fallback_symlink)) {
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	103	t->flags \|= dirstate_flag_fallback_symlink;
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	104	}
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	105	}
948570aa7630 dirstate: make DirstateItem constructor accept fallback value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48252 diff changeset	106
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	107	if (parentfiledata != Py_None) {
48378 3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	108	if (!PyArg_ParseTuple(parentfiledata, "iiO", &mode, &size,
3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	109	&mtime)) {
47895 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	110	return NULL;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	111	}
48378 3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	112	if (mtime != Py_None) {
48398 111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	113	if (!PyArg_ParseTuple(mtime, "iii", &mtime_s, &mtime_ns,
111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	114	&mtime_second_ambiguous)) {
48378 3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	115	return NULL;
3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	116	}
3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	117	} else {
3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	118	has_meaningful_mtime = 0;
3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	119	}
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	120	} else {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	121	has_meaningful_data = 0;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	122	has_meaningful_mtime = 0;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	123	}
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	124	if (has_meaningful_data) {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	125	t->flags \|= dirstate_flag_has_meaningful_data;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	126	t->mode = mode;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	127	t->size = size;
48398 111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	128	if (mtime_second_ambiguous) {
111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	129	t->flags \|= dirstate_flag_mtime_second_ambiguous;
111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	130	}
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	131	} else {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	132	t->mode = 0;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	133	t->size = 0;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	134	}
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	135	if (has_meaningful_mtime) {
48264 bb240915f69f dirstate-v2: adjust the meaning of directory flags Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48262 diff changeset	136	t->flags \|= dirstate_flag_has_mtime;
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	137	t->mtime_s = mtime_s;
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	138	t->mtime_ns = mtime_ns;
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	139	} else {
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	140	t->mtime_s = 0;
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	141	t->mtime_ns = 0;
47895 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	142	}
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	143	return (PyObject *)t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	144	}
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	145
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	146	static void dirstate_item_dealloc(PyObject *o)
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	147	{
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	148	PyObject_Del(o);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	149	}
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	150
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	151	static inline bool dirstate_item_c_tracked(dirstateItemObject *self)
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	152	{
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	153	return (self->flags & dirstate_flag_wc_tracked);
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	154	}
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	155
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	156	static inline bool dirstate_item_c_any_tracked(dirstateItemObject *self)
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	157	{
48250 1730b2fceaa1 dirstate-v2: adds a flag to mark a file as modified Simon Sapin <simon.sapin@octobus.net> parents: 48232 diff changeset	158	const int mask = dirstate_flag_wc_tracked \| dirstate_flag_p1_tracked \|
1730b2fceaa1 dirstate-v2: adds a flag to mark a file as modified Simon Sapin <simon.sapin@octobus.net> parents: 48232 diff changeset	159	dirstate_flag_p2_info;
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	160	return (self->flags & mask);
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	161	}
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	162
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	163	static inline bool dirstate_item_c_added(dirstateItemObject *self)
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	164	{
48250 1730b2fceaa1 dirstate-v2: adds a flag to mark a file as modified Simon Sapin <simon.sapin@octobus.net> parents: 48232 diff changeset	165	const int mask = (dirstate_flag_wc_tracked \| dirstate_flag_p1_tracked \|
1730b2fceaa1 dirstate-v2: adds a flag to mark a file as modified Simon Sapin <simon.sapin@octobus.net> parents: 48232 diff changeset	166	dirstate_flag_p2_info);
1730b2fceaa1 dirstate-v2: adds a flag to mark a file as modified Simon Sapin <simon.sapin@octobus.net> parents: 48232 diff changeset	167	const int target = dirstate_flag_wc_tracked;
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	168	return (self->flags & mask) == target;
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	169	}
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	170
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	171	static inline bool dirstate_item_c_removed(dirstateItemObject *self)
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	172	{
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	173	if (self->flags & dirstate_flag_wc_tracked) {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	174	return false;
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	175	}
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	176	return (self->flags &
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	177	(dirstate_flag_p1_tracked \| dirstate_flag_p2_info));
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	178	}
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	179
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	180	static inline bool dirstate_item_c_merged(dirstateItemObject *self)
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	181	{
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	182	return ((self->flags & dirstate_flag_wc_tracked) &&
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	183	(self->flags & dirstate_flag_p1_tracked) &&
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	184	(self->flags & dirstate_flag_p2_info));
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	185	}
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	186
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	187	static inline bool dirstate_item_c_from_p2(dirstateItemObject *self)
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	188	{
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	189	return ((self->flags & dirstate_flag_wc_tracked) &&
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	190	!(self->flags & dirstate_flag_p1_tracked) &&
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	191	(self->flags & dirstate_flag_p2_info));
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	192	}
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	193
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	194	static inline char dirstate_item_c_v1_state(dirstateItemObject *self)
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	195	{
48025 631f6b445a77 dirstate: Remove the `state == ' '` special case Simon Sapin <simon.sapin@octobus.net> parents: 47990 diff changeset	196	if (dirstate_item_c_removed(self)) {
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	197	return 'r';
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	198	} else if (dirstate_item_c_merged(self)) {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	199	return 'm';
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	200	} else if (dirstate_item_c_added(self)) {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	201	return 'a';
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	202	} else {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	203	return 'n';
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	204	}
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	205	}
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	206
48252 602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	207	static inline bool dirstate_item_c_has_fallback_exec(dirstateItemObject *self)
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	208	{
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	209	return (bool)self->flags & dirstate_flag_has_fallback_exec;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	210	}
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	211
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	212	static inline bool
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	213	dirstate_item_c_has_fallback_symlink(dirstateItemObject *self)
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	214	{
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	215	return (bool)self->flags & dirstate_flag_has_fallback_symlink;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	216	}
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	217
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	218	static inline int dirstate_item_c_v1_mode(dirstateItemObject *self)
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	219	{
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	220	if (self->flags & dirstate_flag_has_meaningful_data) {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	221	return self->mode;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	222	} else {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	223	return 0;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	224	}
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	225	}
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	226
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	227	static inline int dirstate_item_c_v1_size(dirstateItemObject *self)
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	228	{
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	229	if (!(self->flags & dirstate_flag_wc_tracked) &&
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	230	(self->flags & dirstate_flag_p2_info)) {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	231	if (self->flags & dirstate_flag_p1_tracked) {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	232	return dirstate_v1_nonnormal;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	233	} else {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	234	return dirstate_v1_from_p2;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	235	}
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	236	} else if (dirstate_item_c_removed(self)) {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	237	return 0;
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	238	} else if (self->flags & dirstate_flag_p2_info) {
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	239	return dirstate_v1_from_p2;
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	240	} else if (dirstate_item_c_added(self)) {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	241	return dirstate_v1_nonnormal;
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	242	} else if (self->flags & dirstate_flag_has_meaningful_data) {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	243	return self->size;
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	244	} else {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	245	return dirstate_v1_nonnormal;
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	246	}
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	247	}
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	248
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	249	static inline int dirstate_item_c_v1_mtime(dirstateItemObject *self)
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	250	{
48025 631f6b445a77 dirstate: Remove the `state == ' '` special case Simon Sapin <simon.sapin@octobus.net> parents: 47990 diff changeset	251	if (dirstate_item_c_removed(self)) {
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	252	return 0;
48264 bb240915f69f dirstate-v2: adjust the meaning of directory flags Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48262 diff changeset	253	} else if (!(self->flags & dirstate_flag_has_mtime) \|\|
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	254	!(self->flags & dirstate_flag_p1_tracked) \|\|
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	255	!(self->flags & dirstate_flag_wc_tracked) \|\|
48400 0b3f3a3ca50a dirstate-item: ignore mtime to write v1 when `mtime-second-ambiguous` is set Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48399 diff changeset	256	(self->flags & dirstate_flag_p2_info) \|\|
0b3f3a3ca50a dirstate-item: ignore mtime to write v1 when `mtime-second-ambiguous` is set Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48399 diff changeset	257	(self->flags & dirstate_flag_mtime_second_ambiguous)) {
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	258	return ambiguous_time;
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	259	} else {
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	260	return self->mtime_s;
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	261	}
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	262	}
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	263
48222 7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	264	static PyObject dirstate_item_v2_data(dirstateItemObject self)
7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	265	{
48250 1730b2fceaa1 dirstate-v2: adds a flag to mark a file as modified Simon Sapin <simon.sapin@octobus.net> parents: 48232 diff changeset	266	int flags = self->flags;
48222 7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	267	int mode = dirstate_item_c_v1_mode(self);
48279 249d1888e9d8 parsers: don't ask about the exec bit on platforms that don't have it Raphaël Gomès <rgomes@octobus.net> parents: 48264 diff changeset	268	#ifdef S_IXUSR
249d1888e9d8 parsers: don't ask about the exec bit on platforms that don't have it Raphaël Gomès <rgomes@octobus.net> parents: 48264 diff changeset	269	/* This is for platforms with an exec bit */
48222 7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	270	if ((mode & S_IXUSR) != 0) {
7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	271	flags \|= dirstate_flag_mode_exec_perm;
7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	272	} else {
7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	273	flags &= ~dirstate_flag_mode_exec_perm;
7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	274	}
48279 249d1888e9d8 parsers: don't ask about the exec bit on platforms that don't have it Raphaël Gomès <rgomes@octobus.net> parents: 48264 diff changeset	275	#else
249d1888e9d8 parsers: don't ask about the exec bit on platforms that don't have it Raphaël Gomès <rgomes@octobus.net> parents: 48264 diff changeset	276	flags &= ~dirstate_flag_mode_exec_perm;
249d1888e9d8 parsers: don't ask about the exec bit on platforms that don't have it Raphaël Gomès <rgomes@octobus.net> parents: 48264 diff changeset	277	#endif
48280 126feb805247 parsers: don't ask about symlinks on platforms that don't support them Raphaël Gomès <rgomes@octobus.net> parents: 48279 diff changeset	278	#ifdef S_ISLNK
126feb805247 parsers: don't ask about symlinks on platforms that don't support them Raphaël Gomès <rgomes@octobus.net> parents: 48279 diff changeset	279	/* This is for platforms with support for symlinks */
48222 7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	280	if (S_ISLNK(mode)) {
7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	281	flags \|= dirstate_flag_mode_is_symlink;
7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	282	} else {
7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	283	flags &= ~dirstate_flag_mode_is_symlink;
7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	284	}
48280 126feb805247 parsers: don't ask about symlinks on platforms that don't support them Raphaël Gomès <rgomes@octobus.net> parents: 48279 diff changeset	285	#else
126feb805247 parsers: don't ask about symlinks on platforms that don't support them Raphaël Gomès <rgomes@octobus.net> parents: 48279 diff changeset	286	flags &= ~dirstate_flag_mode_is_symlink;
126feb805247 parsers: don't ask about symlinks on platforms that don't support them Raphaël Gomès <rgomes@octobus.net> parents: 48279 diff changeset	287	#endif
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	288	return Py_BuildValue("iiii", flags, self->size, self->mtime_s,
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	289	self->mtime_ns);
48222 7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	290	};
7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	291
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	292	static PyObject dirstate_item_mtime_likely_equal_to(dirstateItemObject self,
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	293	PyObject *other)
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	294	{
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	295	int other_s;
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	296	int other_ns;
48398 111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	297	int other_second_ambiguous;
111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	298	if (!PyArg_ParseTuple(other, "iii", &other_s, &other_ns,
111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	299	&other_second_ambiguous)) {
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	300	return NULL;
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	301	}
48399 af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	302	if (!(self->flags & dirstate_flag_has_mtime)) {
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	303	Py_RETURN_FALSE;
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	304	}
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	305	if (self->mtime_s != other_s) {
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	306	Py_RETURN_FALSE;
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	307	}
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	308	if (self->mtime_ns == 0 \|\| other_ns == 0) {
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	309	if (self->flags & dirstate_flag_mtime_second_ambiguous) {
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	310	Py_RETURN_FALSE;
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	311	} else {
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	312	Py_RETURN_TRUE;
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	313	}
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	314	}
af303ae33cd7 dirstate-item: implement the comparison logic for mtime-second-ambiguous Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48398 diff changeset	315	if (self->mtime_ns == other_ns) {
47532 ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	316	Py_RETURN_TRUE;
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	317	} else {
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	318	Py_RETURN_FALSE;
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	319	}
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	320	};
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	321
47945 3337eec29d5b dirstate-item: `dirstate_item_from_v1_data` replaces make_dirstate_item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47925 diff changeset	322	/* This will never change since it's bound to V1
47665 a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	323	*/
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	324	static inline dirstateItemObject *
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	325	dirstate_item_from_v1_data(char state, int mode, int size, int mtime)
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	326	{
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	327	dirstateItemObject *t =
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	328	PyObject_New(dirstateItemObject, &dirstateItemType);
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	329	if (!t) {
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	330	return NULL;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	331	}
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	332	t->flags = 0;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	333	t->mode = 0;
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	334	t->size = 0;
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	335	t->mtime_s = 0;
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	336	t->mtime_ns = 0;
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	337
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	338	if (state == 'm') {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	339	t->flags = (dirstate_flag_wc_tracked \|
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	340	dirstate_flag_p1_tracked \| dirstate_flag_p2_info);
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	341	} else if (state == 'a') {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	342	t->flags = dirstate_flag_wc_tracked;
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	343	} else if (state == 'r') {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	344	if (size == dirstate_v1_nonnormal) {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	345	t->flags =
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	346	dirstate_flag_p1_tracked \| dirstate_flag_p2_info;
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	347	} else if (size == dirstate_v1_from_p2) {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	348	t->flags = dirstate_flag_p2_info;
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	349	} else {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	350	t->flags = dirstate_flag_p1_tracked;
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	351	}
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	352	} else if (state == 'n') {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	353	if (size == dirstate_v1_from_p2) {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	354	t->flags =
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	355	dirstate_flag_wc_tracked \| dirstate_flag_p2_info;
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	356	} else if (size == dirstate_v1_nonnormal) {
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	357	t->flags =
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	358	dirstate_flag_wc_tracked \| dirstate_flag_p1_tracked;
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	359	} else if (mtime == ambiguous_time) {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	360	t->flags = (dirstate_flag_wc_tracked \|
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	361	dirstate_flag_p1_tracked \|
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	362	dirstate_flag_has_meaningful_data);
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	363	t->mode = mode;
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	364	t->size = size;
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	365	} else {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	366	t->flags = (dirstate_flag_wc_tracked \|
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	367	dirstate_flag_p1_tracked \|
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	368	dirstate_flag_has_meaningful_data \|
48264 bb240915f69f dirstate-v2: adjust the meaning of directory flags Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48262 diff changeset	369	dirstate_flag_has_mtime);
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	370	t->mode = mode;
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	371	t->size = size;
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	372	t->mtime_s = mtime;
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	373	}
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	374	} else {
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	375	PyErr_Format(PyExc_RuntimeError,
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	376	"unknown state: `%c` (%d, %d, %d)", state, mode,
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	377	size, mtime, NULL);
48028 448aff4e8dd4 dirstate: fix leak of entry object in dirstate_item_from_v1_data() Yuya Nishihara <yuya@tcha.org> parents: 48027 diff changeset	378	Py_DECREF(t);
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	379	return NULL;
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	380	}
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	381
47665 a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	382	return t;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	383	}
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	384
48221 a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	385	static PyObject dirstate_item_from_v2_meth(PyTypeObject subtype,
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	386	PyObject *args)
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	387	{
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	388	dirstateItemObject *t =
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	389	PyObject_New(dirstateItemObject, &dirstateItemType);
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	390	if (!t) {
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	391	return NULL;
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	392	}
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	393	if (!PyArg_ParseTuple(args, "iiii", &t->flags, &t->size, &t->mtime_s,
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	394	&t->mtime_ns)) {
48221 a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	395	return NULL;
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	396	}
48250 1730b2fceaa1 dirstate-v2: adds a flag to mark a file as modified Simon Sapin <simon.sapin@octobus.net> parents: 48232 diff changeset	397	if (t->flags & dirstate_flag_expected_state_is_modified) {
1730b2fceaa1 dirstate-v2: adds a flag to mark a file as modified Simon Sapin <simon.sapin@octobus.net> parents: 48232 diff changeset	398	t->flags &= ~(dirstate_flag_expected_state_is_modified \|
1730b2fceaa1 dirstate-v2: adds a flag to mark a file as modified Simon Sapin <simon.sapin@octobus.net> parents: 48232 diff changeset	399	dirstate_flag_has_meaningful_data \|
48264 bb240915f69f dirstate-v2: adjust the meaning of directory flags Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48262 diff changeset	400	dirstate_flag_has_mtime);
48250 1730b2fceaa1 dirstate-v2: adds a flag to mark a file as modified Simon Sapin <simon.sapin@octobus.net> parents: 48232 diff changeset	401	}
48221 a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	402	t->mode = 0;
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	403	if (t->flags & dirstate_flag_has_meaningful_data) {
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	404	if (t->flags & dirstate_flag_mode_exec_perm) {
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	405	t->mode = 0755;
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	406	} else {
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	407	t->mode = 0644;
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	408	}
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	409	if (t->flags & dirstate_flag_mode_is_symlink) {
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	410	t->mode \|= S_IFLNK;
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	411	} else {
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	412	t->mode \|= S_IFREG;
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	413	}
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	414	}
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	415	return (PyObject *)t;
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	416	};
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	417
47666 e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	418	/* This means the next status call will have to actually check its content
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	419	to make sure it is correct. */
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	420	static PyObject dirstate_item_set_possibly_dirty(dirstateItemObject self)
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	421	{
48264 bb240915f69f dirstate-v2: adjust the meaning of directory flags Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48262 diff changeset	422	self->flags &= ~dirstate_flag_has_mtime;
47976 2018753014be dirstate: fix compilation warnings in `dirstate_item_set_possibly_dirty()` Martin von Zweigbergk <martinvonz@google.com> parents: 47975 diff changeset	423	Py_RETURN_NONE;
47666 e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	424	}
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	425
47974 4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	426	/* See docstring of the python implementation for details */
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	427	static PyObject dirstate_item_set_clean(dirstateItemObject self,
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	428	PyObject *args)
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	429	{
48398 111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	430	int size, mode, mtime_s, mtime_ns, mtime_second_ambiguous;
48378 3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	431	PyObject *mtime;
3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	432	mtime_s = 0;
3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	433	mtime_ns = 0;
48398 111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	434	mtime_second_ambiguous = 0;
48378 3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	435	if (!PyArg_ParseTuple(args, "iiO", &mode, &size, &mtime)) {
47974 4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	436	return NULL;
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	437	}
48378 3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	438	if (mtime != Py_None) {
48398 111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	439	if (!PyArg_ParseTuple(mtime, "iii", &mtime_s, &mtime_ns,
111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	440	&mtime_second_ambiguous)) {
48378 3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	441	return NULL;
3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	442	}
3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	443	} else {
3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	444	self->flags &= ~dirstate_flag_has_mtime;
3d6eb119200d dirstate-item: allow mtime to be None in "parentdata" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48327 diff changeset	445	}
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	446	self->flags = dirstate_flag_wc_tracked \| dirstate_flag_p1_tracked \|
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	447	dirstate_flag_has_meaningful_data \|
48264 bb240915f69f dirstate-v2: adjust the meaning of directory flags Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48262 diff changeset	448	dirstate_flag_has_mtime;
48398 111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	449	if (mtime_second_ambiguous) {
111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	450	self->flags \|= dirstate_flag_mtime_second_ambiguous;
111098af6356 dirstate-item: add a "second_ambiguous` flag in the mtime tuple Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48392 diff changeset	451	}
47974 4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	452	self->mode = mode;
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	453	self->size = size;
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	454	self->mtime_s = mtime_s;
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	455	self->mtime_ns = mtime_ns;
47974 4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	456	Py_RETURN_NONE;
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	457	}
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	458
47990 0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47976 diff changeset	459	static PyObject dirstate_item_set_tracked(dirstateItemObject self)
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47976 diff changeset	460	{
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47976 diff changeset	461	self->flags \|= dirstate_flag_wc_tracked;
48264 bb240915f69f dirstate-v2: adjust the meaning of directory flags Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48262 diff changeset	462	self->flags &= ~dirstate_flag_has_mtime;
47990 0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47976 diff changeset	463	Py_RETURN_NONE;
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47976 diff changeset	464	}
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47976 diff changeset	465
47890 3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	466	static PyObject dirstate_item_set_untracked(dirstateItemObject self)
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	467	{
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	468	self->flags &= ~dirstate_flag_wc_tracked;
48987 9bb700223f00 dirstate-cext: properly invalidate mtime and data in `set_untracked` Raphaël Gomès <rgomes@octobus.net> parents: 48402 diff changeset	469	self->flags &= ~dirstate_flag_has_meaningful_data;
9bb700223f00 dirstate-cext: properly invalidate mtime and data in `set_untracked` Raphaël Gomès <rgomes@octobus.net> parents: 48402 diff changeset	470	self->flags &= ~dirstate_flag_has_mtime;
47890 3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	471	self->mode = 0;
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	472	self->size = 0;
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	473	self->mtime_s = 0;
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	474	self->mtime_ns = 0;
47890 3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	475	Py_RETURN_NONE;
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	476	}
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	477
48060 a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48044 diff changeset	478	static PyObject dirstate_item_drop_merge_data(dirstateItemObject self)
a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48044 diff changeset	479	{
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	480	if (self->flags & dirstate_flag_p2_info) {
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	481	self->flags &= ~(dirstate_flag_p2_info \|
38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	482	dirstate_flag_has_meaningful_data \|
48264 bb240915f69f dirstate-v2: adjust the meaning of directory flags Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48262 diff changeset	483	dirstate_flag_has_mtime);
48060 a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48044 diff changeset	484	self->mode = 0;
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	485	self->size = 0;
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	486	self->mtime_s = 0;
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	487	self->mtime_ns = 0;
48060 a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48044 diff changeset	488	}
a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48044 diff changeset	489	Py_RETURN_NONE;
a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48044 diff changeset	490	}
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	491	static PyMethodDef dirstate_item_methods[] = {
48222 7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	492	{"v2_data", (PyCFunction)dirstate_item_v2_data, METH_NOARGS,
7e78c72ee3ea dirstate-v2: Initial Python serializer Raphaël Gomès <rgomes@octobus.net> parents: 48221 diff changeset	493	"return data suitable for v2 serialization"},
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	494	{"mtime_likely_equal_to", (PyCFunction)dirstate_item_mtime_likely_equal_to,
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48253 diff changeset	495	METH_O, "True if the stored mtime is likely equal to the given mtime"},
48221 a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	496	{"from_v2_data", (PyCFunction)dirstate_item_from_v2_meth,
a32a96079e2d dirstate-v2: initial Python parser Simon Sapin <simon.sapin@octobus.net> parents: 48164 diff changeset	497	METH_VARARGS \| METH_CLASS, "build a new DirstateItem object from V2 data"},
47666 e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	498	{"set_possibly_dirty", (PyCFunction)dirstate_item_set_possibly_dirty,
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	499	METH_NOARGS, "mark a file as \"possibly dirty\""},
47974 4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	500	{"set_clean", (PyCFunction)dirstate_item_set_clean, METH_VARARGS,
4e6f27230aee dirstate: introduce a `set_clean` method on dirstate's map and items Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47948 diff changeset	501	"mark a file as \"clean\""},
47990 0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47976 diff changeset	502	{"set_tracked", (PyCFunction)dirstate_item_set_tracked, METH_NOARGS,
0d2a404f1932 dirstate: introduce a set_tracked method on "map" and "item" Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47976 diff changeset	503	"mark a file as \"tracked\""},
47890 3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	504	{"set_untracked", (PyCFunction)dirstate_item_set_untracked, METH_NOARGS,
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	505	"mark a file as \"untracked\""},
48060 a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48044 diff changeset	506	{"drop_merge_data", (PyCFunction)dirstate_item_drop_merge_data, METH_NOARGS,
a660d8a53267 dirstate: use a new `drop_merge_data` in `setparent` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48044 diff changeset	507	"remove all \"merge-only\" from a DirstateItem"},
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	508	{NULL} /* Sentinel */
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	509	};
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	510
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	511	static PyObject dirstate_item_get_mode(dirstateItemObject self)
47536 8e4b9fe31334 dirstate-entry: add a `mode` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47532 diff changeset	512	{
48817 c1ad4364a5b5 cext: use PyLong symbols Gregory Szorc <gregory.szorc@gmail.com> parents: 48816 diff changeset	513	return PyLong_FromLong(dirstate_item_c_v1_mode(self));
47536 8e4b9fe31334 dirstate-entry: add a `mode` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47532 diff changeset	514	};
8e4b9fe31334 dirstate-entry: add a `mode` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47532 diff changeset	515
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	516	static PyObject dirstate_item_get_size(dirstateItemObject self)
47537 0e5800c88eb4 dirstate-entry: add a `size` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47536 diff changeset	517	{
48817 c1ad4364a5b5 cext: use PyLong symbols Gregory Szorc <gregory.szorc@gmail.com> parents: 48816 diff changeset	518	return PyLong_FromLong(dirstate_item_c_v1_size(self));
47537 0e5800c88eb4 dirstate-entry: add a `size` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47536 diff changeset	519	};
0e5800c88eb4 dirstate-entry: add a `size` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47536 diff changeset	520
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	521	static PyObject dirstate_item_get_mtime(dirstateItemObject self)
47538 77fce401a2bb dirstate-entry: add a `mtime` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47537 diff changeset	522	{
48817 c1ad4364a5b5 cext: use PyLong symbols Gregory Szorc <gregory.szorc@gmail.com> parents: 48816 diff changeset	523	return PyLong_FromLong(dirstate_item_c_v1_mtime(self));
47538 77fce401a2bb dirstate-entry: add a `mtime` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47537 diff changeset	524	};
77fce401a2bb dirstate-entry: add a `mtime` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47537 diff changeset	525
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	526	static PyObject dirstate_item_get_state(dirstateItemObject self)
47512 769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	527	{
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	528	char state = dirstate_item_c_v1_state(self);
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	529	return PyBytes_FromStringAndSize(&state, 1);
47512 769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	530	};
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	531
48252 602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	532	static PyObject dirstate_item_get_has_fallback_exec(dirstateItemObject self)
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	533	{
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	534	if (dirstate_item_c_has_fallback_exec(self)) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	535	Py_RETURN_TRUE;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	536	} else {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	537	Py_RETURN_FALSE;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	538	}
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	539	};
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	540
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	541	static PyObject dirstate_item_get_fallback_exec(dirstateItemObject self)
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	542	{
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	543	if (dirstate_item_c_has_fallback_exec(self)) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	544	if (self->flags & dirstate_flag_fallback_exec) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	545	Py_RETURN_TRUE;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	546	} else {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	547	Py_RETURN_FALSE;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	548	}
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	549	} else {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	550	Py_RETURN_NONE;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	551	}
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	552	};
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	553
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	554	static int dirstate_item_set_fallback_exec(dirstateItemObject *self,
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	555	PyObject *value)
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	556	{
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	557	if ((value == Py_None) \|\| (value == NULL)) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	558	self->flags &= ~dirstate_flag_has_fallback_exec;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	559	} else {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	560	self->flags \|= dirstate_flag_has_fallback_exec;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	561	if (PyObject_IsTrue(value)) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	562	self->flags \|= dirstate_flag_fallback_exec;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	563	} else {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	564	self->flags &= ~dirstate_flag_fallback_exec;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	565	}
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	566	}
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	567	return 0;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	568	};
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	569
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	570	static PyObject *
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	571	dirstate_item_get_has_fallback_symlink(dirstateItemObject *self)
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	572	{
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	573	if (dirstate_item_c_has_fallback_symlink(self)) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	574	Py_RETURN_TRUE;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	575	} else {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	576	Py_RETURN_FALSE;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	577	}
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	578	};
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	579
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	580	static PyObject dirstate_item_get_fallback_symlink(dirstateItemObject self)
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	581	{
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	582	if (dirstate_item_c_has_fallback_symlink(self)) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	583	if (self->flags & dirstate_flag_fallback_symlink) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	584	Py_RETURN_TRUE;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	585	} else {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	586	Py_RETURN_FALSE;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	587	}
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	588	} else {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	589	Py_RETURN_NONE;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	590	}
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	591	};
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	592
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	593	static int dirstate_item_set_fallback_symlink(dirstateItemObject *self,
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	594	PyObject *value)
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	595	{
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	596	if ((value == Py_None) \|\| (value == NULL)) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	597	self->flags &= ~dirstate_flag_has_fallback_symlink;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	598	} else {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	599	self->flags \|= dirstate_flag_has_fallback_symlink;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	600	if (PyObject_IsTrue(value)) {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	601	self->flags \|= dirstate_flag_fallback_symlink;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	602	} else {
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	603	self->flags &= ~dirstate_flag_fallback_symlink;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	604	}
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	605	}
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	606	return 0;
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	607	};
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	608
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	609	static PyObject dirstate_item_get_tracked(dirstateItemObject self)
47531 f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	610	{
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	611	if (dirstate_item_c_tracked(self)) {
47531 f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	612	Py_RETURN_TRUE;
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	613	} else {
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	614	Py_RETURN_FALSE;
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	615	}
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	616	};
48143 21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	617	static PyObject dirstate_item_get_p1_tracked(dirstateItemObject self)
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	618	{
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	619	if (self->flags & dirstate_flag_p1_tracked) {
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	620	Py_RETURN_TRUE;
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	621	} else {
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	622	Py_RETURN_FALSE;
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	623	}
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	624	};
47531 f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	625
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	626	static PyObject dirstate_item_get_added(dirstateItemObject self)
47526 8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	627	{
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	628	if (dirstate_item_c_added(self)) {
47526 8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	629	Py_RETURN_TRUE;
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	630	} else {
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	631	Py_RETURN_FALSE;
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	632	}
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	633	};
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	634
48142 fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48138 diff changeset	635	static PyObject dirstate_item_get_p2_info(dirstateItemObject self)
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48138 diff changeset	636	{
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48138 diff changeset	637	if (self->flags & dirstate_flag_wc_tracked &&
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48138 diff changeset	638	self->flags & dirstate_flag_p2_info) {
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48138 diff changeset	639	Py_RETURN_TRUE;
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48138 diff changeset	640	} else {
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48138 diff changeset	641	Py_RETURN_FALSE;
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48138 diff changeset	642	}
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48138 diff changeset	643	};
fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48138 diff changeset	644
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	645	static PyObject dirstate_item_get_merged(dirstateItemObject self)
47513 10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	646	{
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	647	if (dirstate_item_c_merged(self)) {
47513 10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	648	Py_RETURN_TRUE;
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	649	} else {
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	650	Py_RETURN_FALSE;
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	651	}
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	652	};
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	653
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	654	static PyObject dirstate_item_get_from_p2(dirstateItemObject self)
47514 559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	655	{
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	656	if (dirstate_item_c_from_p2(self)) {
47514 559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	657	Py_RETURN_TRUE;
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	658	} else {
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	659	Py_RETURN_FALSE;
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	660	}
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	661	};
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	662
48086 80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	663	static PyObject dirstate_item_get_maybe_clean(dirstateItemObject self)
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	664	{
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	665	if (!(self->flags & dirstate_flag_wc_tracked)) {
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	666	Py_RETURN_FALSE;
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	667	} else if (!(self->flags & dirstate_flag_p1_tracked)) {
48086 80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	668	Py_RETURN_FALSE;
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	669	} else if (self->flags & dirstate_flag_p2_info) {
48086 80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	670	Py_RETURN_FALSE;
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	671	} else {
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	672	Py_RETURN_TRUE;
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	673	}
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	674	};
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	675
48087 79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	676	static PyObject dirstate_item_get_any_tracked(dirstateItemObject self)
79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	677	{
48138 38488d488ec1 dirstate-item: change the internal storage and constructor value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48087 diff changeset	678	if (dirstate_item_c_any_tracked(self)) {
48087 79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	679	Py_RETURN_TRUE;
79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	680	} else {
79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	681	Py_RETURN_FALSE;
79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	682	}
79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	683	};
79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	684
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	685	static PyObject dirstate_item_get_removed(dirstateItemObject self)
47515 c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	686	{
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	687	if (dirstate_item_c_removed(self)) {
47515 c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	688	Py_RETURN_TRUE;
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	689	} else {
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	690	Py_RETURN_FALSE;
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	691	}
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	692	};
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	693
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	694	static PyGetSetDef dirstate_item_getset[] = {
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	695	{"mode", (getter)dirstate_item_get_mode, NULL, "mode", NULL},
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	696	{"size", (getter)dirstate_item_get_size, NULL, "size", NULL},
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	697	{"mtime", (getter)dirstate_item_get_mtime, NULL, "mtime", NULL},
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	698	{"state", (getter)dirstate_item_get_state, NULL, "state", NULL},
48252 602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	699	{"has_fallback_exec", (getter)dirstate_item_get_has_fallback_exec, NULL,
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	700	"has_fallback_exec", NULL},
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	701	{"fallback_exec", (getter)dirstate_item_get_fallback_exec,
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	702	(setter)dirstate_item_set_fallback_exec, "fallback_exec", NULL},
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	703	{"has_fallback_symlink", (getter)dirstate_item_get_has_fallback_symlink,
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	704	NULL, "has_fallback_symlink", NULL},
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	705	{"fallback_symlink", (getter)dirstate_item_get_fallback_symlink,
602c8e8411f5 dirstate: add a concept of "fallback" flags to dirstate item Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48250 diff changeset	706	(setter)dirstate_item_set_fallback_symlink, "fallback_symlink", NULL},
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	707	{"tracked", (getter)dirstate_item_get_tracked, NULL, "tracked", NULL},
48143 21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	708	{"p1_tracked", (getter)dirstate_item_get_p1_tracked, NULL, "p1_tracked",
21542d4cb568 dirstate-item: introduce a `p1_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48142 diff changeset	709	NULL},
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	710	{"added", (getter)dirstate_item_get_added, NULL, "added", NULL},
48142 fb3b41d583c2 dirstate-item: introduce a `p2_info` property that combine two others Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48138 diff changeset	711	{"p2_info", (getter)dirstate_item_get_p2_info, NULL, "p2_info", NULL},
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	712	{"merged", (getter)dirstate_item_get_merged, NULL, "merged", NULL},
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	713	{"from_p2", (getter)dirstate_item_get_from_p2, NULL, "from_p2", NULL},
48086 80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	714	{"maybe_clean", (getter)dirstate_item_get_maybe_clean, NULL, "maybe_clean",
80783e553bd5 dirstate-item: introduce a `maybe_clean` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48084 diff changeset	715	NULL},
48087 79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	716	{"any_tracked", (getter)dirstate_item_get_any_tracked, NULL, "any_tracked",
79bc60ca5946 dirstate-item: introduce a `any_tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48086 diff changeset	717	NULL},
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	718	{"removed", (getter)dirstate_item_get_removed, NULL, "removed", NULL},
47512 769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	719	{NULL} /* Sentinel */
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	720	};
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	721
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	722	PyTypeObject dirstateItemType = {
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	723	PyVarObject_HEAD_INIT(NULL, 0) /* header */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	724	"dirstate_tuple", /* tp_name */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	725	sizeof(dirstateItemObject), /* tp_basicsize */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	726	0, /* tp_itemsize */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	727	(destructor)dirstate_item_dealloc, /* tp_dealloc */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	728	0, /* tp_print */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	729	0, /* tp_getattr */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	730	0, /* tp_setattr */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	731	0, /* tp_compare */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	732	0, /* tp_repr */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	733	0, /* tp_as_number */
47925 ba9491be5e0c dirstate-item: drop the deprecated __getitem__ variante Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47905 diff changeset	734	0, /* tp_as_sequence */
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	735	0, /* tp_as_mapping */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	736	0, /* tp_hash */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	737	0, /* tp_call */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	738	0, /* tp_str */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	739	0, /* tp_getattro */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	740	0, /* tp_setattro */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	741	0, /* tp_as_buffer */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	742	Py_TPFLAGS_DEFAULT, /* tp_flags */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	743	"dirstate tuple", /* tp_doc */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	744	0, /* tp_traverse */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	745	0, /* tp_clear */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	746	0, /* tp_richcompare */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	747	0, /* tp_weaklistoffset */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	748	0, /* tp_iter */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	749	0, /* tp_iternext */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	750	dirstate_item_methods, /* tp_methods */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	751	0, /* tp_members */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	752	dirstate_item_getset, /* tp_getset */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	753	0, /* tp_base */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	754	0, /* tp_dict */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	755	0, /* tp_descr_get */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	756	0, /* tp_descr_set */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	757	0, /* tp_dictoffset */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	758	0, /* tp_init */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	759	0, /* tp_alloc */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	760	dirstate_item_new, /* tp_new */
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	761	};
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	762
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	763	static PyObject parse_dirstate(PyObject self, PyObject *args)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	764	{
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	765	PyObject dmap, cmap, parents = NULL, ret = NULL;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	766	PyObject fname = NULL, cname = NULL, *entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	767	char state, cur, str, *cpos;
19725 5e25d71a58cc parsers: state is a char, not an int Bryan O'Sullivan <bryano@fb.com> parents: 19718 diff changeset	768	int mode, size, mtime;
42068 896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	769	unsigned int flen, pos = 40;
896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	770	Py_ssize_t len = 40;
896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	771	Py_ssize_t readlen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	772
48821 b0dd39b91e7a cext: remove PY23() Gregory Szorc <gregory.szorc@gmail.com> parents: 48817 diff changeset	773	if (!PyArg_ParseTuple(args, "O!O!y#:parse_dirstate", &PyDict_Type,
b0dd39b91e7a cext: remove PY23() Gregory Szorc <gregory.szorc@gmail.com> parents: 48817 diff changeset	774	&dmap, &PyDict_Type, &cmap, &str, &readlen)) {
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	775	goto quit;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	776	}
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	777
22403 41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	778	len = readlen;
41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	779
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	780	/* read parents */
26052 b970418bbafe parsers: set exception when there's too little string data to extract parents Augie Fackler <augie@google.com> parents: 26051 diff changeset	781	if (len < 40) {
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	782	PyErr_SetString(PyExc_ValueError,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	783	"too little data for parents");
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	784	goto quit;
26052 b970418bbafe parsers: set exception when there's too little string data to extract parents Augie Fackler <augie@google.com> parents: 26051 diff changeset	785	}
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	786
48821 b0dd39b91e7a cext: remove PY23() Gregory Szorc <gregory.szorc@gmail.com> parents: 48817 diff changeset	787	parents = Py_BuildValue("y#y#", str, (Py_ssize_t)20, str + 20,
b0dd39b91e7a cext: remove PY23() Gregory Szorc <gregory.szorc@gmail.com> parents: 48817 diff changeset	788	(Py_ssize_t)20);
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	789	if (!parents) {
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	790	goto quit;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	791	}
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	792
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	793	/* read filenames */
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	794	while (pos >= 40 && pos < len) {
27226 f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	795	if (pos + 17 > len) {
f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	796	PyErr_SetString(PyExc_ValueError,
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	797	"overflow in dirstate");
27226 f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	798	goto quit;
f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	799	}
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	800	cur = str + pos;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	801	/* unpack header */
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	802	state = *cur;
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	803	mode = getbe32(cur + 1);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	804	size = getbe32(cur + 5);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	805	mtime = getbe32(cur + 9);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	806	flen = getbe32(cur + 13);
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	807	pos += 17;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	808	cur += 17;
20316 40f08c31844c parsers: fix 'unsigned expression is always true' warning (issue4142) David Soria Parra <davidsp@fb.com> parents: 20169 diff changeset	809	if (flen > len - pos) {
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	810	PyErr_SetString(PyExc_ValueError,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	811	"overflow in dirstate");
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	812	goto quit;
7174 4da87407b845 parsers.c: fix integer overflows Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7168 diff changeset	813	}
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	814
47665 a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	815	entry = (PyObject *)dirstate_item_from_v1_data(state, mode,
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	816	size, mtime);
48027 13efd8fdc55f dirstate: fix parse_dirstate() to error out if NULL entry created Yuya Nishihara <yuya@tcha.org> parents: 48025 diff changeset	817	if (!entry)
13efd8fdc55f dirstate: fix parse_dirstate() to error out if NULL entry created Yuya Nishihara <yuya@tcha.org> parents: 48025 diff changeset	818	goto quit;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	819	cpos = memchr(cur, 0, flen);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	820	if (cpos) {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	821	fname = PyBytes_FromStringAndSize(cur, cpos - cur);
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	822	cname = PyBytes_FromStringAndSize(
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	823	cpos + 1, flen - (cpos - cur) - 1);
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	824	if (!fname \|\| !cname \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	825	PyDict_SetItem(cmap, fname, cname) == -1 \|\|
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	826	PyDict_SetItem(dmap, fname, entry) == -1) {
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	827	goto quit;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	828	}
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	829	Py_DECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	830	} else {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	831	fname = PyBytes_FromStringAndSize(cur, flen);
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	832	if (!fname \|\|
763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	833	PyDict_SetItem(dmap, fname, entry) == -1) {
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	834	goto quit;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	835	}
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	836	}
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	837	Py_DECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	838	Py_DECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	839	fname = cname = entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	840	pos += flen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	841	}
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	842
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	843	ret = parents;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	844	Py_INCREF(ret);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	845	quit:
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	846	Py_XDECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	847	Py_XDECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	848	Py_XDECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	849	Py_XDECREF(parents);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	850	return ret;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	851	}
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	852
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	853	/*
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	854	* Efficiently pack a dirstate object into its on-disk format.
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	855	*/
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	856	static PyObject pack_dirstate(PyObject self, PyObject *args)
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	857	{
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	858	PyObject *packobj = NULL;
21806 05bd2667df4d pack_dirstate: in C version, for invalidation set dict to what we write to disk Siddharth Agarwal <sid0@fb.com> parents: 21730 diff changeset	859	PyObject map, copymap, pl, mtime_unset = NULL;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	860	Py_ssize_t nbytes, pos, l;
23946 f3e94aa6e182 parsers: don't leak a tuple in pack_dirstate Augie Fackler <augie@google.com> parents: 23945 diff changeset	861	PyObject k, v = NULL, *pn;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	862	char p, s;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	863
48392 434de12918fd dirstate: remove need_delay logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48378 diff changeset	864	if (!PyArg_ParseTuple(args, "O!O!O!:pack_dirstate", &PyDict_Type, &map,
434de12918fd dirstate: remove need_delay logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48378 diff changeset	865	&PyDict_Type, &copymap, &PyTuple_Type, &pl)) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	866	return NULL;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	867	}
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	868
39422 adacefb0b7ea dirstate: use tuple interface to fix leak in pack_dirstate() Yuya Nishihara <yuya@tcha.org> parents: 37968 diff changeset	869	if (PyTuple_Size(pl) != 2) {
adacefb0b7ea dirstate: use tuple interface to fix leak in pack_dirstate() Yuya Nishihara <yuya@tcha.org> parents: 37968 diff changeset	870	PyErr_SetString(PyExc_TypeError, "expected 2-element tuple");
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	871	return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	872	}
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	873
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	874	/* Figure out how much we need to allocate. */
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	875	for (nbytes = 40, pos = 0; PyDict_Next(map, &pos, &k, &v);) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	876	PyObject *c;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	877	if (!PyBytes_Check(k)) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	878	PyErr_SetString(PyExc_TypeError, "expected string key");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	879	goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	880	}
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	881	nbytes += PyBytes_GET_SIZE(k) + 17;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	882	c = PyDict_GetItem(copymap, k);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	883	if (c) {
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	884	if (!PyBytes_Check(c)) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	885	PyErr_SetString(PyExc_TypeError,
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	886	"expected string key");
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	887	goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	888	}
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	889	nbytes += PyBytes_GET_SIZE(c) + 1;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	890	}
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	891	}
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	892
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	893	packobj = PyBytes_FromStringAndSize(NULL, nbytes);
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	894	if (packobj == NULL) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	895	goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	896	}
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	897
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	898	p = PyBytes_AS_STRING(packobj);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	899
39422 adacefb0b7ea dirstate: use tuple interface to fix leak in pack_dirstate() Yuya Nishihara <yuya@tcha.org> parents: 37968 diff changeset	900	pn = PyTuple_GET_ITEM(pl, 0);
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	901	if (PyBytes_AsStringAndSize(pn, &s, &l) == -1 \|\| l != 20) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	902	PyErr_SetString(PyExc_TypeError, "expected a 20-byte hash");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	903	goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	904	}
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	905	memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	906	p += 20;
39422 adacefb0b7ea dirstate: use tuple interface to fix leak in pack_dirstate() Yuya Nishihara <yuya@tcha.org> parents: 37968 diff changeset	907	pn = PyTuple_GET_ITEM(pl, 1);
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	908	if (PyBytes_AsStringAndSize(pn, &s, &l) == -1 \|\| l != 20) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	909	PyErr_SetString(PyExc_TypeError, "expected a 20-byte hash");
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	910	goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	911	}
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	912	memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	913	p += 20;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	914
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	915	for (pos = 0; PyDict_Next(map, &pos, &k, &v);) {
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	916	dirstateItemObject *tuple;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	917	char state;
26774 04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	918	int mode, size, mtime;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	919	Py_ssize_t len, l;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	920	PyObject *o;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	921	char *t;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	922
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	923	if (!dirstate_tuple_check(v)) {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	924	PyErr_SetString(PyExc_TypeError,
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	925	"expected a dirstate tuple");
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	926	goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	927	}
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	928	tuple = (dirstateItemObject *)v;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	929
47948 83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	930	state = dirstate_item_c_v1_state(tuple);
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	931	mode = dirstate_item_c_v1_mode(tuple);
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	932	size = dirstate_item_c_v1_size(tuple);
83f0e93ec34b dirstate-item: move the C implementation to the same logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47947 diff changeset	933	mtime = dirstate_item_c_v1_mtime(tuple);
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	934	*p++ = state;
26774 04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	935	putbe32((uint32_t)mode, p);
04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	936	putbe32((uint32_t)size, p + 4);
04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	937	putbe32((uint32_t)mtime, p + 8);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	938	t = p + 12;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	939	p += 16;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	940	len = PyBytes_GET_SIZE(k);
c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	941	memcpy(p, PyBytes_AS_STRING(k), len);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	942	p += len;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	943	o = PyDict_GetItem(copymap, k);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	944	if (o) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	945	*p++ = '\0';
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	946	l = PyBytes_GET_SIZE(o);
c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	947	memcpy(p, PyBytes_AS_STRING(o), l);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	948	p += l;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	949	len += l + 1;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	950	}
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	951	putbe32((uint32_t)len, t);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	952	}
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	953
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	954	pos = p - PyBytes_AS_STRING(packobj);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	955	if (pos != nbytes) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	956	PyErr_Format(PyExc_SystemError, "bad dirstate size: %ld != %ld",
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	957	(long)pos, (long)nbytes);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	958	goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	959	}
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	960
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	961	return packobj;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	962	bail:
21806 05bd2667df4d pack_dirstate: in C version, for invalidation set dict to what we write to disk Siddharth Agarwal <sid0@fb.com> parents: 21730 diff changeset	963	Py_XDECREF(mtime_unset);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	964	Py_XDECREF(packobj);
23946 f3e94aa6e182 parsers: don't leak a tuple in pack_dirstate Augie Fackler <augie@google.com> parents: 23945 diff changeset	965	Py_XDECREF(v);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	966	return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	967	}
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	968
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	969	#define BUMPED_FIX 1
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	970	#define USING_SHA_256 2
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	971	#define FM1_HEADER_SIZE (4 + 8 + 2 + 2 + 1 + 1 + 1)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	972
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	973	static PyObject readshas(const char source, unsigned char num,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	974	Py_ssize_t hashwidth)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	975	{
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	976	int i;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	977	PyObject *list = PyTuple_New(num);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	978	if (list == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	979	return NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	980	}
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	981	for (i = 0; i < num; i++) {
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	982	PyObject *hash = PyBytes_FromStringAndSize(source, hashwidth);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	983	if (hash == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	984	Py_DECREF(list);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	985	return NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	986	}
26213 4d6cdea33f37 parsers: use PyTuple_SET_ITEM() to fill new marker tuples Yuya Nishihara <yuya@tcha.org> parents: 26107 diff changeset	987	PyTuple_SET_ITEM(list, i, hash);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	988	source += hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	989	}
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	990	return list;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	991	}
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	992
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	993	static PyObject fm1readmarker(const char databegin, const char *dataend,
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	994	uint32_t *msize)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	995	{
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	996	const char *data = databegin;
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	997	const char *meta;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	998
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	999	double mtime;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1000	int16_t tz;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1001	uint16_t flags;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1002	unsigned char nsuccs, nparents, nmetadata;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1003	Py_ssize_t hashwidth = 20;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1004
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1005	PyObject prec = NULL, parents = NULL, *succs = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1006	PyObject metadata = NULL, ret = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1007	int i;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1008
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1009	if (data + FM1_HEADER_SIZE > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1010	goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1011	}
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1012
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1013	*msize = getbe32(data);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1014	data += 4;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1015	mtime = getbefloat64(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1016	data += 8;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1017	tz = getbeint16(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1018	data += 2;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1019	flags = getbeuint16(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1020	data += 2;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1021
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1022	if (flags & USING_SHA_256) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1023	hashwidth = 32;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1024	}
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1025
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1026	nsuccs = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1027	nparents = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1028	nmetadata = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1029
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1030	if (databegin + *msize > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1031	goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1032	}
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1033	dataend = databegin + msize; / narrow down to marker size */
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1034
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1035	if (data + hashwidth > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1036	goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1037	}
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	1038	prec = PyBytes_FromStringAndSize(data, hashwidth);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1039	data += hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1040	if (prec == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1041	goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1042	}
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1043
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1044	if (data + nsuccs * hashwidth > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1045	goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1046	}
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1047	succs = readshas(data, nsuccs, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1048	if (succs == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1049	goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1050	}
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1051	data += nsuccs * hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1052
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1053	if (nparents == 1 \|\| nparents == 2) {
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1054	if (data + nparents * hashwidth > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1055	goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1056	}
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1057	parents = readshas(data, nparents, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1058	if (parents == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1059	goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1060	}
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1061	data += nparents * hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1062	} else {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1063	parents = Py_None;
31426 43a7dfbead0c parsers: handle refcounting of "parents" consistently Gregory Szorc <gregory.szorc@gmail.com> parents: 31292 diff changeset	1064	Py_INCREF(parents);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1065	}
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1066
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1067	if (data + 2 * nmetadata > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1068	goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1069	}
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1070	meta = data + (2 * nmetadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1071	metadata = PyTuple_New(nmetadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1072	if (metadata == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1073	goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1074	}
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1075	for (i = 0; i < nmetadata; i++) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1076	PyObject tmp, left = NULL, *right = NULL;
26590 473a63c45394 parsers: read sizes of metadata pair of obsolete marker at once Yuya Nishihara <yuya@tcha.org> parents: 26214 diff changeset	1077	Py_ssize_t leftsize = (unsigned char)(*data++);
473a63c45394 parsers: read sizes of metadata pair of obsolete marker at once Yuya Nishihara <yuya@tcha.org> parents: 26214 diff changeset	1078	Py_ssize_t rightsize = (unsigned char)(*data++);
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1079	if (meta + leftsize + rightsize > dataend) {
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1080	goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1081	}
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	1082	left = PyBytes_FromStringAndSize(meta, leftsize);
26590 473a63c45394 parsers: read sizes of metadata pair of obsolete marker at once Yuya Nishihara <yuya@tcha.org> parents: 26214 diff changeset	1083	meta += leftsize;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	1084	right = PyBytes_FromStringAndSize(meta, rightsize);
26590 473a63c45394 parsers: read sizes of metadata pair of obsolete marker at once Yuya Nishihara <yuya@tcha.org> parents: 26214 diff changeset	1085	meta += rightsize;
26214 46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	1086	tmp = PyTuple_New(2);
46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	1087	if (!left \|\| !right \|\| !tmp) {
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1088	Py_XDECREF(left);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1089	Py_XDECREF(right);
26214 46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	1090	Py_XDECREF(tmp);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1091	goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1092	}
26214 46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	1093	PyTuple_SET_ITEM(tmp, 0, left);
46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	1094	PyTuple_SET_ITEM(tmp, 1, right);
26213 4d6cdea33f37 parsers: use PyTuple_SET_ITEM() to fill new marker tuples Yuya Nishihara <yuya@tcha.org> parents: 26107 diff changeset	1095	PyTuple_SET_ITEM(metadata, i, tmp);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1096	}
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1097	ret = Py_BuildValue("(OOHO(di)O)", prec, succs, flags, metadata, mtime,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1098	(int)tz * 60, parents);
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1099	goto bail; /* return successfully */
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1100
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1101	overflow:
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1102	PyErr_SetString(PyExc_ValueError, "overflow in obsstore");
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1103	bail:
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1104	Py_XDECREF(prec);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1105	Py_XDECREF(succs);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1106	Py_XDECREF(metadata);
31426 43a7dfbead0c parsers: handle refcounting of "parents" consistently Gregory Szorc <gregory.szorc@gmail.com> parents: 31292 diff changeset	1107	Py_XDECREF(parents);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1108	return ret;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1109	}
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1110
34440 7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	1111	static PyObject fm1readmarkers(PyObject self, PyObject *args)
7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	1112	{
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1113	const char data, dataend;
42068 896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	1114	Py_ssize_t datalen, offset, stop;
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1115	PyObject *markers = NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1116
48821 b0dd39b91e7a cext: remove PY23() Gregory Szorc <gregory.szorc@gmail.com> parents: 48817 diff changeset	1117	if (!PyArg_ParseTuple(args, "y#nn", &data, &datalen, &offset, &stop)) {
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1118	return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1119	}
41016 5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1120	if (offset < 0) {
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1121	PyErr_SetString(PyExc_ValueError,
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1122	"invalid negative offset in fm1readmarkers");
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1123	return NULL;
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1124	}
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1125	if (stop > datalen) {
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1126	PyErr_SetString(
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1127	PyExc_ValueError,
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1128	"stop longer than data length in fm1readmarkers");
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1129	return NULL;
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1130	}
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1131	dataend = data + datalen;
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1132	data += offset;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1133	markers = PyList_New(0);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1134	if (!markers) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1135	return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1136	}
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1137	while (offset < stop) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1138	uint32_t msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1139	int error;
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1140	PyObject *record = fm1readmarker(data, dataend, &msize);
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1141	if (!record) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1142	goto bail;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1143	}
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1144	error = PyList_Append(markers, record);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1145	Py_DECREF(record);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1146	if (error) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1147	goto bail;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1148	}
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1149	data += msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1150	offset += msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1151	}
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1152	return markers;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1153	bail:
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1154	Py_DECREF(markers);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1155	return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1156	}
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1157
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1158	static char parsers_doc[] = "Efficient content parsing.";
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1159
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	1160	PyObject encodedir(PyObject self, PyObject *args);
17616 9535a0dc41f2 store: implement fncache basic path encoding in C Bryan O'Sullivan <bryano@fb.com> parents: 17606 diff changeset	1161	PyObject pathencode(PyObject self, PyObject *args);
18430 0459c6555f69 store: implement lowerencode in C Bryan O'Sullivan <bryano@fb.com> parents: 17616 diff changeset	1162	PyObject lowerencode(PyObject self, PyObject *args);
46708 358737abeeef cext: add support for revlogv2 Raphaël Gomès <rgomes@octobus.net> parents: 45131 diff changeset	1163	PyObject parse_index2(PyObject self, PyObject args, PyObject kwargs);
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	1164
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1165	static PyMethodDef methods[] = {
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1166	{"pack_dirstate", pack_dirstate, METH_VARARGS, "pack a dirstate\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1167	{"parse_dirstate", parse_dirstate, METH_VARARGS, "parse a dirstate\n"},
46708 358737abeeef cext: add support for revlogv2 Raphaël Gomès <rgomes@octobus.net> parents: 45131 diff changeset	1168	{"parse_index2", (PyCFunction)parse_index2, METH_VARARGS \| METH_KEYWORDS,
358737abeeef cext: add support for revlogv2 Raphaël Gomès <rgomes@octobus.net> parents: 45131 diff changeset	1169	"parse a revlog index\n"},
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1170	{"isasciistr", isasciistr, METH_VARARGS, "check if an ASCII string\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1171	{"asciilower", asciilower, METH_VARARGS, "lowercase an ASCII string\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1172	{"asciiupper", asciiupper, METH_VARARGS, "uppercase an ASCII string\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1173	{"dict_new_presized", dict_new_presized, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1174	"construct a dict with an expected size\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1175	{"make_file_foldmap", make_file_foldmap, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1176	"make file foldmap\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1177	{"jsonescapeu8fast", jsonescapeu8fast, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1178	"escape a UTF-8 byte string to JSON (fast path)\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1179	{"encodedir", encodedir, METH_VARARGS, "encodedir a path\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1180	{"pathencode", pathencode, METH_VARARGS, "fncache-encode a path\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1181	{"lowerencode", lowerencode, METH_VARARGS, "lower-encode a path\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1182	{"fm1readmarkers", fm1readmarkers, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1183	"parse v1 obsolete markers\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1184	{NULL, NULL}};
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1185
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	1186	void dirs_module_init(PyObject *mod);
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: 24032 diff changeset	1187	void manifest_module_init(PyObject *mod);
32378 7d0c69505a66 cext: extract revlog/index parsing code to own C file Gregory Szorc <gregory.szorc@gmail.com> parents: 32372 diff changeset	1188	void revlog_module_init(PyObject *mod);
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	1189
47268 9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47249 diff changeset	1190	static const int version = 20;
32360 af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	1191
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1192	static void module_init(PyObject *mod)
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1193	{
32360 af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	1194	PyModule_AddIntConstant(mod, "version", version);
af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	1195
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1196	/* This module constant has two purposes. First, it lets us unit test
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1197	* the ImportError raised without hard-coding any error text. This
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1198	* means we can change the text in the future without breaking tests,
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1199	* even across changesets without a recompile. Second, its presence
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1200	* can be used to determine whether the version-checking logic is
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1201	* present, which also helps in testing across changesets without a
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1202	* recompile. Note that this means the pure-Python version of parsers
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1203	* should not have this module constant. */
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1204	PyModule_AddStringConstant(mod, "versionerrortext", versionerrortext);
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1205
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	1206	dirs_module_init(mod);
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: 24032 diff changeset	1207	manifest_module_init(mod);
32378 7d0c69505a66 cext: extract revlog/index parsing code to own C file Gregory Szorc <gregory.szorc@gmail.com> parents: 32372 diff changeset	1208	revlog_module_init(mod);
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	1209
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	1210	if (PyType_Ready(&dirstateItemType) < 0) {
32384 2e5a476b2e46 cext: move back finalization of dirstateTupleType where it should be Yuya Nishihara <yuya@tcha.org> parents: 32378 diff changeset	1211	return;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1212	}
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	1213	Py_INCREF(&dirstateItemType);
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	1214	PyModule_AddObject(mod, "DirstateItem", (PyObject *)&dirstateItemType);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1215	}
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1216
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1217	static int check_python_version(void)
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1218	{
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	1219	PyObject sys = PyImport_ImportModule("sys"), ver;
5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	1220	long hexversion;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1221	if (!sys) {
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	1222	return -1;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1223	}
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	1224	ver = PyObject_GetAttrString(sys, "hexversion");
5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	1225	Py_DECREF(sys);
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1226	if (!ver) {
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	1227	return -1;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1228	}
48817 c1ad4364a5b5 cext: use PyLong symbols Gregory Szorc <gregory.szorc@gmail.com> parents: 48816 diff changeset	1229	hexversion = PyLong_AsLong(ver);
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	1230	Py_DECREF(ver);
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1231	/* sys.hexversion is a 32-bit number by default, so the -1 case
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1232	* should only occur in unusual circumstances (e.g. if sys.hexversion
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1233	* is manually set to an invalid value). */
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1234	if ((hexversion == -1) \|\| (hexversion >> 16 != PY_VERSION_HEX >> 16)) {
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1235	PyErr_Format(PyExc_ImportError,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1236	"%s: The Mercurial extension "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1237	"modules were compiled with Python " PY_VERSION
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1238	", but "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1239	"Mercurial is currently using Python with "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1240	"sys.hexversion=%ld: "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1241	"Python %s\n at: %s",
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1242	versionerrortext, hexversion, Py_GetVersion(),
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1243	Py_GetProgramFullPath());
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1244	return -1;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1245	}
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1246	return 0;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1247	}
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1248
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1249	static struct PyModuleDef parsers_module = {PyModuleDef_HEAD_INIT, "parsers",
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1250	parsers_doc, -1, methods};
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1251
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1252	PyMODINIT_FUNC PyInit_parsers(void)
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1253	{
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1254	PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1255
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1256	if (check_python_version() == -1)
30090 8abe9264c73a parsers: return NULL from PyInit_parsers on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 29444 diff changeset	1257	return NULL;
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1258	mod = PyModule_Create(&parsers_module);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1259	module_init(mod);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1260	return mod;
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1261	}

author	Raphaël Gomès <rgomes@octobus.net>
	Tue, 22 Mar 2022 16:33:18 +0100
changeset 49044	be9bf75a837c
parent 48992	bde2e4ef968a
child 49273	34020d1f1635
permissions	-rw-r--r--