This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11386

dirstate-item: introduce low level C function
ClosedPublic

Authored by marmoute on Sep 1 2021, 7:36 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG154e4dcac68c: dirstate-item: introduce low level C function
Summary

Since a lot of logic is about to change, we need to isolate it into bits that
are easy reusable in the rest of the C code.

Especially we need to split the part that do the pure logic from the part that
do the Python wrapping.

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.Sep 1 2021, 7:36 PM
Alphare accepted this revision.Sep 8 2021, 9:42 AM
This revision is now accepted and ready to land.Sep 8 2021, 9:42 AM
marmoute added a commit: rHG154e4dcac68c: dirstate-item: introduce low level C function.Sep 9 2021, 5:13 AM
Closed by commit rHG154e4dcac68c: dirstate-item: introduce low level C function (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30192

mercurial/cext/parsers.c

return (PyObject *)t; return (PyObject *)t;
} }
static void dirstate_item_dealloc(PyObject *o) static void dirstate_item_dealloc(PyObject *o)
{ {
PyObject_Del(o); PyObject_Del(o);
} }
static inline bool dirstate_item_c_tracked(dirstateItemObject *self)
{
return (self->state == 'a' || self->state == 'm' || self->state == 'n');
}
static inline bool dirstate_item_c_added(dirstateItemObject *self)
{
return (self->state == 'a');
}
static inline bool dirstate_item_c_removed(dirstateItemObject *self)
{
return (self->state == 'r');
}
static inline bool dirstate_item_c_merged(dirstateItemObject *self)
{
return (self->state == 'm');
}
static inline bool dirstate_item_c_merged_removed(dirstateItemObject *self)
{
return (self->state == 'r' && self->size == dirstate_v1_nonnormal);
}
static inline bool dirstate_item_c_from_p2(dirstateItemObject *self)
{
return (self->state == 'n' && self->size == dirstate_v1_from_p2);
}
static inline bool dirstate_item_c_from_p2_removed(dirstateItemObject *self)
{
return (self->state == 'r' && self->size == dirstate_v1_from_p2);
}
static inline char dirstate_item_c_v1_state(dirstateItemObject *self)
{
return self->state;
}
static inline int dirstate_item_c_v1_mode(dirstateItemObject *self)
{
return self->mode;
}
static inline int dirstate_item_c_v1_size(dirstateItemObject *self)
{
return self->size;
}
static inline int dirstate_item_c_v1_mtime(dirstateItemObject *self)
{
return self->mtime;
}
static PyObject *dirstate_item_v1_state(dirstateItemObject *self) static PyObject *dirstate_item_v1_state(dirstateItemObject *self)
{ {
return PyBytes_FromStringAndSize(&self->state, 1); char state = dirstate_item_c_v1_state(self);
return PyBytes_FromStringAndSize(&state, 1);
}; };
static PyObject *dirstate_item_v1_mode(dirstateItemObject *self) static PyObject *dirstate_item_v1_mode(dirstateItemObject *self)
{ {
return PyInt_FromLong(self->mode); return PyInt_FromLong(dirstate_item_c_v1_mode(self));
}; };
static PyObject *dirstate_item_v1_size(dirstateItemObject *self) static PyObject *dirstate_item_v1_size(dirstateItemObject *self)
{ {
return PyInt_FromLong(self->size); return PyInt_FromLong(dirstate_item_c_v1_size(self));
}; };
static PyObject *dirstate_item_v1_mtime(dirstateItemObject *self) static PyObject *dirstate_item_v1_mtime(dirstateItemObject *self)
{ {
return PyInt_FromLong(self->mtime); return PyInt_FromLong(dirstate_item_c_v1_mtime(self));
}; };
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 (dirstate_item_c_v1_state(self) == 'n' &&
dirstate_item_c_v1_mtime(self) == now) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
/* This will never change since it's bound to V1 /* This will never change since it's bound to V1
*/ */
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\""},
{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(dirstate_item_c_v1_mode(self));
}; };
static PyObject *dirstate_item_get_size(dirstateItemObject *self) static PyObject *dirstate_item_get_size(dirstateItemObject *self)
{ {
return PyInt_FromLong(self->size); return PyInt_FromLong(dirstate_item_c_v1_size(self));
}; };
static PyObject *dirstate_item_get_mtime(dirstateItemObject *self) static PyObject *dirstate_item_get_mtime(dirstateItemObject *self)
{ {
return PyInt_FromLong(self->mtime); return PyInt_FromLong(dirstate_item_c_v1_mtime(self));
}; };
static PyObject *dirstate_item_get_state(dirstateItemObject *self) static PyObject *dirstate_item_get_state(dirstateItemObject *self)
{ {
return PyBytes_FromStringAndSize(&self->state, 1); char state = dirstate_item_c_v1_state(self);
return PyBytes_FromStringAndSize(&state, 1);
}; };
static PyObject *dirstate_item_get_tracked(dirstateItemObject *self) static PyObject *dirstate_item_get_tracked(dirstateItemObject *self)
{ {
if (self->state == 'a' || self->state == 'm' || self->state == 'n') { if (dirstate_item_c_tracked(self)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dirstate_item_get_added(dirstateItemObject *self) static PyObject *dirstate_item_get_added(dirstateItemObject *self)
{ {
if (self->state == 'a') { if (dirstate_item_c_added(self)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dirstate_item_get_merged(dirstateItemObject *self) static PyObject *dirstate_item_get_merged(dirstateItemObject *self)
{ {
if (self->state == 'm') { if (dirstate_item_c_merged(self)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dirstate_item_get_merged_removed(dirstateItemObject *self) static PyObject *dirstate_item_get_merged_removed(dirstateItemObject *self)
{ {
if (self->state == 'r' && self->size == dirstate_v1_nonnormal) { if (dirstate_item_c_merged_removed(self)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dirstate_item_get_from_p2(dirstateItemObject *self) static PyObject *dirstate_item_get_from_p2(dirstateItemObject *self)
{ {
if (self->state == 'n' && self->size == dirstate_v1_from_p2) { if (dirstate_item_c_from_p2(self)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dirstate_item_get_from_p2_removed(dirstateItemObject *self) static PyObject *dirstate_item_get_from_p2_removed(dirstateItemObject *self)
{ {
if (self->state == 'r' && self->size == dirstate_v1_from_p2) { if (dirstate_item_c_from_p2_removed(self)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dirstate_item_get_removed(dirstateItemObject *self) static PyObject *dirstate_item_get_removed(dirstateItemObject *self)
{ {
if (self->state == 'r') { if (dirstate_item_c_removed(self)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dm_nonnormal(dirstateItemObject *self) static PyObject *dm_nonnormal(dirstateItemObject *self)
{ {
if (self->state != 'n' || self->mtime == ambiguous_time) { if ((dirstate_item_c_v1_state(self) != 'n') ||
(dirstate_item_c_v1_mtime(self) == ambiguous_time)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dm_otherparent(dirstateItemObject *self) static PyObject *dm_otherparent(dirstateItemObject *self)
{ {
if (self->size == dirstate_v1_from_p2) { if (dirstate_item_c_v1_mtime(self) == dirstate_v1_from_p2) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; 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},