This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1169

cext: add /* header */ comment to all PyVarObject_HEAD_INIT() calls
ClosedPublic

Authored by durin42 on Oct 17 2017, 5:45 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG6ece4a85c350: cext: add /* header */ comment to all PyVarObject_HEAD_INIT() calls
Summary

This gives clang-format the right notion about formatting these struct
initializers, therefore allowing us to automatically format several
additional files.

  1. skip-blame because this is just a content-free comment addition

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

durin42 created this revision.Oct 17 2017, 5:45 PM
indygreg accepted this revision.Oct 18 2017, 11:48 AM
indygreg added a subscriber: indygreg.

Oh, I was wondering how to do this. AFAICT this feature is not documented at https://clang.llvm.org/docs/ClangFormat.html or https://clang.llvm.org/docs/ClangFormatStyleOptions.html. Boo.

This revision is now accepted and ready to land.Oct 18 2017, 11:48 AM
Closed by commit rHG6ece4a85c350: cext: add /* header */ comment to all PyVarObject_HEAD_INIT() calls (authored by durin42). · Explain WhyOct 18 2017, 11:51 AM
This revision was automatically updated to reflect the committed changes.
durin42 added a comment.Oct 18 2017, 11:53 AM

I figured this out by finding a bug at Google on this topic, and then djasper showed me a workaround and said he'd look again at fixing the other case we're stuck on.

Revision Contents
Changeset List

Diff 2978

mercurial/cext/manifest.c

#ifdef IS_PY3K #ifdef IS_PY3K
#define LAZYMANIFESTENTRIESITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT #define LAZYMANIFESTENTRIESITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT
#else #else
#define LAZYMANIFESTENTRIESITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT \ #define LAZYMANIFESTENTRIESITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT \
| Py_TPFLAGS_HAVE_ITER | Py_TPFLAGS_HAVE_ITER
#endif #endif
static PyTypeObject lazymanifestEntriesIterator = { static PyTypeObject lazymanifestEntriesIterator = {
PyVarObject_HEAD_INIT(NULL, 0) 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 */
0, /*tp_getattr */ 0, /*tp_getattr */
0, /*tp_setattr */ 0, /*tp_setattr */
0, /*tp_compare */ 0, /*tp_compare */
#ifdef IS_PY3K #ifdef IS_PY3K
#define LAZYMANIFESTKEYSITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT #define LAZYMANIFESTKEYSITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT
#else #else
#define LAZYMANIFESTKEYSITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT \ #define LAZYMANIFESTKEYSITERATOR_TPFLAGS Py_TPFLAGS_DEFAULT \
| Py_TPFLAGS_HAVE_ITER | Py_TPFLAGS_HAVE_ITER
#endif #endif
static PyTypeObject lazymanifestKeysIterator = { static PyTypeObject lazymanifestKeysIterator = {
PyVarObject_HEAD_INIT(NULL, 0) 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 */
0, /*tp_getattr */ 0, /*tp_getattr */
0, /*tp_setattr */ 0, /*tp_setattr */
0, /*tp_compare */ 0, /*tp_compare */
#ifdef IS_PY3K #ifdef IS_PY3K
#define LAZYMANIFEST_TPFLAGS Py_TPFLAGS_DEFAULT #define LAZYMANIFEST_TPFLAGS Py_TPFLAGS_DEFAULT
#else #else
#define LAZYMANIFEST_TPFLAGS Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_SEQUENCE_IN #define LAZYMANIFEST_TPFLAGS Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_SEQUENCE_IN
#endif #endif
static PyTypeObject lazymanifestType = { static PyTypeObject lazymanifestType = {
PyVarObject_HEAD_INIT(NULL, 0) 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 */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
0, /* tp_compare */ 0, /* tp_compare */

mercurial/cext/osutil.c

} }
static void listdir_stat_dealloc(PyObject *o) static void listdir_stat_dealloc(PyObject *o)
{ {
o->ob_type->tp_free(o); o->ob_type->tp_free(o);
} }
static PyTypeObject listdir_stat_type = { static PyTypeObject listdir_stat_type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0) /* header */
"osutil.stat", /*tp_name*/ "osutil.stat", /*tp_name*/
sizeof(struct listdir_stat), /*tp_basicsize*/ sizeof(struct listdir_stat), /*tp_basicsize*/
0, /*tp_itemsize*/ 0, /*tp_itemsize*/
(destructor)listdir_stat_dealloc, /*tp_dealloc*/ (destructor)listdir_stat_dealloc, /*tp_dealloc*/
0, /*tp_print*/ 0, /*tp_print*/
0, /*tp_getattr*/ 0, /*tp_getattr*/
0, /*tp_setattr*/ 0, /*tp_setattr*/
0, /*tp_compare*/ 0, /*tp_compare*/

mercurial/cext/parsers.c

dirstate_tuple_item, /* sq_item */ dirstate_tuple_item, /* sq_item */
0, /* sq_ass_item */ 0, /* sq_ass_item */
0, /* sq_contains */ 0, /* sq_contains */
0, /* sq_inplace_concat */ 0, /* sq_inplace_concat */
0 /* sq_inplace_repeat */ 0 /* sq_inplace_repeat */
}; };
PyTypeObject dirstateTupleType = { PyTypeObject dirstateTupleType = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0) /* header */
"dirstate_tuple", /* tp_name */ "dirstate_tuple", /* tp_name */
sizeof(dirstateTupleObject),/* tp_basicsize */ sizeof(dirstateTupleObject),/* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)dirstate_tuple_dealloc, /* tp_dealloc */ (destructor)dirstate_tuple_dealloc, /* tp_dealloc */
0, /* tp_print */ 0, /* tp_print */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
0, /* tp_compare */ 0, /* tp_compare */

mercurial/cext/revlog.c

}; };
static PyGetSetDef index_getset[] = { static PyGetSetDef index_getset[] = {
{"nodemap", (getter)index_nodemap, NULL, "nodemap", NULL}, {"nodemap", (getter)index_nodemap, NULL, "nodemap", NULL},
{NULL} /* Sentinel */ {NULL} /* Sentinel */
}; };
static PyTypeObject indexType = { static PyTypeObject indexType = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0) /* header */
"parsers.index", /* tp_name */ "parsers.index", /* tp_name */
sizeof(indexObject), /* tp_basicsize */ sizeof(indexObject), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)index_dealloc, /* tp_dealloc */ (destructor)index_dealloc, /* tp_dealloc */
0, /* tp_print */ 0, /* tp_print */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
0, /* tp_compare */ 0, /* tp_compare */