( )⚙ D11316 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11316

dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent
ClosedPublic

Authored by marmoute on Aug 21 2021, 5:55 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG37bffc450897: dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent
Summary

These are property, not method.

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

marmoute created this revision.Aug 21 2021, 5:55 AM
Alphare accepted this revision.Aug 25 2021, 9:50 AM
This revision is now accepted and ready to land.Aug 25 2021, 9:50 AM
baymax updated this revision to Diff 30042.Aug 26 2021, 8:59 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/parsers.c (40 lines)

Diff 30084

mercurial/cext/parsers.c

return PyInt_FromLong(self->size); return PyInt_FromLong(self->size);
}; };
static PyObject *dirstate_item_v1_mtime(dirstateItemObject *self) static PyObject *dirstate_item_v1_mtime(dirstateItemObject *self)
{ {
return PyInt_FromLong(self->mtime); return PyInt_FromLong(self->mtime);
}; };
static PyObject *dm_nonnormal(dirstateItemObject *self)
{
if (self->state != 'n' || self->mtime == ambiguous_time) {
Py_RETURN_TRUE;
} else {
Py_RETURN_FALSE;
}
};
static PyObject *dm_otherparent(dirstateItemObject *self)
{
if (self->size == dirstate_v1_from_p2) {
Py_RETURN_TRUE;
} else {
Py_RETURN_FALSE;
}
};
static PyObject *dirstate_item_need_delay(dirstateItemObject *self, static PyObject *dirstate_item_need_delay(dirstateItemObject *self,
PyObject *value) PyObject *value)
{ {
long now; long now;
if (!pylong_to_long(value, &now)) { if (!pylong_to_long(value, &now)) {
return NULL; return NULL;
} }
if (self->state == 'n' && self->mtime == now) { if (self->state == 'n' && self->mtime == now) {
{"need_delay", (PyCFunction)dirstate_item_need_delay, METH_O, {"need_delay", (PyCFunction)dirstate_item_need_delay, METH_O,
"True if the stored mtime would be ambiguous with the current time"}, "True if the stored mtime would be ambiguous with the current time"},
{"from_v1_data", (PyCFunction)dirstate_item_from_v1_meth, METH_O, {"from_v1_data", (PyCFunction)dirstate_item_from_v1_meth, METH_O,
"build a new DirstateItem object from V1 data"}, "build a new DirstateItem object from V1 data"},
{"set_possibly_dirty", (PyCFunction)dirstate_item_set_possibly_dirty, {"set_possibly_dirty", (PyCFunction)dirstate_item_set_possibly_dirty,
METH_NOARGS, "mark a file as \"possibly dirty\""}, METH_NOARGS, "mark a file as \"possibly dirty\""},
{"set_untracked", (PyCFunction)dirstate_item_set_untracked, METH_NOARGS, {"set_untracked", (PyCFunction)dirstate_item_set_untracked, METH_NOARGS,
"mark a file as \"untracked\""}, "mark a file as \"untracked\""},
{"dm_nonnormal", (PyCFunction)dm_nonnormal, METH_NOARGS,
"True is the entry is non-normal in the dirstatemap sense"},
{"dm_otherparent", (PyCFunction)dm_otherparent, METH_NOARGS,
"True is the entry is `otherparent` in the dirstatemap sense"},
{NULL} /* Sentinel */ {NULL} /* Sentinel */
}; };
static PyObject *dirstate_item_get_mode(dirstateItemObject *self) static PyObject *dirstate_item_get_mode(dirstateItemObject *self)
{ {
return PyInt_FromLong(self->mode); return PyInt_FromLong(self->mode);
}; };
{ {
if (self->state == 'r') { if (self->state == 'r') {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dm_nonnormal(dirstateItemObject *self)
{
if (self->state != 'n' || self->mtime == ambiguous_time) {
Py_RETURN_TRUE;
} else {
Py_RETURN_FALSE;
}
};
static PyObject *dm_otherparent(dirstateItemObject *self)
{
if (self->size == dirstate_v1_from_p2) {
Py_RETURN_TRUE;
} else {
Py_RETURN_FALSE;
}
};
static PyGetSetDef dirstate_item_getset[] = { static PyGetSetDef dirstate_item_getset[] = {
{"mode", (getter)dirstate_item_get_mode, NULL, "mode", NULL}, {"mode", (getter)dirstate_item_get_mode, NULL, "mode", NULL},
{"size", (getter)dirstate_item_get_size, NULL, "size", NULL}, {"size", (getter)dirstate_item_get_size, NULL, "size", NULL},
{"mtime", (getter)dirstate_item_get_mtime, NULL, "mtime", NULL}, {"mtime", (getter)dirstate_item_get_mtime, NULL, "mtime", NULL},
{"state", (getter)dirstate_item_get_state, NULL, "state", NULL}, {"state", (getter)dirstate_item_get_state, NULL, "state", NULL},
{"tracked", (getter)dirstate_item_get_tracked, NULL, "tracked", NULL}, {"tracked", (getter)dirstate_item_get_tracked, NULL, "tracked", NULL},
{"added", (getter)dirstate_item_get_added, NULL, "added", NULL}, {"added", (getter)dirstate_item_get_added, NULL, "added", NULL},
{"merged_removed", (getter)dirstate_item_get_merged_removed, NULL, {"merged_removed", (getter)dirstate_item_get_merged_removed, NULL,
"merged_removed", NULL}, "merged_removed", NULL},
{"merged", (getter)dirstate_item_get_merged, NULL, "merged", NULL}, {"merged", (getter)dirstate_item_get_merged, NULL, "merged", NULL},
{"from_p2_removed", (getter)dirstate_item_get_from_p2_removed, NULL, {"from_p2_removed", (getter)dirstate_item_get_from_p2_removed, NULL,
"from_p2_removed", NULL}, "from_p2_removed", NULL},
{"from_p2", (getter)dirstate_item_get_from_p2, NULL, "from_p2", NULL}, {"from_p2", (getter)dirstate_item_get_from_p2, NULL, "from_p2", NULL},
{"removed", (getter)dirstate_item_get_removed, NULL, "removed", NULL}, {"removed", (getter)dirstate_item_get_removed, NULL, "removed", NULL},
{"dm_nonnormal", (getter)dm_nonnormal, NULL, "dm_nonnormal", NULL},
{"dm_otherparent", (getter)dm_otherparent, NULL, "dm_otherparent", NULL},
{NULL} /* Sentinel */ {NULL} /* Sentinel */
}; };
PyTypeObject dirstateItemType = { PyTypeObject dirstateItemType = {
PyVarObject_HEAD_INIT(NULL, 0) /* header */ PyVarObject_HEAD_INIT(NULL, 0) /* header */
"dirstate_tuple", /* tp_name */ "dirstate_tuple", /* tp_name */
sizeof(dirstateItemObject), /* tp_basicsize */ sizeof(dirstateItemObject), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */