This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12224

cext: remove some conditional preprocessor defines
ClosedPublic

Authored by indygreg on Mar 1 2022, 7:21 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbe3af7eb2bbb: cext: remove some conditional preprocessor defines
Summary

We may want to inline these defines. But for now, getting rid of the
Python 2 support is a step forward.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 1 2022, 7:21 PM
Alphare accepted this revision.Mar 2 2022, 5:14 AM
This revision is now accepted and ready to land.Mar 2 2022, 5:14 AM
indygreg added a commit: rHGbe3af7eb2bbb: cext: remove some conditional preprocessor defines.Mar 2 2022, 7:41 AM
Closed by commit rHGbe3af7eb2bbb: cext: remove some conditional preprocessor defines (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/manifest.c (14 lines)

Diff 32340

mercurial/cext/manifest.c

ret = PyTuple_Pack(3, path, hash, flags); ret = PyTuple_Pack(3, path, hash, flags);
done: done:
Py_XDECREF(path); Py_XDECREF(path);
Py_XDECREF(hash); Py_XDECREF(hash);
Py_XDECREF(flags); Py_XDECREF(flags);
return ret; return ret;
} }
#ifdef IS_PY3K
#define LAZYMANIFESTENTRIESITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT #define LAZYMANIFESTENTRIESITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT
#else
#define LAZYMANIFESTENTRIESITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT \
| Py_TPFLAGS_HAVE_ITER
#endif
static PyTypeObject lazymanifestEntriesIterator = { static PyTypeObject lazymanifestEntriesIterator = {
PyVarObject_HEAD_INIT(NULL, 0) /* header */ PyVarObject_HEAD_INIT(NULL, 0) /* header */
"parsers.lazymanifest.entriesiterator", /*tp_name */ "parsers.lazymanifest.entriesiterator", /*tp_name */
sizeof(lmIter), /*tp_basicsize */ sizeof(lmIter), /*tp_basicsize */
0, /*tp_itemsize */ 0, /*tp_itemsize */
lmiter_dealloc, /*tp_dealloc */ lmiter_dealloc, /*tp_dealloc */
0, /*tp_print */ 0, /*tp_print */
line *l = lmiter_nextline((lmIter *)o); line *l = lmiter_nextline((lmIter *)o);
if (!l) { if (!l) {
return NULL; return NULL;
} }
pl = pathlen(l); pl = pathlen(l);
return PyBytes_FromStringAndSize(l->start, pl); return PyBytes_FromStringAndSize(l->start, pl);
} }
#ifdef IS_PY3K
#define LAZYMANIFESTKEYSITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT #define LAZYMANIFESTKEYSITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT
#else
#define LAZYMANIFESTKEYSITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT \
| Py_TPFLAGS_HAVE_ITER
#endif
static PyTypeObject lazymanifestKeysIterator = { static PyTypeObject lazymanifestKeysIterator = {
PyVarObject_HEAD_INIT(NULL, 0) /* header */ PyVarObject_HEAD_INIT(NULL, 0) /* header */
"parsers.lazymanifest.keysiterator", /*tp_name */ "parsers.lazymanifest.keysiterator", /*tp_name */
sizeof(lmIter), /*tp_basicsize */ sizeof(lmIter), /*tp_basicsize */
0, /*tp_itemsize */ 0, /*tp_itemsize */
lmiter_dealloc, /*tp_dealloc */ lmiter_dealloc, /*tp_dealloc */
0, /*tp_print */ 0, /*tp_print */
"Make a copy of this manifest filtered by matchfn."}, "Make a copy of this manifest filtered by matchfn."},
{"diff", (PyCFunction)lazymanifest_diff, METH_VARARGS, {"diff", (PyCFunction)lazymanifest_diff, METH_VARARGS,
"Compare this lazymanifest to another one."}, "Compare this lazymanifest to another one."},
{"text", (PyCFunction)lazymanifest_text, METH_NOARGS, {"text", (PyCFunction)lazymanifest_text, METH_NOARGS,
"Encode this manifest to text."}, "Encode this manifest to text."},
{NULL}, {NULL},
}; };
#ifdef IS_PY3K
#define LAZYMANIFEST_TPFLAGS Py_TPFLAGS_DEFAULT #define LAZYMANIFEST_TPFLAGS Py_TPFLAGS_DEFAULT
#else
#define LAZYMANIFEST_TPFLAGS Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_SEQUENCE_IN
#endif
static PyTypeObject lazymanifestType = { static PyTypeObject lazymanifestType = {
PyVarObject_HEAD_INIT(NULL, 0) /* header */ PyVarObject_HEAD_INIT(NULL, 0) /* header */
"parsers.lazymanifest", /* tp_name */ "parsers.lazymanifest", /* tp_name */
sizeof(lazymanifest), /* tp_basicsize */ sizeof(lazymanifest), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)lazymanifest_dealloc, /* tp_dealloc */ (destructor)lazymanifest_dealloc, /* tp_dealloc */
0, /* tp_print */ 0, /* tp_print */