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

annotate mercurial/cext/parsers.c @ 47947:154e4dcac68c

dirstate-item: introduce low level C function Since a lot of logic is about to change, we need to isolate it into bits that are easy reusable in the rest of the C code. Especially we need to split the part that do the pure logic from the part that do the Python wrapping. Differential Revision: https://phab.mercurial-scm.org/D11386

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Tue, 31 Aug 2021 09:23:50 +0200
parents	0919d66e279a
children	83f0e93ec34b

rev	line source
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1 /*
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	2 parsers.c - efficient content parsing
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	3
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Rapha?l Gom?s <rgomes@octobus.net> parents: 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
30112 9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	20 #ifdef IS_PY3K
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	21 /* The mapping of Python types is meant to be temporary to get Python
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	22 * 3 to compile. We should remove this once Python 3 support is fully
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	23 * supported and proper types are used in the extensions themselves. */
30169 5f7151e6de85 parsers: alias more PyInt* symbols on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 30112 diff changeset	24 #define PyInt_Check PyLong_Check
30112 9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	25 #define PyInt_FromLong PyLong_FromLong
30169 5f7151e6de85 parsers: alias more PyInt* symbols on Python 3 Gregory Szorc <gregory.szorc@gmail.com> parents: 30112 diff changeset	26 #define PyInt_FromSsize_t PyLong_FromSsize_t
30112 9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	27 #define PyInt_AsLong PyLong_AsLong
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	28 #endif
9b6ff0f940ed parsers: move PyInt aliasing out of util.h Gregory Szorc <gregory.szorc@gmail.com> parents: 30103 diff changeset	29
32386 7640584e697c cext: mark constant variables Yuya Nishihara <yuya@tcha.org> parents: 32384 diff changeset	30 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	31
47514 559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	32 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	33 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	34 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	35
25584 72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	36 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	37 {
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	38 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	39
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	40 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	41 return NULL;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	42 }
25584 72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	43
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	44 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	45 }
72b2711f12ea parsers: add an API to create a new presized dict Siddharth Agarwal <sid0@fb.com> parents: 25583 diff changeset	46
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	47 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	48 PyObject *kwds)
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	49 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	50 /* 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	51 * dirstate_item is immutable. */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	52 dirstateItemObject *t;
47895 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	53 int wc_tracked;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	54 int p1_tracked;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	55 int p2_tracked;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	56 int merged;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	57 int clean_p1;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	58 int clean_p2;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	59 int possibly_dirty;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	60 PyObject *parentfiledata;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	61 static char *keywords_name[] = {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	62 "wc_tracked", "p1_tracked", "p2_tracked",
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	63 "merged", "clean_p1", "clean_p2",
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	64 "possibly_dirty", "parentfiledata", NULL,
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	65 };
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	66 wc_tracked = 0;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	67 p1_tracked = 0;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	68 p2_tracked = 0;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	69 merged = 0;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	70 clean_p1 = 0;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	71 clean_p2 = 0;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	72 possibly_dirty = 0;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	73 parentfiledata = Py_None;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	74 if (!PyArg_ParseTupleAndKeywords(args, kwds, "iiiiiiiO", keywords_name,
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	75 &wc_tracked, &p1_tracked, &p2_tracked,
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	76 &merged, &clean_p1, &clean_p2,
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	77 &possibly_dirty, &parentfiledata
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	78
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	79 )) {
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 }
47895 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	82 if (merged && (clean_p1 \|\| clean_p2)) {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	83 PyErr_SetString(PyExc_RuntimeError,
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	84 "`merged` argument incompatible with "
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	85 "`clean_p1`/`clean_p2`");
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	86 return NULL;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	87 }
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	88 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	89 if (!t) {
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	90 return NULL;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	91 }
47895 22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	92 t->state = 'r';
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	93 t->mode = 0;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	94 t->size = dirstate_v1_nonnormal;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	95 t->mtime = ambiguous_time;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	96 if (!(p1_tracked \|\| p2_tracked \|\| wc_tracked)) {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	97 /* Nothing special to do, file is untracked */
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	98 } else if (merged) {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	99 t->state = 'm';
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	100 t->size = dirstate_v1_from_p2;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	101 t->mtime = ambiguous_time;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	102 } else if (!(p1_tracked \|\| p2_tracked) && wc_tracked) {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	103 t->state = 'a';
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	104 t->size = dirstate_v1_nonnormal;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	105 t->mtime = ambiguous_time;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	106 } else if ((p1_tracked \|\| p2_tracked) && !wc_tracked) {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	107 t->state = 'r';
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	108 t->size = 0;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	109 t->mtime = 0;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	110 } else if (clean_p2 && wc_tracked) {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	111 t->state = 'n';
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	112 t->size = dirstate_v1_from_p2;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	113 t->mtime = ambiguous_time;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	114 } else if (!p1_tracked && p2_tracked && wc_tracked) {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	115 t->state = 'n';
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	116 t->size = dirstate_v1_from_p2;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	117 t->mtime = ambiguous_time;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	118 } else if (possibly_dirty) {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	119 t->state = 'n';
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	120 t->size = dirstate_v1_nonnormal;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	121 t->mtime = ambiguous_time;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	122 } else if (wc_tracked) {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	123 /* this is a "normal" file */
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	124 if (parentfiledata == Py_None) {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	125 PyErr_SetString(
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	126 PyExc_RuntimeError,
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	127 "failed to pass parentfiledata for a normal file");
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	128 return NULL;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	129 }
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	130 if (!PyTuple_CheckExact(parentfiledata)) {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	131 PyErr_SetString(
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	132 PyExc_TypeError,
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	133 "parentfiledata should be a Tuple or None");
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	134 return NULL;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	135 }
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	136 t->state = 'n';
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	137 t->mode =
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	138 (int)PyLong_AsLong(PyTuple_GetItem(parentfiledata, 0));
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	139 t->size =
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	140 (int)PyLong_AsLong(PyTuple_GetItem(parentfiledata, 1));
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	141 t->mtime =
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	142 (int)PyLong_AsLong(PyTuple_GetItem(parentfiledata, 2));
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	143 } else {
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	144 PyErr_SetString(PyExc_RuntimeError, "unreachable");
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	145 return NULL;
22c39f8acf78 dirstate-item: feed more information to `__init__` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47892 diff changeset	146 }
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	147 return (PyObject *)t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	148 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	149
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	150 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	151 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	152 PyObject_Del(o);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	153 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	154
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	155 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	156 {
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	157 return (self->state == 'a' \|\| self->state == 'm' \|\| self->state == 'n');
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	158 }
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	159
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	160 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	161 {
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	162 return (self->state == 'a');
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	163 }
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	164
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	165 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	166 {
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	167 return (self->state == 'r');
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	168 }
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 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	171 {
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	172 return (self->state == 'm');
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	173 }
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	174
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	175 static inline bool dirstate_item_c_merged_removed(dirstateItemObject *self)
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	176 {
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	177 return (self->state == 'r' && self->size == dirstate_v1_nonnormal);
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_from_p2(dirstateItemObject *self)
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	181 {
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	182 return (self->state == 'n' && self->size == dirstate_v1_from_p2);
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	183 }
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	184
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	185 static inline bool dirstate_item_c_from_p2_removed(dirstateItemObject *self)
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 return (self->state == 'r' && self->size == dirstate_v1_from_p2);
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	188 }
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	189
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	190 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	191 {
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	192 return self->state;
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
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	195 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	196 {
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	197 return self->mode;
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	198 }
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	199
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	200 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	201 {
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	202 return self->size;
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	203 }
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	204
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	205 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	206 {
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	207 return self->mtime;
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	208 }
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	209
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	210 static PyObject dirstate_item_v1_state(dirstateItemObject self)
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	211 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	212 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	213 return PyBytes_FromStringAndSize(&state, 1);
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	214 };
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	215
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	216 static PyObject dirstate_item_v1_mode(dirstateItemObject self)
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 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 return PyInt_FromLong(dirstate_item_c_v1_mode(self));
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	219 };
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	220
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	221 static PyObject dirstate_item_v1_size(dirstateItemObject self)
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	222 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	223 return PyInt_FromLong(dirstate_item_c_v1_size(self));
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	224 };
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	225
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	226 static PyObject dirstate_item_v1_mtime(dirstateItemObject self)
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	227 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	228 return PyInt_FromLong(dirstate_item_c_v1_mtime(self));
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	229 };
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	230
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	231 static PyObject dirstate_item_need_delay(dirstateItemObject self,
47532 ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	232 PyObject *value)
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	233 {
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	234 long now;
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	235 if (!pylong_to_long(value, &now)) {
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	236 return NULL;
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	237 }
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	238 if (dirstate_item_c_v1_state(self) == 'n' &&
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	239 dirstate_item_c_v1_mtime(self) == now) {
47532 ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	240 Py_RETURN_TRUE;
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	241 } else {
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	242 Py_RETURN_FALSE;
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	243 }
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	244 };
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	245
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	246 /* 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	247 */
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	248 static inline dirstateItemObject *
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	249 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	250 {
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	251 dirstateItemObject *t =
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	252 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	253 if (!t) {
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	254 return NULL;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	255 }
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	256 t->state = state;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	257 t->mode = mode;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	258 t->size = size;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	259 t->mtime = mtime;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	260 return t;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	261 }
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	262
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	263 /* This will never change since it's bound to V1, unlike `dirstate_item_new` */
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	264 static PyObject dirstate_item_from_v1_meth(PyTypeObject subtype,
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	265 PyObject *args)
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	266 {
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	267 /* We do all the initialization here and not a tp_init function because
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	268 * dirstate_item is immutable. */
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	269 char state;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	270 int size, mode, mtime;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	271 if (!PyArg_ParseTuple(args, "ciii", &state, &mode, &size, &mtime)) {
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	272 return NULL;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	273 }
47946 0919d66e279a dirstate-item: factor some code in the C implementation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47945 diff changeset	274 return (PyObject *)dirstate_item_from_v1_data(state, mode, size, mtime);
47665 a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	275 };
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	276
47905 c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	277 /* constructor to help legacy API to build a new "added" item
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	278
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	279 Should eventually be removed */
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	280 static PyObject dirstate_item_new_added(PyTypeObject subtype)
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	281 {
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	282 dirstateItemObject *t;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	283 t = (dirstateItemObject *)subtype->tp_alloc(subtype, 1);
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	284 if (!t) {
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	285 return NULL;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	286 }
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	287 t->state = 'a';
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	288 t->mode = 0;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	289 t->size = dirstate_v1_nonnormal;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	290 t->mtime = ambiguous_time;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	291 return (PyObject *)t;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	292 };
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	293
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	294 /* constructor to help legacy API to build a new "merged" item
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	295
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	296 Should eventually be removed */
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	297 static PyObject dirstate_item_new_merged(PyTypeObject subtype)
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	298 {
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	299 dirstateItemObject *t;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	300 t = (dirstateItemObject *)subtype->tp_alloc(subtype, 1);
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	301 if (!t) {
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	302 return NULL;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	303 }
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	304 t->state = 'm';
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	305 t->mode = 0;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	306 t->size = dirstate_v1_from_p2;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	307 t->mtime = ambiguous_time;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	308 return (PyObject *)t;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	309 };
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	310
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	311 /* constructor to help legacy API to build a new "from_p2" item
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	312
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	313 Should eventually be removed */
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	314 static PyObject dirstate_item_new_from_p2(PyTypeObject subtype)
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	315 {
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	316 /* We do all the initialization here and not a tp_init function because
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	317 * dirstate_item is immutable. */
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	318 dirstateItemObject *t;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	319 t = (dirstateItemObject *)subtype->tp_alloc(subtype, 1);
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	320 if (!t) {
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	321 return NULL;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	322 }
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	323 t->state = 'n';
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	324 t->mode = 0;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	325 t->size = dirstate_v1_from_p2;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	326 t->mtime = ambiguous_time;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	327 return (PyObject *)t;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	328 };
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	329
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	330 /* constructor to help legacy API to build a new "possibly" item
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	331
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	332 Should eventually be removed */
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	333 static PyObject dirstate_item_new_possibly_dirty(PyTypeObject subtype)
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	334 {
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	335 /* We do all the initialization here and not a tp_init function because
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	336 * dirstate_item is immutable. */
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	337 dirstateItemObject *t;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	338 t = (dirstateItemObject *)subtype->tp_alloc(subtype, 1);
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	339 if (!t) {
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	340 return NULL;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	341 }
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	342 t->state = 'n';
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	343 t->mode = 0;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	344 t->size = dirstate_v1_nonnormal;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	345 t->mtime = ambiguous_time;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	346 return (PyObject *)t;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	347 };
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	348
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	349 /* constructor to help legacy API to build a new "normal" item
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	350
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	351 Should eventually be removed */
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	352 static PyObject dirstate_item_new_normal(PyTypeObject subtype, PyObject *args)
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	353 {
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	354 /* We do all the initialization here and not a tp_init function because
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	355 * dirstate_item is immutable. */
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	356 dirstateItemObject *t;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	357 int size, mode, mtime;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	358 if (!PyArg_ParseTuple(args, "iii", &mode, &size, &mtime)) {
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	359 return NULL;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	360 }
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	361
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	362 t = (dirstateItemObject *)subtype->tp_alloc(subtype, 1);
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	363 if (!t) {
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	364 return NULL;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	365 }
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	366 t->state = 'n';
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	367 t->mode = mode;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	368 t->size = size;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	369 t->mtime = mtime;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	370 return (PyObject *)t;
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	371 };
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	372
47666 e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	373 /* 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	374 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	375 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	376 {
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	377 self->mtime = ambiguous_time;
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	378 Py_RETURN_NONE;
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	379 }
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	380
47890 3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	381 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	382 {
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	383 if (self->state == 'm') {
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	384 self->size = dirstate_v1_nonnormal;
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	385 } else if (self->state == 'n' && self->size == dirstate_v1_from_p2) {
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	386 self->size = dirstate_v1_from_p2;
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	387 } else {
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	388 self->size = 0;
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	389 }
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	390 self->state = 'r';
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	391 self->mode = 0;
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	392 self->mtime = 0;
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	393 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	394 }
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	395
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	396 static PyMethodDef dirstate_item_methods[] = {
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	397 {"v1_state", (PyCFunction)dirstate_item_v1_state, METH_NOARGS,
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	398 "return a \"state\" suitable for v1 serialization"},
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	399 {"v1_mode", (PyCFunction)dirstate_item_v1_mode, METH_NOARGS,
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	400 "return a \"mode\" suitable for v1 serialization"},
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	401 {"v1_size", (PyCFunction)dirstate_item_v1_size, METH_NOARGS,
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	402 "return a \"size\" suitable for v1 serialization"},
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	403 {"v1_mtime", (PyCFunction)dirstate_item_v1_mtime, METH_NOARGS,
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	404 "return a \"mtime\" suitable for v1 serialization"},
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	405 {"need_delay", (PyCFunction)dirstate_item_need_delay, METH_O,
47532 ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	406 "True if the stored mtime would be ambiguous with the current time"},
47892 32aa80a8d162 dirstate-item: fix the declaration of the Cext `from_v1_meth` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47891 diff changeset	407 {"from_v1_data", (PyCFunction)dirstate_item_from_v1_meth,
32aa80a8d162 dirstate-item: fix the declaration of the Cext `from_v1_meth` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47891 diff changeset	408 METH_VARARGS \| METH_CLASS, "build a new DirstateItem object from V1 data"},
47905 c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	409 {"new_added", (PyCFunction)dirstate_item_new_added,
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	410 METH_NOARGS \| METH_CLASS,
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	411 "constructor to help legacy API to build a new \"added\" item"},
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	412 {"new_merged", (PyCFunction)dirstate_item_new_merged,
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	413 METH_NOARGS \| METH_CLASS,
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	414 "constructor to help legacy API to build a new \"merged\" item"},
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	415 {"new_from_p2", (PyCFunction)dirstate_item_new_from_p2,
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	416 METH_NOARGS \| METH_CLASS,
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	417 "constructor to help legacy API to build a new \"from_p2\" item"},
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	418 {"new_possibly_dirty", (PyCFunction)dirstate_item_new_possibly_dirty,
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	419 METH_NOARGS \| METH_CLASS,
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	420 "constructor to help legacy API to build a new \"possibly_dirty\" item"},
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	421 {"new_normal", (PyCFunction)dirstate_item_new_normal,
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	422 METH_VARARGS \| METH_CLASS,
c0d6a59a7704 dirstate-item: add dedicated "legacy" constructor for `addfile` case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47895 diff changeset	423 "constructor to help legacy API to build a new \"normal\" item"},
47666 e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	424 {"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	425 METH_NOARGS, "mark a file as \"possibly dirty\""},
47890 3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	426 {"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	427 "mark a file as \"untracked\""},
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	428 {NULL} /* Sentinel */
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	429 };
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	430
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	431 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	432 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	433 return PyInt_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	434 };
8e4b9fe31334 dirstate-entry: add a `mode` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47532 diff changeset	435
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	436 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	437 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	438 return PyInt_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	439 };
0e5800c88eb4 dirstate-entry: add a `size` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47536 diff changeset	440
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	441 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	442 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	443 return PyInt_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	444 };
77fce401a2bb dirstate-entry: add a `mtime` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47537 diff changeset	445
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	446 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	447 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	448 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	449 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	450 };
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	451
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	452 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	453 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	454 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	455 Py_RETURN_TRUE;
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	456 } else {
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	457 Py_RETURN_FALSE;
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	458 }
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	459 };
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	460
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	461 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	462 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	463 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	464 Py_RETURN_TRUE;
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	465 } else {
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	466 Py_RETURN_FALSE;
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	467 }
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	468 };
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	469
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	470 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	471 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	472 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	473 Py_RETURN_TRUE;
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	474 } else {
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	475 Py_RETURN_FALSE;
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	476 }
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	477 };
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	478
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	479 static PyObject dirstate_item_get_merged_removed(dirstateItemObject self)
47516 b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	480 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	481 if (dirstate_item_c_merged_removed(self)) {
47516 b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	482 Py_RETURN_TRUE;
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	483 } else {
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	484 Py_RETURN_FALSE;
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	485 }
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	486 };
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	487
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	488 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	489 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	490 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	491 Py_RETURN_TRUE;
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	492 } else {
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	493 Py_RETURN_FALSE;
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	494 }
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	495 };
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	496
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	497 static PyObject dirstate_item_get_from_p2_removed(dirstateItemObject self)
47516 b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	498 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	499 if (dirstate_item_c_from_p2_removed(self)) {
47516 b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	500 Py_RETURN_TRUE;
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	501 } else {
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	502 Py_RETURN_FALSE;
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	503 }
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	504 };
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	505
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	506 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	507 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	508 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	509 Py_RETURN_TRUE;
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	510 } else {
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	511 Py_RETURN_FALSE;
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	512 }
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	513 };
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	514
47891 37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	515 static PyObject dm_nonnormal(dirstateItemObject self)
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	516 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	517 if ((dirstate_item_c_v1_state(self) != 'n') \|\|
154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	518 (dirstate_item_c_v1_mtime(self) == ambiguous_time)) {
47891 37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	519 Py_RETURN_TRUE;
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	520 } else {
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	521 Py_RETURN_FALSE;
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	522 }
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	523 };
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	524 static PyObject dm_otherparent(dirstateItemObject self)
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	525 {
47947 154e4dcac68c dirstate-item: introduce low level C function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47946 diff changeset	526 if (dirstate_item_c_v1_mtime(self) == dirstate_v1_from_p2) {
47891 37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	527 Py_RETURN_TRUE;
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	528 } else {
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	529 Py_RETURN_FALSE;
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	530 }
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	531 };
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	532
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	533 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	534 {"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	535 {"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	536 {"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	537 {"state", (getter)dirstate_item_get_state, NULL, "state", NULL},
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	538 {"tracked", (getter)dirstate_item_get_tracked, NULL, "tracked", NULL},
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	539 {"added", (getter)dirstate_item_get_added, NULL, "added", NULL},
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	540 {"merged_removed", (getter)dirstate_item_get_merged_removed, NULL,
47516 b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	541 "merged_removed", NULL},
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	542 {"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	543 {"from_p2_removed", (getter)dirstate_item_get_from_p2_removed, NULL,
47516 b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	544 "from_p2_removed", NULL},
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	545 {"from_p2", (getter)dirstate_item_get_from_p2, NULL, "from_p2", NULL},
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	546 {"removed", (getter)dirstate_item_get_removed, NULL, "removed", NULL},
47891 37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	547 {"dm_nonnormal", (getter)dm_nonnormal, NULL, "dm_nonnormal", NULL},
37bffc450897 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47890 diff changeset	548 {"dm_otherparent", (getter)dm_otherparent, NULL, "dm_otherparent", NULL},
47512 769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	549 {NULL} /* Sentinel */
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	550 };
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	551
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	552 PyTypeObject dirstateItemType = {
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	553 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	554 "dirstate_tuple", /* tp_name */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	555 sizeof(dirstateItemObject), /* tp_basicsize */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	556 0, /* tp_itemsize */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	557 (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	558 0, /* tp_print */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	559 0, /* tp_getattr */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	560 0, /* tp_setattr */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	561 0, /* tp_compare */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	562 0, /* tp_repr */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	563 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	564 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	565 0, /* tp_as_mapping */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	566 0, /* tp_hash */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	567 0, /* tp_call */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	568 0, /* tp_str */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	569 0, /* tp_getattro */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	570 0, /* tp_setattro */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	571 0, /* tp_as_buffer */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	572 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	573 "dirstate tuple", /* tp_doc */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	574 0, /* tp_traverse */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	575 0, /* tp_clear */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	576 0, /* tp_richcompare */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	577 0, /* tp_weaklistoffset */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	578 0, /* tp_iter */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	579 0, /* tp_iternext */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	580 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	581 0, /* tp_members */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	582 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	583 0, /* tp_base */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	584 0, /* tp_dict */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	585 0, /* tp_descr_get */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	586 0, /* tp_descr_set */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	587 0, /* tp_dictoffset */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	588 0, /* tp_init */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	589 0, /* tp_alloc */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	590 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	591 };
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	592
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	593 static PyObject parse_dirstate(PyObject self, PyObject *args)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	594 {
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	595 PyObject dmap, cmap, parents = NULL, ret = NULL;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	596 PyObject fname = NULL, cname = NULL, *entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	597 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	598 int mode, size, mtime;
42068 896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	599 unsigned int flen, pos = 40;
896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	600 Py_ssize_t len = 40;
896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	601 Py_ssize_t readlen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	602
36620 186c6df3a373 py3: bulk-replace 'const char' format specifier passed to PyArg_ParseTuple() Yuya Nishihara <yuya@tcha.org> parents: 36619 diff changeset	603 if (!PyArg_ParseTuple(
186c6df3a373 py3: bulk-replace 'const char' format specifier passed to PyArg_ParseTuple() Yuya Nishihara <yuya@tcha.org> parents: 36619 diff changeset	604 args, PY23("O!O!s#:parse_dirstate", "O!O!y#:parse_dirstate"),
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	605 &PyDict_Type, &dmap, &PyDict_Type, &cmap, &str, &readlen)) {
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	606 goto quit;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	607 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	608
22403 41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	609 len = readlen;
41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	610
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	611 /* 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	612 if (len < 40) {
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	613 PyErr_SetString(PyExc_ValueError,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	614 "too little data for parents");
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	615 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	616 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	617
42096 509a0477b3a6 cext: cast s# arguments of Py_BuildValue() to Py_ssize_t Yuya Nishihara <yuya@tcha.org> parents: 42068 diff changeset	618 parents = Py_BuildValue(PY23("s#s#", "y#y#"), str, (Py_ssize_t)20,
509a0477b3a6 cext: cast s# arguments of Py_BuildValue() to Py_ssize_t Yuya Nishihara <yuya@tcha.org> parents: 42068 diff changeset	619 str + 20, (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	620 if (!parents) {
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	621 goto quit;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	622 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	623
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	624 /* read filenames */
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	625 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	626 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	627 PyErr_SetString(PyExc_ValueError,
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	628 "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	629 goto quit;
f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	630 }
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	631 cur = str + pos;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	632 /* unpack header */
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	633 state = *cur;
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	634 mode = getbe32(cur + 1);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	635 size = getbe32(cur + 5);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	636 mtime = getbe32(cur + 9);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	637 flen = getbe32(cur + 13);
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	638 pos += 17;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	639 cur += 17;
20316 40f08c31844c parsers: fix 'unsigned expression is always true' warning (issue4142) David Soria Parra <davidsp@fb.com> parents: 20169 diff changeset	640 if (flen > len - pos) {
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	641 PyErr_SetString(PyExc_ValueError,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	642 "overflow in dirstate");
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	643 goto quit;
7174 4da87407b845 parsers.c: fix integer overflows Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7168 diff changeset	644 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	645
47665 a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	646 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	647 size, mtime);
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	648 cpos = memchr(cur, 0, flen);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	649 if (cpos) {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	650 fname = PyBytes_FromStringAndSize(cur, cpos - cur);
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	651 cname = PyBytes_FromStringAndSize(
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	652 cpos + 1, flen - (cpos - cur) - 1);
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	653 if (!fname \|\| !cname \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	654 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	655 PyDict_SetItem(dmap, fname, entry) == -1) {
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	656 goto quit;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	657 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	658 Py_DECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	659 } else {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	660 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	661 if (!fname \|\|
763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	662 PyDict_SetItem(dmap, fname, entry) == -1) {
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	663 goto quit;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	664 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	665 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	666 Py_DECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	667 Py_DECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	668 fname = cname = entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	669 pos += flen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	670 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	671
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	672 ret = parents;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	673 Py_INCREF(ret);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	674 quit:
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	675 Py_XDECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	676 Py_XDECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	677 Py_XDECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	678 Py_XDECREF(parents);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	679 return ret;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	680 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	681
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	682 /*
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	683 * Build a set of non-normal and other parent entries from the dirstate dmap
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	684 */
34440 7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	685 static PyObject nonnormalotherparententries(PyObject self, PyObject *args)
7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	686 {
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	687 PyObject dmap, fname, *v;
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	688 PyObject nonnset = NULL, otherpset = NULL, *result = NULL;
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	689 Py_ssize_t pos;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	690
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	691 if (!PyArg_ParseTuple(args, "O!:nonnormalentries", &PyDict_Type,
763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	692 &dmap)) {
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	693 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	694 }
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	695
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	696 nonnset = PySet_New(NULL);
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	697 if (nonnset == NULL) {
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	698 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	699 }
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	700
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	701 otherpset = PySet_New(NULL);
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	702 if (otherpset == NULL) {
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	703 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	704 }
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	705
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	706 pos = 0;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	707 while (PyDict_Next(dmap, &pos, &fname, &v)) {
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	708 dirstateItemObject *t;
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	709 if (!dirstate_tuple_check(v)) {
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	710 PyErr_SetString(PyExc_TypeError,
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	711 "expected a dirstate tuple");
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	712 goto bail;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	713 }
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	714 t = (dirstateItemObject *)v;
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	715
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	716 if (t->state == 'n' && t->size == -2) {
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	717 if (PySet_Add(otherpset, fname) == -1) {
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	718 goto bail;
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	719 }
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	720 }
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	721
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	722 if (t->state == 'n' && t->mtime != -1) {
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	723 continue;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	724 }
763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	725 if (PySet_Add(nonnset, fname) == -1) {
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	726 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	727 }
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	728 }
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	729
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	730 result = Py_BuildValue("(OO)", nonnset, otherpset);
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	731 if (result == NULL) {
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	732 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	733 }
31291 fffd1abb1337 parsers: avoid leak of nonnset and otherpset Augie Fackler <augie@google.com> parents: 31278 diff changeset	734 Py_DECREF(nonnset);
fffd1abb1337 parsers: avoid leak of nonnset and otherpset Augie Fackler <augie@google.com> parents: 31278 diff changeset	735 Py_DECREF(otherpset);
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	736 return result;
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	737 bail:
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	738 Py_XDECREF(nonnset);
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	739 Py_XDECREF(otherpset);
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	740 Py_XDECREF(result);
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	741 return NULL;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	742 }
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	743
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	744 /*
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	745 * 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	746 */
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	747 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	748 {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	749 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	750 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	751 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	752 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	753 char p, s;
26630 3111b45a2bbf parsers: make pack_dirstate take now in integer for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26591 diff changeset	754 int now;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	755
39422 adacefb0b7ea dirstate: use tuple interface to fix leak in pack_dirstate() Yuya Nishihara <yuya@tcha.org> parents: 37968 diff changeset	756 if (!PyArg_ParseTuple(args, "O!O!O!i:pack_dirstate", &PyDict_Type, &map,
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	757 &PyDict_Type, &copymap, &PyTuple_Type, &pl,
763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	758 &now)) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	759 return NULL;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	760 }
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	761
39422 adacefb0b7ea dirstate: use tuple interface to fix leak in pack_dirstate() Yuya Nishihara <yuya@tcha.org> parents: 37968 diff changeset	762 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	763 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	764 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	765 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	766
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	767 /* 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	768 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	769 PyObject *c;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	770 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	771 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	772 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	773 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	774 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	775 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	776 if (c) {
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	777 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	778 PyErr_SetString(PyExc_TypeError,
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	779 "expected string key");
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	780 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	781 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	782 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	783 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	784 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	785
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	786 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	787 if (packobj == NULL) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	788 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	789 }
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	790
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	791 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	792
39422 adacefb0b7ea dirstate: use tuple interface to fix leak in pack_dirstate() Yuya Nishihara <yuya@tcha.org> parents: 37968 diff changeset	793 pn = PyTuple_GET_ITEM(pl, 0);
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	794 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	795 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	796 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	797 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	798 memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	799 p += 20;
39422 adacefb0b7ea dirstate: use tuple interface to fix leak in pack_dirstate() Yuya Nishihara <yuya@tcha.org> parents: 37968 diff changeset	800 pn = PyTuple_GET_ITEM(pl, 1);
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	801 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	802 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	803 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	804 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	805 memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	806 p += 20;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	807
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	808 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	809 dirstateItemObject *tuple;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	810 char state;
26774 04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	811 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	812 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	813 PyObject *o;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	814 char *t;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	815
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	816 if (!dirstate_tuple_check(v)) {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	817 PyErr_SetString(PyExc_TypeError,
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	818 "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	819 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	820 }
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	821 tuple = (dirstateItemObject *)v;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	822
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	823 state = tuple->state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	824 mode = tuple->mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	825 size = tuple->size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	826 mtime = tuple->mtime;
26630 3111b45a2bbf parsers: make pack_dirstate take now in integer for consistency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 26591 diff changeset	827 if (state == 'n' && mtime == now) {
18567 194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 18504 diff changeset	828 /* See pure/parsers.py:pack_dirstate for why we do
194e63c1ccb9 dirstate: move pure python dirstate packing to pure/parsers.py Siddharth Agarwal <sid0@fb.com> parents: 18504 diff changeset	829 * this. */
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	830 mtime = -1;
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	831 mtime_unset = (PyObject *)dirstate_item_from_v1_data(
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	832 state, mode, size, mtime);
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	833 if (!mtime_unset) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	834 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	835 }
763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	836 if (PyDict_SetItem(map, k, mtime_unset) == -1) {
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	837 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	838 }
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	839 Py_DECREF(mtime_unset);
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	840 mtime_unset = NULL;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	841 }
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	842 *p++ = state;
26774 04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	843 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	844 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	845 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	846 t = p + 12;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	847 p += 16;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	848 len = PyBytes_GET_SIZE(k);
c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	849 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	850 p += len;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	851 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	852 if (o) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	853 *p++ = '\0';
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	854 l = PyBytes_GET_SIZE(o);
c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	855 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	856 p += l;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	857 len += l + 1;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	858 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	859 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	860 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	861
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	862 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	863 if (pos != nbytes) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	864 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	865 (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	866 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	867 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	868
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	869 return packobj;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	870 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	871 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	872 Py_XDECREF(packobj);
23946 f3e94aa6e182 parsers: don't leak a tuple in pack_dirstate Augie Fackler <augie@google.com> parents: 23945 diff changeset	873 Py_XDECREF(v);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	874 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	875 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	876
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	877 #define BUMPED_FIX 1
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	878 #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	879 #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	880
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	881 static PyObject readshas(const char source, unsigned char num,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	882 Py_ssize_t hashwidth)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	883 {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	884 int i;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	885 PyObject *list = PyTuple_New(num);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	886 if (list == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	887 return NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	888 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	889 for (i = 0; i < num; i++) {
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	890 PyObject *hash = PyBytes_FromStringAndSize(source, hashwidth);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	891 if (hash == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	892 Py_DECREF(list);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	893 return NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	894 }
26213 4d6cdea33f37 parsers: use PyTuple_SET_ITEM() to fill new marker tuples Yuya Nishihara <yuya@tcha.org> parents: 26107 diff changeset	895 PyTuple_SET_ITEM(list, i, hash);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	896 source += hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	897 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	898 return list;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	899 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	900
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	901 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	902 uint32_t *msize)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	903 {
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	904 const char *data = databegin;
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	905 const char *meta;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	906
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	907 double mtime;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	908 int16_t tz;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	909 uint16_t flags;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	910 unsigned char nsuccs, nparents, nmetadata;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	911 Py_ssize_t hashwidth = 20;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	912
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	913 PyObject prec = NULL, parents = NULL, *succs = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	914 PyObject metadata = NULL, ret = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	915 int i;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	916
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	917 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	918 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	919 }
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	920
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	921 *msize = getbe32(data);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	922 data += 4;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	923 mtime = getbefloat64(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	924 data += 8;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	925 tz = getbeint16(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	926 data += 2;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	927 flags = getbeuint16(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	928 data += 2;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	929
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	930 if (flags & USING_SHA_256) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	931 hashwidth = 32;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	932 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	933
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	934 nsuccs = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	935 nparents = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	936 nmetadata = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	937
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	938 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	939 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	940 }
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	941 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	942
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	943 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	944 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	945 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	946 prec = PyBytes_FromStringAndSize(data, hashwidth);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	947 data += hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	948 if (prec == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	949 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	950 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	951
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	952 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	953 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	954 }
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	955 succs = readshas(data, nsuccs, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	956 if (succs == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	957 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	958 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	959 data += nsuccs * hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	960
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	961 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	962 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	963 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	964 }
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	965 parents = readshas(data, nparents, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	966 if (parents == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	967 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	968 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	969 data += nparents * hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	970 } else {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	971 parents = Py_None;
31426 43a7dfbead0c parsers: handle refcounting of "parents" consistently Gregory Szorc <gregory.szorc@gmail.com> parents: 31292 diff changeset	972 Py_INCREF(parents);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	973 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	974
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	975 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	976 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	977 }
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	978 meta = data + (2 * nmetadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	979 metadata = PyTuple_New(nmetadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	980 if (metadata == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	981 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	982 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	983 for (i = 0; i < nmetadata; i++) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	984 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	985 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	986 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	987 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	988 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	989 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	990 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	991 meta += leftsize;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	992 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	993 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	994 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	995 if (!left \|\| !right \|\| !tmp) {
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	996 Py_XDECREF(left);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	997 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	998 Py_XDECREF(tmp);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	999 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1000 }
26214 46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	1001 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	1002 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	1003 PyTuple_SET_ITEM(metadata, i, tmp);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1004 }
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1005 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	1006 (int)tz * 60, parents);
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1007 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	1008
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1009 overflow:
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1010 PyErr_SetString(PyExc_ValueError, "overflow in obsstore");
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1011 bail:
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1012 Py_XDECREF(prec);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1013 Py_XDECREF(succs);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1014 Py_XDECREF(metadata);
31426 43a7dfbead0c parsers: handle refcounting of "parents" consistently Gregory Szorc <gregory.szorc@gmail.com> parents: 31292 diff changeset	1015 Py_XDECREF(parents);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1016 return ret;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1017 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	1018
34440 7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	1019 static PyObject fm1readmarkers(PyObject self, PyObject *args)
7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	1020 {
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1021 const char data, dataend;
42068 896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	1022 Py_ssize_t datalen, offset, stop;
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1023 PyObject *markers = NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1024
36620 186c6df3a373 py3: bulk-replace 'const char' format specifier passed to PyArg_ParseTuple() Yuya Nishihara <yuya@tcha.org> parents: 36619 diff changeset	1025 if (!PyArg_ParseTuple(args, PY23("s#nn", "y#nn"), &data, &datalen,
186c6df3a373 py3: bulk-replace 'const char' format specifier passed to PyArg_ParseTuple() Yuya Nishihara <yuya@tcha.org> parents: 36619 diff changeset	1026 &offset, &stop)) {
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1027 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1028 }
41016 5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1029 if (offset < 0) {
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1030 PyErr_SetString(PyExc_ValueError,
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1031 "invalid negative offset in fm1readmarkers");
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1032 return NULL;
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1033 }
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1034 if (stop > datalen) {
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1035 PyErr_SetString(
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1036 PyExc_ValueError,
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1037 "stop longer than data length in fm1readmarkers");
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1038 return NULL;
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	1039 }
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	1040 dataend = data + datalen;
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1041 data += offset;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1042 markers = PyList_New(0);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1043 if (!markers) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1044 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1045 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1046 while (offset < stop) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1047 uint32_t msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1048 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	1049 PyObject *record = fm1readmarker(data, dataend, &msize);
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1050 if (!record) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1051 goto bail;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1052 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1053 error = PyList_Append(markers, record);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1054 Py_DECREF(record);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1055 if (error) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1056 goto bail;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1057 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1058 data += msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1059 offset += msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1060 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1061 return markers;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1062 bail:
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1063 Py_DECREF(markers);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1064 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1065 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	1066
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1067 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	1068
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	1069 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	1070 PyObject pathencode(PyObject self, PyObject *args);
18430 0459c6555f69 store: implement lowerencode in C Bryan O'Sullivan <bryano@fb.com> parents: 17616 diff changeset	1071 PyObject lowerencode(PyObject self, PyObject *args);
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 45131 diff changeset	1072 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	1073
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1074 static PyMethodDef methods[] = {
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1075 {"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	1076 {"nonnormalotherparententries", nonnormalotherparententries, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1077 "create a set containing non-normal and other parent entries of given "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1078 "dirstate\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1079 {"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	1080 {"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	1081 "parse a revlog index\n"},
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1082 {"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	1083 {"asciilower", asciilower, METH_VARARGS, "lowercase an ASCII string\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1084 {"asciiupper", asciiupper, METH_VARARGS, "uppercase an ASCII string\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1085 {"dict_new_presized", dict_new_presized, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1086 "construct a dict with an expected size\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1087 {"make_file_foldmap", make_file_foldmap, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1088 "make file foldmap\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1089 {"jsonescapeu8fast", jsonescapeu8fast, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1090 "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	1091 {"encodedir", encodedir, METH_VARARGS, "encodedir a path\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1092 {"pathencode", pathencode, METH_VARARGS, "fncache-encode a path\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1093 {"lowerencode", lowerencode, METH_VARARGS, "lower-encode a path\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1094 {"fm1readmarkers", fm1readmarkers, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1095 "parse v1 obsolete markers\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1096 {NULL, NULL}};
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1097
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	1098 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	1099 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	1100 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	1101
47268 9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47249 diff changeset	1102 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	1103
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1104 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	1105 {
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: 42096 diff changeset	1106 PyObject *capsule = NULL;
32360 af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	1107 PyModule_AddIntConstant(mod, "version", version);
af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	1108
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1109 /* 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	1110 * 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	1111 * 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	1112 * 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	1113 * 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	1114 * 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	1115 * 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	1116 * 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	1117 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	1118
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	1119 dirs_module_init(mod);
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: 24032 diff changeset	1120 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	1121 revlog_module_init(mod);
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	1122
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: 42096 diff changeset	1123 capsule = PyCapsule_New(
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	1124 dirstate_item_from_v1_data,
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	1125 "mercurial.cext.parsers.make_dirstate_item_CAPI", NULL);
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: 42096 diff changeset	1126 if (capsule != NULL)
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	1127 PyModule_AddObject(mod, "make_dirstate_item_CAPI", capsule);
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: 42096 diff changeset	1128
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	1129 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	1130 return;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1131 }
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	1132 Py_INCREF(&dirstateItemType);
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	1133 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	1134 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1135
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1136 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	1137 {
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	1138 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	1139 long hexversion;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1140 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	1141 return -1;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1142 }
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	1143 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	1144 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	1145 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	1146 return -1;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1147 }
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	1148 hexversion = PyInt_AsLong(ver);
5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	1149 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	1150 /* 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	1151 * 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	1152 * 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	1153 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	1154 PyErr_Format(PyExc_ImportError,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1155 "%s: The Mercurial extension "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1156 "modules were compiled with Python " PY_VERSION
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1157 ", but "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1158 "Mercurial is currently using Python with "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1159 "sys.hexversion=%ld: "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1160 "Python %s\n at: %s",
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1161 versionerrortext, hexversion, Py_GetVersion(),
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1162 Py_GetProgramFullPath());
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1163 return -1;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1164 }
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1165 return 0;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1166 }
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1167
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1168 #ifdef IS_PY3K
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1169 static struct PyModuleDef parsers_module = {PyModuleDef_HEAD_INIT, "parsers",
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	1170 parsers_doc, -1, methods};
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1171
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1172 PyMODINIT_FUNC PyInit_parsers(void)
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1173 {
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1174 PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1175
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1176 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	1177 return NULL;
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1178 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	1179 module_init(mod);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1180 return mod;
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1181 }
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1182 #else
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1183 PyMODINIT_FUNC initparsers(void)
0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1184 {
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1185 PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1186
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1187 if (check_python_version() == -1) {
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	1188 return;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1189 }
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1190 mod = Py_InitModule3("parsers", methods, parsers_doc);
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	1191 module_init(mod);
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	1192 }
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1193 #endif

Mercurial > public > mercurial-scm > hg

annotate mercurial/cext/parsers.c @ 47947:154e4dcac68c