--- a/mercurial/cext/revlog.c Sun Feb 20 15:48:35 2022 -0700
+++ b/mercurial/cext/revlog.c Sun Feb 20 15:50:46 2022 -0700
@@ -23,16 +23,6 @@
#include "revlog.h"
#include "util.h"
-#ifdef IS_PY3K
-/* The mapping of Python types is meant to be temporary to get Python
- * 3 to compile. We should remove this once Python 3 support is fully
- * supported and proper types are used in the extensions themselves. */
-#define PyInt_Check PyLong_Check
-#define PyInt_FromLong PyLong_FromLong
-#define PyInt_FromSsize_t PyLong_FromSsize_t
-#define PyInt_AsLong PyLong_AsLong
-#endif
-
typedef struct indexObjectStruct indexObject;
typedef struct {
@@ -802,7 +792,7 @@
#define istat(__n, __d) \
do { \
s = PyBytes_FromString(__d); \
- t = PyInt_FromSsize_t(self->__n); \
+ t = PyLong_FromSsize_t(self->__n); \
if (!s || !t) \
goto bail; \
if (PyDict_SetItem(obj, s, t) == -1) \
@@ -953,7 +943,7 @@
l = PyList_GET_SIZE(roots);
for (i = 0; i < l; i++) {
- revnum = PyInt_AsLong(PyList_GET_ITEM(roots, i));
+ revnum = PyLong_AsLong(PyList_GET_ITEM(roots, i));
if (revnum == -1 && PyErr_Occurred())
goto bail;
/* If root is out of range, e.g. wdir(), it must be unreachable
@@ -966,7 +956,7 @@
/* Populate tovisit with all the heads */
l = PyList_GET_SIZE(heads);
for (i = 0; i < l; i++) {
- revnum = PyInt_AsLong(PyList_GET_ITEM(heads, i));
+ revnum = PyLong_AsLong(PyList_GET_ITEM(heads, i));
if (revnum == -1 && PyErr_Occurred())
goto bail;
if (revnum + 1 < 0 || revnum + 1 >= len + 1) {
@@ -986,7 +976,7 @@
revnum = tovisit[k++];
if (revstates[revnum + 1] & RS_ROOT) {
revstates[revnum + 1] |= RS_REACHABLE;
- val = PyInt_FromLong(revnum);
+ val = PyLong_FromLong(revnum);
if (val == NULL)
goto bail;
r = PyList_Append(reachable, val);
@@ -1031,7 +1021,7 @@
RS_REACHABLE) &&
!(revstates[i + 1] & RS_REACHABLE)) {
revstates[i + 1] |= RS_REACHABLE;
- val = PyInt_FromSsize_t(i);
+ val = PyLong_FromSsize_t(i);
if (val == NULL)
goto bail;
r = PyList_Append(reachable, val);
@@ -1116,7 +1106,7 @@
}
for (i = 0; i < numphases; ++i) {
- PyObject *pyphase = PyInt_FromLong(trackedphases[i]);
+ PyObject *pyphase = PyLong_FromLong(trackedphases[i]);
PyObject *phaseroots = NULL;
if (pyphase == NULL)
goto release;
@@ -1175,7 +1165,7 @@
"bad phase number in internal list");
goto release;
}
- pyrev = PyInt_FromLong(rev);
+ pyrev = PyLong_FromLong(rev);
if (pyrev == NULL)
goto release;
if (PySet_Add(pyphase, pyrev) == -1) {
@@ -1189,7 +1179,7 @@
if (phasesetsdict == NULL)
goto release;
for (i = 0; i < numphases; ++i) {
- PyObject *pyphase = PyInt_FromLong(trackedphases[i]);
+ PyObject *pyphase = PyLong_FromLong(trackedphases[i]);
if (pyphase == NULL)
goto release;
if (PyDict_SetItem(phasesetsdict, pyphase, phasesets[i]) ==
@@ -1247,7 +1237,7 @@
if (heads == NULL)
goto bail;
if (len == 0) {
- PyObject *nullid = PyInt_FromLong(-1);
+ PyObject *nullid = PyLong_FromLong(-1);
if (nullid == NULL || PyList_Append(heads, nullid) == -1) {
Py_XDECREF(nullid);
goto bail;
@@ -1296,7 +1286,7 @@
if (nothead[i])
continue;
- head = PyInt_FromSsize_t(i);
+ head = PyLong_FromSsize_t(i);
if (head == NULL || PyList_Append(heads, head) == -1) {
Py_XDECREF(head);
goto bail;
@@ -1442,7 +1432,7 @@
assert(PyErr_Occurred());
goto bail;
}
- key = PyInt_FromSsize_t(base);
+ key = PyLong_FromSsize_t(base);
allvalues = PyDict_GetItem(cache, key);
if (allvalues == NULL && PyErr_Occurred()) {
goto bail;
@@ -1459,7 +1449,7 @@
goto bail;
}
}
- value = PyInt_FromSsize_t(rev);
+ value = PyLong_FromSsize_t(rev);
if (PyList_Append(allvalues, value)) {
goto bail;
}
@@ -1486,8 +1476,8 @@
return NULL;
}
- if (PyInt_Check(stoparg)) {
- stoprev = (int)PyInt_AsLong(stoparg);
+ if (PyLong_Check(stoparg)) {
+ stoprev = (int)PyLong_AsLong(stoparg);
if (stoprev == -1 && PyErr_Occurred()) {
return NULL;
}
@@ -1521,7 +1511,7 @@
iterrev = rev;
while (iterrev != baserev && iterrev != stoprev) {
- PyObject *value = PyInt_FromLong(iterrev);
+ PyObject *value = PyLong_FromLong(iterrev);
if (value == NULL) {
goto bail;
}
@@ -1560,7 +1550,7 @@
if (iterrev == stoprev) {
stopped = 1;
} else {
- PyObject *value = PyInt_FromLong(iterrev);
+ PyObject *value = PyLong_FromLong(iterrev);
if (value == NULL) {
goto bail;
}
@@ -1712,7 +1702,8 @@
goto bail;
}
for (i = 0; i < num_revs; i++) {
- Py_ssize_t revnum = PyInt_AsLong(PyList_GET_ITEM(list_revs, i));
+ Py_ssize_t revnum =
+ PyLong_AsLong(PyList_GET_ITEM(list_revs, i));
if (revnum == -1 && PyErr_Occurred()) {
goto bail;
}
@@ -2118,7 +2109,7 @@
raise_revlog_error();
return NULL;
}
- return PyInt_FromLong(length);
+ return PyLong_FromLong(length);
}
static void nt_dealloc(nodetree *self)
@@ -2266,7 +2257,7 @@
char *node;
int rev;
- if (PyInt_Check(value)) {
+ if (PyLong_Check(value)) {
long idx;
if (!pylong_to_long(value, &idx)) {
return NULL;
@@ -2278,7 +2269,7 @@
return NULL;
rev = index_find_node(self, node);
if (rev >= -1)
- return PyInt_FromLong(rev);
+ return PyLong_FromLong(rev);
if (rev == -2)
raise_revlog_error();
return NULL;
@@ -2377,7 +2368,7 @@
raise_revlog_error();
return NULL;
}
- return PyInt_FromLong(length);
+ return PyLong_FromLong(length);
}
static PyObject *index_m_get(indexObject *self, PyObject *args)
@@ -2395,14 +2386,14 @@
return NULL;
if (rev == -2)
Py_RETURN_NONE;
- return PyInt_FromLong(rev);
+ return PyLong_FromLong(rev);
}
static int index_contains(indexObject *self, PyObject *value)
{
char *node;
- if (PyInt_Check(value)) {
+ if (PyLong_Check(value)) {
long rev;
if (!pylong_to_long(value, &rev)) {
return -1;
@@ -2440,7 +2431,7 @@
return NULL;
rev = index_find_node(self, node);
if (rev >= -1)
- return PyInt_FromLong(rev);
+ return PyLong_FromLong(rev);
if (rev == -2)
raise_revlog_error();
return NULL;
@@ -2493,7 +2484,7 @@
if (sv < poison) {
interesting -= 1;
if (sv == allseen) {
- PyObject *obj = PyInt_FromLong(v);
+ PyObject *obj = PyLong_FromLong(v);
if (obj == NULL)
goto bail;
if (PyList_Append(gca, obj) == -1) {
@@ -2561,7 +2552,7 @@
}
for (i = 0; i < revcount; i++) {
- int n = (int)PyInt_AsLong(PyList_GET_ITEM(revs, i));
+ int n = (int)PyLong_AsLong(PyList_GET_ITEM(revs, i));
if (n > maxrev)
maxrev = n;
}
@@ -2586,7 +2577,7 @@
goto bail;
for (i = 0; i < revcount; i++) {
- int n = (int)PyInt_AsLong(PyList_GET_ITEM(revs, i));
+ int n = (int)PyLong_AsLong(PyList_GET_ITEM(revs, i));
long b = 1l << i;
depth[n] = 1;
seen[n] = b;
@@ -2716,13 +2707,13 @@
bitmask x;
long val;
- if (!PyInt_Check(obj)) {
+ if (!PyLong_Check(obj)) {
PyErr_SetString(PyExc_TypeError,
"arguments must all be ints");
Py_DECREF(obj);
goto bail;
}
- val = PyInt_AsLong(obj);
+ val = PyLong_AsLong(obj);
Py_DECREF(obj);
if (val == -1) {
ret = PyList_New(0);
@@ -2763,7 +2754,7 @@
ret = PyList_New(1);
if (ret == NULL)
goto bail;
- obj = PyInt_FromLong(revs[0]);
+ obj = PyLong_FromLong(revs[0]);
if (obj == NULL)
goto bail;
PyList_SET_ITEM(ret, 0, obj);
@@ -2925,7 +2916,7 @@
if (value == NULL)
return self->ntinitialized ? nt_delete_node(&self->nt, node)
: 0;
- rev = PyInt_AsLong(value);
+ rev = PyLong_AsLong(value);
if (rev > INT_MAX || rev < 0) {
if (!PyErr_Occurred())
PyErr_SetString(PyExc_ValueError, "rev out of range");