equal
deleted
inserted
replaced
26 #define PyInt_FromSsize_t PyLong_FromSsize_t |
26 #define PyInt_FromSsize_t PyLong_FromSsize_t |
27 #define PyInt_AsLong PyLong_AsLong |
27 #define PyInt_AsLong PyLong_AsLong |
28 #endif |
28 #endif |
29 |
29 |
30 static const char *const versionerrortext = "Python minor version mismatch"; |
30 static const char *const versionerrortext = "Python minor version mismatch"; |
|
31 |
|
32 static const int dirstate_v1_from_p2 = -2; |
31 |
33 |
32 static PyObject *dict_new_presized(PyObject *self, PyObject *args) |
34 static PyObject *dict_new_presized(PyObject *self, PyObject *args) |
33 { |
35 { |
34 Py_ssize_t expected_size; |
36 Py_ssize_t expected_size; |
35 |
37 |
162 } else { |
164 } else { |
163 Py_RETURN_FALSE; |
165 Py_RETURN_FALSE; |
164 } |
166 } |
165 }; |
167 }; |
166 |
168 |
|
169 static PyObject *dirstatetuple_get_from_p2(dirstateTupleObject *self) |
|
170 { |
|
171 if (self->size == dirstate_v1_from_p2) { |
|
172 Py_RETURN_TRUE; |
|
173 } else { |
|
174 Py_RETURN_FALSE; |
|
175 } |
|
176 }; |
|
177 |
167 static PyGetSetDef dirstatetuple_getset[] = { |
178 static PyGetSetDef dirstatetuple_getset[] = { |
168 {"state", (getter)dirstatetuple_get_state, NULL, "state", NULL}, |
179 {"state", (getter)dirstatetuple_get_state, NULL, "state", NULL}, |
169 {"merged", (getter)dirstatetuple_get_merged, NULL, "merged", NULL}, |
180 {"merged", (getter)dirstatetuple_get_merged, NULL, "merged", NULL}, |
|
181 {"from_p2", (getter)dirstatetuple_get_from_p2, NULL, "from_p2", NULL}, |
170 {NULL} /* Sentinel */ |
182 {NULL} /* Sentinel */ |
171 }; |
183 }; |
172 |
184 |
173 PyTypeObject dirstateTupleType = { |
185 PyTypeObject dirstateTupleType = { |
174 PyVarObject_HEAD_INIT(NULL, 0) /* header */ |
186 PyVarObject_HEAD_INIT(NULL, 0) /* header */ |