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

annotate mercurial/cext/parsers.c @ 47890:3853e6ee160d

dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` All the other caller goes through `reset_state`, so we can safely have an explicit method on `DirstateItem` object. This means that all the logic to preserve the previous state (from p2, merged, etc) is now properly encapsulated within the DirstateItem. This pave the way to using different storage for these information. Differential Revision: https://phab.mercurial-scm.org/D11315

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Fri, 20 Aug 2021 11:27:01 +0200
parents	e43128ee436f
children	37bffc450897

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 inline dirstateItemObject *make_dirstate_item(char state, int mode,
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	48 int size, int mtime)
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	49 {
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	50 dirstateItemObject *t =
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	51 PyObject_New(dirstateItemObject, &dirstateItemType);
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	52 if (!t) {
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	53 return NULL;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	54 }
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	55 t->state = state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	56 t->mode = mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	57 t->size = size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	58 t->mtime = mtime;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	59 return t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	60 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	61
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	62 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	63 PyObject *kwds)
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	64 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	65 /* 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	66 * dirstate_item is immutable. */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	67 dirstateItemObject *t;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	68 char state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	69 int size, mode, mtime;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	70 if (!PyArg_ParseTuple(args, "ciii", &state, &mode, &size, &mtime)) {
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	71 return NULL;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	72 }
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	73
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	74 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	75 if (!t) {
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	76 return NULL;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	77 }
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	78 t->state = state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	79 t->mode = mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	80 t->size = size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	81 t->mtime = mtime;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	82
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	83 return (PyObject *)t;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	84 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	85
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	86 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	87 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	88 PyObject_Del(o);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	89 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	90
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	91 static Py_ssize_t dirstate_item_length(PyObject *o)
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	92 {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	93 return 4;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	94 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	95
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	96 static PyObject dirstate_item_item(PyObject o, Py_ssize_t i)
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	97 {
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	98 dirstateItemObject t = (dirstateItemObject )o;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	99 switch (i) {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	100 case 0:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	101 return PyBytes_FromStringAndSize(&t->state, 1);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	102 case 1:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	103 return PyInt_FromLong(t->mode);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	104 case 2:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	105 return PyInt_FromLong(t->size);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	106 case 3:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	107 return PyInt_FromLong(t->mtime);
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	108 default:
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	109 PyErr_SetString(PyExc_IndexError, "index out of range");
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	110 return NULL;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	111 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	112 }
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	113
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	114 static PySequenceMethods dirstate_item_sq = {
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	115 dirstate_item_length, /* sq_length */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	116 0, /* sq_concat */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	117 0, /* sq_repeat */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	118 dirstate_item_item, /* sq_item */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	119 0, /* sq_ass_item */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	120 0, /* sq_contains */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	121 0, /* sq_inplace_concat */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	122 0 /* sq_inplace_repeat */
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	123 };
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	124
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	125 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	126 {
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	127 return PyBytes_FromStringAndSize(&self->state, 1);
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	128 };
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	129
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	130 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	131 {
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	132 return PyInt_FromLong(self->mode);
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	133 };
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	134
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	135 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	136 {
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	137 return PyInt_FromLong(self->size);
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	138 };
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	139
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	140 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	141 {
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	142 return PyInt_FromLong(self->mtime);
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	143 };
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	144
47685 265cdfaad372 dirstate-item: introduce a `dm_nonnormal` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47666 diff changeset	145 static PyObject dm_nonnormal(dirstateItemObject self)
265cdfaad372 dirstate-item: introduce a `dm_nonnormal` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47666 diff changeset	146 {
265cdfaad372 dirstate-item: introduce a `dm_nonnormal` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47666 diff changeset	147 if (self->state != 'n' \|\| self->mtime == ambiguous_time) {
265cdfaad372 dirstate-item: introduce a `dm_nonnormal` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47666 diff changeset	148 Py_RETURN_TRUE;
265cdfaad372 dirstate-item: introduce a `dm_nonnormal` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47666 diff changeset	149 } else {
265cdfaad372 dirstate-item: introduce a `dm_nonnormal` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47666 diff changeset	150 Py_RETURN_FALSE;
265cdfaad372 dirstate-item: introduce a `dm_nonnormal` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47666 diff changeset	151 }
265cdfaad372 dirstate-item: introduce a `dm_nonnormal` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47666 diff changeset	152 };
47686 e43128ee436f dirstate-item: introduce a `dm_otherparent` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47685 diff changeset	153 static PyObject dm_otherparent(dirstateItemObject self)
e43128ee436f dirstate-item: introduce a `dm_otherparent` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47685 diff changeset	154 {
e43128ee436f dirstate-item: introduce a `dm_otherparent` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47685 diff changeset	155 if (self->size == dirstate_v1_from_p2) {
e43128ee436f dirstate-item: introduce a `dm_otherparent` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47685 diff changeset	156 Py_RETURN_TRUE;
e43128ee436f dirstate-item: introduce a `dm_otherparent` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47685 diff changeset	157 } else {
e43128ee436f dirstate-item: introduce a `dm_otherparent` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47685 diff changeset	158 Py_RETURN_FALSE;
e43128ee436f dirstate-item: introduce a `dm_otherparent` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47685 diff changeset	159 }
e43128ee436f dirstate-item: introduce a `dm_otherparent` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47685 diff changeset	160 };
47685 265cdfaad372 dirstate-item: introduce a `dm_nonnormal` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47666 diff changeset	161
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	162 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	163 PyObject *value)
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	164 {
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	165 long now;
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	166 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	167 return NULL;
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	168 }
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	169 if (self->state == 'n' && self->mtime == now) {
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	170 Py_RETURN_TRUE;
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	171 } else {
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	172 Py_RETURN_FALSE;
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	173 }
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	174 };
ccbabaee5c36 dirstate-entry: add a `need_delay` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47531 diff changeset	175
47665 a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	176 /* This will never change since it's bound to V1, unlike `make_dirstate_item`
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	177 */
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	178 static inline dirstateItemObject *
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	179 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	180 {
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	181 dirstateItemObject *t =
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	182 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	183 if (!t) {
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	184 return NULL;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	185 }
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	186 t->state = state;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	187 t->mode = mode;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	188 t->size = size;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	189 t->mtime = mtime;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	190 return t;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	191 }
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	192
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	193 /* 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	194 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	195 PyObject *args)
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	196 {
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	197 /* 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	198 * 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	199 dirstateItemObject *t;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	200 char state;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	201 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	202 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	203 return NULL;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	204 }
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	205
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	206 t = (dirstateItemObject *)subtype->tp_alloc(subtype, 1);
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	207 if (!t) {
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	208 return NULL;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	209 }
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	210 t->state = state;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	211 t->mode = mode;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	212 t->size = size;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	213 t->mtime = mtime;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	214
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	215 return (PyObject *)t;
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	216 };
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	217
47666 e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	218 /* 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	219 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	220 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	221 {
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	222 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	223 Py_RETURN_NONE;
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	224 }
e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	225
47890 3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	226 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	227 {
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	228 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	229 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	230 } 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	231 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	232 } else {
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	233 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	234 }
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	235 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	236 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	237 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	238 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	239 }
3853e6ee160d dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47686 diff changeset	240
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	241 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	242 {"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	243 "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	244 {"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	245 "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	246 {"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	247 "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	248 {"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	249 "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	250 {"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	251 "True if the stored mtime would be ambiguous with the current time"},
47665 a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	252 {"from_v1_data", (PyCFunction)dirstate_item_from_v1_meth, METH_O,
a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	253 "build a new DirstateItem object from V1 data"},
47666 e53256a9f9c5 dirstate-item: add a `set_possibly_dirty` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47665 diff changeset	254 {"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	255 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	256 {"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	257 "mark a file as \"untracked\""},
47685 265cdfaad372 dirstate-item: introduce a `dm_nonnormal` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47666 diff changeset	258 {"dm_nonnormal", (PyCFunction)dm_nonnormal, METH_NOARGS,
265cdfaad372 dirstate-item: introduce a `dm_nonnormal` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47666 diff changeset	259 "True is the entry is non-normal in the dirstatemap sense"},
47686 e43128ee436f dirstate-item: introduce a `dm_otherparent` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47685 diff changeset	260 {"dm_otherparent", (PyCFunction)dm_otherparent, METH_NOARGS,
e43128ee436f dirstate-item: introduce a `dm_otherparent` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47685 diff changeset	261 "True is the entry is `otherparent` in the dirstatemap sense"},
47509 80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	262 {NULL} /* Sentinel */
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	263 };
80dc1d452993 dirstate-entry: introduce dedicated accessors for v1 serialization Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47268 diff changeset	264
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	265 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	266 {
8e4b9fe31334 dirstate-entry: add a `mode` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47532 diff changeset	267 return PyInt_FromLong(self->mode);
8e4b9fe31334 dirstate-entry: add a `mode` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47532 diff changeset	268 };
8e4b9fe31334 dirstate-entry: add a `mode` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47532 diff changeset	269
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	270 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	271 {
0e5800c88eb4 dirstate-entry: add a `size` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47536 diff changeset	272 return PyInt_FromLong(self->size);
0e5800c88eb4 dirstate-entry: add a `size` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47536 diff changeset	273 };
0e5800c88eb4 dirstate-entry: add a `size` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47536 diff changeset	274
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	275 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	276 {
77fce401a2bb dirstate-entry: add a `mtime` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47537 diff changeset	277 return PyInt_FromLong(self->mtime);
77fce401a2bb dirstate-entry: add a `mtime` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47537 diff changeset	278 };
77fce401a2bb dirstate-entry: add a `mtime` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47537 diff changeset	279
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	280 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	281 {
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	282 return PyBytes_FromStringAndSize(&self->state, 1);
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	283 };
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	284
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	285 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	286 {
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	287 if (self->state == 'a' \|\| self->state == 'm' \|\| self->state == 'n') {
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	288 Py_RETURN_TRUE;
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	289 } else {
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	290 Py_RETURN_FALSE;
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	291 }
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	292 };
f5b8f0b9c129 dirstate-entry: add a `tracked` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47526 diff changeset	293
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	294 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	295 {
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	296 if (self->state == 'a') {
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	297 Py_RETURN_TRUE;
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	298 } else {
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	299 Py_RETURN_FALSE;
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	300 }
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	301 };
8bcae9bf9e8d dirstate-entry: add a `added` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47517 diff changeset	302
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	303 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	304 {
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	305 if (self->state == 'm') {
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	306 Py_RETURN_TRUE;
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	307 } else {
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	308 Py_RETURN_FALSE;
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	309 }
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	310 };
10e740292dff dirstate-entry: add a `merged` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47512 diff changeset	311
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	312 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	313 {
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	314 if (self->state == 'r' && self->size == dirstate_v1_nonnormal) {
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	315 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	316 } else {
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	317 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	318 }
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	319 };
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	320
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	321 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	322 {
47517 28632eb3ca3e dirstate-entry: restrict `from_p2` property to tracked file Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47516 diff changeset	323 if (self->state == 'n' && self->size == dirstate_v1_from_p2) {
47514 559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	324 Py_RETURN_TRUE;
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	325 } else {
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	326 Py_RETURN_FALSE;
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	327 }
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	328 };
559aee84b889 dirstate-entry: add a `from_p2` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47513 diff changeset	329
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	330 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	331 {
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	332 if (self->state == 'r' && self->size == dirstate_v1_from_p2) {
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	333 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	334 } else {
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	335 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	336 }
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	337 };
b8ffe85e399b dirstate-entry: `merged_removed` and `from_p2_removed` properties Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47515 diff changeset	338
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	339 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	340 {
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	341 if (self->state == 'r') {
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	342 Py_RETURN_TRUE;
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	343 } else {
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	344 Py_RETURN_FALSE;
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	345 }
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	346 };
c94d3ff46fd5 dirstate-entry: add a `removed` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47514 diff changeset	347
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	348 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	349 {"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	350 {"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	351 {"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	352 {"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	353 {"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	354 {"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	355 {"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	356 "merged_removed", NULL},
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	357 {"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	358 {"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	359 "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	360 {"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	361 {"removed", (getter)dirstate_item_get_removed, NULL, "removed", NULL},
47512 769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	362 {NULL} /* Sentinel */
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	363 };
769037a279ec dirstate-entry: add a `state` property (and use it) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47509 diff changeset	364
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	365 PyTypeObject dirstateItemType = {
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	366 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	367 "dirstate_tuple", /* tp_name */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	368 sizeof(dirstateItemObject), /* tp_basicsize */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	369 0, /* tp_itemsize */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	370 (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	371 0, /* tp_print */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	372 0, /* tp_getattr */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	373 0, /* tp_setattr */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	374 0, /* tp_compare */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	375 0, /* tp_repr */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	376 0, /* tp_as_number */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	377 &dirstate_item_sq, /* tp_as_sequence */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	378 0, /* tp_as_mapping */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	379 0, /* tp_hash */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	380 0, /* tp_call */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	381 0, /* tp_str */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	382 0, /* tp_getattro */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	383 0, /* tp_setattro */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	384 0, /* tp_as_buffer */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	385 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	386 "dirstate tuple", /* tp_doc */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	387 0, /* tp_traverse */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	388 0, /* tp_clear */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	389 0, /* tp_richcompare */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	390 0, /* tp_weaklistoffset */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	391 0, /* tp_iter */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	392 0, /* tp_iternext */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	393 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	394 0, /* tp_members */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	395 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	396 0, /* tp_base */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	397 0, /* tp_dict */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	398 0, /* tp_descr_get */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	399 0, /* tp_descr_set */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	400 0, /* tp_dictoffset */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	401 0, /* tp_init */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	402 0, /* tp_alloc */
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	403 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	404 };
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	405
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	406 static PyObject parse_dirstate(PyObject self, PyObject *args)
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	407 {
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	408 PyObject dmap, cmap, parents = NULL, ret = NULL;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	409 PyObject fname = NULL, cname = NULL, *entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	410 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	411 int mode, size, mtime;
42068 896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	412 unsigned int flen, pos = 40;
896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	413 Py_ssize_t len = 40;
896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	414 Py_ssize_t readlen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	415
36620 186c6df3a373 py3: bulk-replace 'const char' format specifier passed to PyArg_ParseTuple() Yuya Nishihara <yuya@tcha.org> parents: 36619 diff changeset	416 if (!PyArg_ParseTuple(
186c6df3a373 py3: bulk-replace 'const char' format specifier passed to PyArg_ParseTuple() Yuya Nishihara <yuya@tcha.org> parents: 36619 diff changeset	417 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	418 &PyDict_Type, &dmap, &PyDict_Type, &cmap, &str, &readlen)) {
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	419 goto quit;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	420 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	421
22403 41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	422 len = readlen;
41e9d58ec56f parsers: avoid signed/unsigned comparison mismatch Henrik Stuart <hg@hstuart.dk> parents: 22402 diff changeset	423
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	424 /* 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	425 if (len < 40) {
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	426 PyErr_SetString(PyExc_ValueError,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	427 "too little data for parents");
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	428 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	429 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	430
42096 509a0477b3a6 cext: cast s# arguments of Py_BuildValue() to Py_ssize_t Yuya Nishihara <yuya@tcha.org> parents: 42068 diff changeset	431 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	432 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	433 if (!parents) {
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	434 goto quit;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	435 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	436
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	437 /* read filenames */
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	438 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	439 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	440 PyErr_SetString(PyExc_ValueError,
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	441 "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	442 goto quit;
f5e8cb813a4d parsers: fix parse_dirstate to check len before unpacking header (issue4979) Yuya Nishihara <yuya@tcha.org> parents: 26872 diff changeset	443 }
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	444 cur = str + pos;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	445 /* unpack header */
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	446 state = *cur;
16437 d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	447 mode = getbe32(cur + 1);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	448 size = getbe32(cur + 5);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	449 mtime = getbe32(cur + 9);
d126a0d16856 util.h: replace ntohl/htonl with get/putbe32 Matt Mackall <mpm@selenic.com> parents: 16414 diff changeset	450 flen = getbe32(cur + 13);
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	451 pos += 17;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	452 cur += 17;
20316 40f08c31844c parsers: fix 'unsigned expression is always true' warning (issue4142) David Soria Parra <davidsp@fb.com> parents: 20169 diff changeset	453 if (flen > len - pos) {
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	454 PyErr_SetString(PyExc_ValueError,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	455 "overflow in dirstate");
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	456 goto quit;
7174 4da87407b845 parsers.c: fix integer overflows Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7168 diff changeset	457 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	458
47665 a4443f66be6a dirstate-item: add a `from_v1_data` constructor Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	459 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	460 size, mtime);
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	461 cpos = memchr(cur, 0, flen);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	462 if (cpos) {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	463 fname = PyBytes_FromStringAndSize(cur, cpos - cur);
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	464 cname = PyBytes_FromStringAndSize(
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	465 cpos + 1, flen - (cpos - cur) - 1);
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	466 if (!fname \|\| !cname \|\|
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	467 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	468 PyDict_SetItem(dmap, fname, entry) == -1) {
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	469 goto quit;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	470 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	471 Py_DECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	472 } else {
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	473 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	474 if (!fname \|\|
763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	475 PyDict_SetItem(dmap, fname, entry) == -1) {
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	476 goto quit;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	477 }
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	478 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	479 Py_DECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	480 Py_DECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	481 fname = cname = entry = NULL;
20167 09e41ac6289d mpatch: rewrite pointer overflow checks Matt Mackall <mpm@selenic.com> parents: 20109 diff changeset	482 pos += flen;
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	483 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	484
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	485 ret = parents;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	486 Py_INCREF(ret);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	487 quit:
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	488 Py_XDECREF(fname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	489 Py_XDECREF(cname);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	490 Py_XDECREF(entry);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	491 Py_XDECREF(parents);
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	492 return ret;
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	493 }
16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7092 diff changeset	494
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	495 /*
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	496 * 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	497 */
34440 7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	498 static PyObject nonnormalotherparententries(PyObject self, PyObject *args)
7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	499 {
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	500 PyObject dmap, fname, *v;
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	501 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	502 Py_ssize_t pos;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	503
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	504 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	505 &dmap)) {
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	506 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	507 }
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	508
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	509 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	510 if (nonnset == NULL) {
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	511 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	512 }
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	513
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	514 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	515 if (otherpset == NULL) {
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	516 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	517 }
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	518
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	519 pos = 0;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	520 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	521 dirstateItemObject *t;
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	522 if (!dirstate_tuple_check(v)) {
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	523 PyErr_SetString(PyExc_TypeError,
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	524 "expected a dirstate tuple");
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	525 goto bail;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	526 }
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	527 t = (dirstateItemObject *)v;
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	528
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	529 if (t->state == 'n' && t->size == -2) {
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	530 if (PySet_Add(otherpset, fname) == -1) {
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	531 goto bail;
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	532 }
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	533 }
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	534
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	535 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	536 continue;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	537 }
763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	538 if (PySet_Add(nonnset, fname) == -1) {
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	539 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	540 }
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	541 }
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	542
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	543 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	544 if (result == NULL) {
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	545 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	546 }
31291 fffd1abb1337 parsers: avoid leak of nonnset and otherpset Augie Fackler <augie@google.com> parents: 31278 diff changeset	547 Py_DECREF(nonnset);
fffd1abb1337 parsers: avoid leak of nonnset and otherpset Augie Fackler <augie@google.com> parents: 31278 diff changeset	548 Py_DECREF(otherpset);
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	549 return result;
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	550 bail:
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	551 Py_XDECREF(nonnset);
31278 1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	552 Py_XDECREF(otherpset);
1c97a91a18dc dirstate: track otherparent files same as nonnormal Durham Goode <durham@fb.com> parents: 30577 diff changeset	553 Py_XDECREF(result);
27592 7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	554 return NULL;
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	555 }
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	556
7c9eb2927879 dirstate: add a C implementation for nonnormalentries Laurent Charignon <lcharignon@fb.com> parents: 27410 diff changeset	557 /*
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	558 * 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	559 */
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	560 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	561 {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	562 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	563 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	564 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	565 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	566 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	567 int now;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	568
39422 adacefb0b7ea dirstate: use tuple interface to fix leak in pack_dirstate() Yuya Nishihara <yuya@tcha.org> parents: 37968 diff changeset	569 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	570 &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	571 &now)) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	572 return NULL;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	573 }
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	574
39422 adacefb0b7ea dirstate: use tuple interface to fix leak in pack_dirstate() Yuya Nishihara <yuya@tcha.org> parents: 37968 diff changeset	575 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	576 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	577 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	578 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	579
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	580 /* 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	581 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	582 PyObject *c;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	583 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	584 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	585 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	586 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	587 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	588 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	589 if (c) {
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	590 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	591 PyErr_SetString(PyExc_TypeError,
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	592 "expected string key");
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	593 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	594 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	595 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	596 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	597 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	598
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	599 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	600 if (packobj == NULL) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	601 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	602 }
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	603
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	604 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	605
39422 adacefb0b7ea dirstate: use tuple interface to fix leak in pack_dirstate() Yuya Nishihara <yuya@tcha.org> parents: 37968 diff changeset	606 pn = PyTuple_GET_ITEM(pl, 0);
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	607 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	608 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	609 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	610 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	611 memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	612 p += 20;
39422 adacefb0b7ea dirstate: use tuple interface to fix leak in pack_dirstate() Yuya Nishihara <yuya@tcha.org> parents: 37968 diff changeset	613 pn = PyTuple_GET_ITEM(pl, 1);
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	614 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	615 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	616 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	617 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	618 memcpy(p, s, l);
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	619 p += 20;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	620
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	621 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	622 dirstateItemObject *tuple;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	623 char state;
26774 04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	624 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	625 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	626 PyObject *o;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	627 char *t;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	628
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	629 if (!dirstate_tuple_check(v)) {
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	630 PyErr_SetString(PyExc_TypeError,
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	631 "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	632 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	633 }
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	634 tuple = (dirstateItemObject *)v;
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	635
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	636 state = tuple->state;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	637 mode = tuple->mode;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	638 size = tuple->size;
e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	639 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	640 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	641 /* 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	642 * 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	643 mtime = -1;
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	644 mtime_unset = (PyObject *)make_dirstate_item(
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	645 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	646 if (!mtime_unset) {
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	647 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	648 }
763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	649 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	650 goto bail;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	651 }
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	652 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	653 mtime_unset = NULL;
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	654 }
21809 e250b8300e6e parsers: inline fields of dirstate values in C version Siddharth Agarwal <sid0@fb.com> parents: 21807 diff changeset	655 *p++ = state;
26774 04ab2348efd1 parsers: correct type of temporary variables for dirstate tuple fields Yuya Nishihara <yuya@tcha.org> parents: 26630 diff changeset	656 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	657 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	658 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	659 t = p + 12;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	660 p += 16;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	661 len = PyBytes_GET_SIZE(k);
c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	662 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	663 p += len;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	664 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	665 if (o) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	666 *p++ = '\0';
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	667 l = PyBytes_GET_SIZE(o);
c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	668 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	669 p += l;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	670 len += l + 1;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	671 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	672 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	673 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	674
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	675 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	676 if (pos != nbytes) {
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	677 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	678 (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	679 goto bail;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	680 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	681
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	682 return packobj;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	683 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	684 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	685 Py_XDECREF(packobj);
23946 f3e94aa6e182 parsers: don't leak a tuple in pack_dirstate Augie Fackler <augie@google.com> parents: 23945 diff changeset	686 Py_XDECREF(v);
16955 92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	687 return NULL;
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	688 }
92e1c64ba0d4 parsers: add a C function to pack the dirstate Bryan O'Sullivan <bryano@fb.com> parents: 16863 diff changeset	689
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	690 #define BUMPED_FIX 1
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	691 #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	692 #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	693
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	694 static PyObject readshas(const char source, unsigned char num,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	695 Py_ssize_t hashwidth)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	696 {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	697 int i;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	698 PyObject *list = PyTuple_New(num);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	699 if (list == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	700 return NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	701 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	702 for (i = 0; i < num; i++) {
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	703 PyObject *hash = PyBytes_FromStringAndSize(source, hashwidth);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	704 if (hash == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	705 Py_DECREF(list);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	706 return NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	707 }
26213 4d6cdea33f37 parsers: use PyTuple_SET_ITEM() to fill new marker tuples Yuya Nishihara <yuya@tcha.org> parents: 26107 diff changeset	708 PyTuple_SET_ITEM(list, i, hash);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	709 source += hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	710 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	711 return list;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	712 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	713
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	714 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	715 uint32_t *msize)
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	716 {
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	717 const char *data = databegin;
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	718 const char *meta;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	719
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	720 double mtime;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	721 int16_t tz;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	722 uint16_t flags;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	723 unsigned char nsuccs, nparents, nmetadata;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	724 Py_ssize_t hashwidth = 20;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	725
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	726 PyObject prec = NULL, parents = NULL, *succs = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	727 PyObject metadata = NULL, ret = NULL;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	728 int i;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	729
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	730 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	731 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	732 }
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	733
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	734 *msize = getbe32(data);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	735 data += 4;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	736 mtime = getbefloat64(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	737 data += 8;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	738 tz = getbeint16(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	739 data += 2;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	740 flags = getbeuint16(data);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	741 data += 2;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	742
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	743 if (flags & USING_SHA_256) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	744 hashwidth = 32;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	745 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	746
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	747 nsuccs = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	748 nparents = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	749 nmetadata = (unsigned char)(*data++);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	750
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	751 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	752 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	753 }
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	754 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	755
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	756 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	757 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	758 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	759 prec = PyBytes_FromStringAndSize(data, hashwidth);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	760 data += hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	761 if (prec == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	762 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	763 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	764
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	765 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	766 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	767 }
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	768 succs = readshas(data, nsuccs, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	769 if (succs == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	770 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	771 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	772 data += nsuccs * hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	773
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	774 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	775 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	776 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	777 }
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	778 parents = readshas(data, nparents, hashwidth);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	779 if (parents == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	780 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	781 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	782 data += nparents * hashwidth;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	783 } else {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	784 parents = Py_None;
31426 43a7dfbead0c parsers: handle refcounting of "parents" consistently Gregory Szorc <gregory.szorc@gmail.com> parents: 31292 diff changeset	785 Py_INCREF(parents);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	786 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	787
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	788 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	789 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	790 }
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	791 meta = data + (2 * nmetadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	792 metadata = PyTuple_New(nmetadata);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	793 if (metadata == NULL) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	794 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	795 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	796 for (i = 0; i < nmetadata; i++) {
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	797 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	798 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	799 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	800 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	801 goto overflow;
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	802 }
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	803 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	804 meta += leftsize;
30100 c5afe5531709 parsers: convert PyString* to PyBytes* Gregory Szorc <gregory.szorc@gmail.com> parents: 30090 diff changeset	805 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	806 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	807 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	808 if (!left \|\| !right \|\| !tmp) {
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	809 Py_XDECREF(left);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	810 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	811 Py_XDECREF(tmp);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	812 goto bail;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	813 }
26214 46605888faf3 parsers: use PyTuple_New and SET_ITEM to construct metadata pair of markers Yuya Nishihara <yuya@tcha.org> parents: 26213 diff changeset	814 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	815 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	816 PyTuple_SET_ITEM(metadata, i, tmp);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	817 }
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	818 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	819 (int)tz * 60, parents);
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	820 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	821
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	822 overflow:
042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	823 PyErr_SetString(PyExc_ValueError, "overflow in obsstore");
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	824 bail:
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	825 Py_XDECREF(prec);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	826 Py_XDECREF(succs);
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	827 Py_XDECREF(metadata);
31426 43a7dfbead0c parsers: handle refcounting of "parents" consistently Gregory Szorc <gregory.szorc@gmail.com> parents: 31292 diff changeset	828 Py_XDECREF(parents);
24017 72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	829 return ret;
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	830 }
72c9b5ae7278 parsers: add fm1readmarker Augie Fackler <augie@google.com> parents: 24004 diff changeset	831
34440 7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	832 static PyObject fm1readmarkers(PyObject self, PyObject *args)
7ed0750c71a1 cext: wrap before brace for functions Gregory Szorc <gregory.szorc@gmail.com> parents: 34438 diff changeset	833 {
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	834 const char data, dataend;
42068 896b19d12c08 cext: make parsers.c PY_SSIZE_T_CLEAN Gregory Szorc <gregory.szorc@gmail.com> parents: 41336 diff changeset	835 Py_ssize_t datalen, offset, stop;
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	836 PyObject *markers = NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	837
36620 186c6df3a373 py3: bulk-replace 'const char' format specifier passed to PyArg_ParseTuple() Yuya Nishihara <yuya@tcha.org> parents: 36619 diff changeset	838 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	839 &offset, &stop)) {
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	840 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	841 }
41016 5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	842 if (offset < 0) {
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	843 PyErr_SetString(PyExc_ValueError,
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	844 "invalid negative offset in fm1readmarkers");
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	845 return NULL;
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	846 }
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	847 if (stop > datalen) {
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	848 PyErr_SetString(
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	849 PyExc_ValueError,
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	850 "stop longer than data length in fm1readmarkers");
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	851 return NULL;
5c68b617ba24 parsers: better bounds checking in fm1readmarkers Augie Fackler <augie@google.com> parents: 41011 diff changeset	852 }
26591 042344313939 parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) Yuya Nishihara <yuya@tcha.org> parents: 26590 diff changeset	853 dataend = data + datalen;
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	854 data += offset;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	855 markers = PyList_New(0);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	856 if (!markers) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	857 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	858 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	859 while (offset < stop) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	860 uint32_t msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	861 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	862 PyObject *record = fm1readmarker(data, dataend, &msize);
24019 26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	863 if (!record) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	864 goto bail;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	865 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	866 error = PyList_Append(markers, record);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	867 Py_DECREF(record);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	868 if (error) {
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	869 goto bail;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	870 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	871 data += msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	872 offset += msize;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	873 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	874 return markers;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	875 bail:
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	876 Py_DECREF(markers);
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	877 return NULL;
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	878 }
26fbf07482b2 _fm1readmarkers: generate list in C Martin von Zweigbergk <martinvonz@google.com> parents: 24017 diff changeset	879
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	880 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	881
17606 318fb32b980e pathencode: new C module with fast encodedir() function Adrian Buehlmann <adrian@cadifra.com> parents: 17356 diff changeset	882 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	883 PyObject pathencode(PyObject self, PyObject *args);
18430 0459c6555f69 store: implement lowerencode in C Bryan O'Sullivan <bryano@fb.com> parents: 17616 diff changeset	884 PyObject lowerencode(PyObject self, PyObject *args);
46708 358737abeeef cext: add support for revlogv2 Rapha?l Gom?s <rgomes@octobus.net> parents: 45131 diff changeset	885 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	886
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	887 static PyMethodDef methods[] = {
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	888 {"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	889 {"nonnormalotherparententries", nonnormalotherparententries, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	890 "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	891 "dirstate\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	892 {"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	893 {"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	894 "parse a revlog index\n"},
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	895 {"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	896 {"asciilower", asciilower, METH_VARARGS, "lowercase an ASCII string\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	897 {"asciiupper", asciiupper, METH_VARARGS, "uppercase an ASCII string\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	898 {"dict_new_presized", dict_new_presized, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	899 "construct a dict with an expected size\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	900 {"make_file_foldmap", make_file_foldmap, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	901 "make file foldmap\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	902 {"jsonescapeu8fast", jsonescapeu8fast, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	903 "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	904 {"encodedir", encodedir, METH_VARARGS, "encodedir a path\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	905 {"pathencode", pathencode, METH_VARARGS, "fncache-encode a path\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	906 {"lowerencode", lowerencode, METH_VARARGS, "lower-encode a path\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	907 {"fm1readmarkers", fm1readmarkers, METH_VARARGS,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	908 "parse v1 obsolete markers\n"},
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	909 {NULL, NULL}};
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	910
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	911 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	912 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	913 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	914
47268 9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47249 diff changeset	915 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	916
16363 2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	917 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	918 {
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	919 PyObject *capsule = NULL;
32360 af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	920 PyModule_AddIntConstant(mod, "version", version);
af3ef002395d parsers: add version to help detect breaking binary changes Jun Wu <quark@fb.com> parents: 31470 diff changeset	921
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	922 /* 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	923 * 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	924 * 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	925 * 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	926 * 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	927 * 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	928 * 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	929 * 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	930 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	931
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	932 dirs_module_init(mod);
24214 a5f1bccd2996 manifest.c: new extension code to lazily parse manifests Augie Fackler <augie@google.com> parents: 24032 diff changeset	933 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	934 revlog_module_init(mod);
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18567 diff changeset	935
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	936 capsule = PyCapsule_New(
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	937 make_dirstate_item,
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	938 "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	939 if (capsule != NULL)
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	940 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	941
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	942 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	943 return;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	944 }
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	945 Py_INCREF(&dirstateItemType);
84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47538 diff changeset	946 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	947 }
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	948
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	949 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	950 {
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	951 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	952 long hexversion;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	953 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	954 return -1;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	955 }
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	956 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	957 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	958 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	959 return -1;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	960 }
23943 5fb44983a696 parsers: don't leak references to sys et al in check_python_version Augie Fackler <augie@google.com> parents: 23942 diff changeset	961 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	962 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	963 /* 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	964 * 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	965 * 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	966 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	967 PyErr_Format(PyExc_ImportError,
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	968 "%s: The Mercurial extension "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	969 "modules were compiled with Python " PY_VERSION
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	970 ", but "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	971 "Mercurial is currently using Python with "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	972 "sys.hexversion=%ld: "
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	973 "Python %s\n at: %s",
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	974 versionerrortext, hexversion, Py_GetVersion(),
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	975 Py_GetProgramFullPath());
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	976 return -1;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	977 }
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	978 return 0;
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	979 }
3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	980
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	981 #ifdef IS_PY3K
34862 d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	982 static struct PyModuleDef parsers_module = {PyModuleDef_HEAD_INIT, "parsers",
d92dc725223b parsers: allow clang-format here Augie Fackler <augie@google.com> parents: 34861 diff changeset	983 parsers_doc, -1, methods};
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	984
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	985 PyMODINIT_FUNC PyInit_parsers(void)
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	986 {
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	987 PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	988
20742 3681de20b0a7 parsers: fail fast if Python has wrong minor version (issue4110) Chris Jerdonek <chris.jerdonek@gmail.com> parents: 20555 diff changeset	989 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	990 return NULL;
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	991 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	992 module_init(mod);
2cdd7e63211b parsers: incrementally parse the revlog index in C Bryan O'Sullivan <bryano@fb.com> parents: 15033 diff changeset	993 return mod;
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	994 }
3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	995 #else
6389 0231f763ebc8 manifest: improve parsing performance by 8x via a new C extension Bryan O'Sullivan <bos@serpentine.com> parents: diff changeset	996 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	997 {
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	998 PyObject *mod;
e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	999
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1000 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	1001 return;
41336 763b45bc4483 cleanup: use clang-tidy to add missing {} around one-line statements Augie Fackler <augie@google.com> parents: 41016 diff changeset	1002 }
20797 e286ab22e461 parsers: fix compiler errors on MSVC 2008 Matt Harbison <matt_harbison@yahoo.com> parents: 20742 diff changeset	1003 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	1004 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	1005 }
11361 3de3d670d2b6 parsers.c: Added support for py3k. Renato Cunha <renatoc@gmail.com> parents: 10449 diff changeset	1006 #endif

Mercurial > public > mercurial-scm > hg

annotate mercurial/cext/parsers.c @ 47890:3853e6ee160d