( )⚙ D11384 dirstate-item: `dirstate_item_from_v1_data` replaces make_dirstate_item

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11384

dirstate-item: `dirstate_item_from_v1_data` replaces make_dirstate_item
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG3337eec29d5b: dirstate-item: `dirstate_item_from_v1_data` replaces make_dirstate_item
Summary

For different format, we will need multiple capsule anyways.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

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

Diff 30174

mercurial/cext/parsers.c

if (!PyArg_ParseTuple(args, "n:make_presized_dict", &expected_size)) { if (!PyArg_ParseTuple(args, "n:make_presized_dict", &expected_size)) {
return NULL; return NULL;
} }
return _dict_new_presized(expected_size); return _dict_new_presized(expected_size);
} }
static inline dirstateItemObject *make_dirstate_item(char state, int mode,
int size, int mtime)
{
dirstateItemObject *t =
PyObject_New(dirstateItemObject, &dirstateItemType);
if (!t) {
return NULL;
}
t->state = state;
t->mode = mode;
t->size = size;
t->mtime = mtime;
return t;
}
static PyObject *dirstate_item_new(PyTypeObject *subtype, PyObject *args, static PyObject *dirstate_item_new(PyTypeObject *subtype, PyObject *args,
PyObject *kwds) PyObject *kwds)
{ {
/* We do all the initialization here and not a tp_init function because /* We do all the initialization here and not a tp_init function because
* dirstate_item is immutable. */ * dirstate_item is immutable. */
dirstateItemObject *t; dirstateItemObject *t;
int wc_tracked; int wc_tracked;
int p1_tracked; int p1_tracked;
} }
if (self->state == 'n' && self->mtime == now) { if (self->state == 'n' && self->mtime == 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, unlike `make_dirstate_item` /* This will never change since it's bound to V1
*/ */
static inline dirstateItemObject * static inline dirstateItemObject *
dirstate_item_from_v1_data(char state, int mode, int size, int mtime) dirstate_item_from_v1_data(char state, int mode, int size, int mtime)
{ {
dirstateItemObject *t = dirstateItemObject *t =
PyObject_New(dirstateItemObject, &dirstateItemType); PyObject_New(dirstateItemObject, &dirstateItemType);
if (!t) { if (!t) {
return NULL; return NULL;
state = tuple->state; state = tuple->state;
mode = tuple->mode; mode = tuple->mode;
size = tuple->size; size = tuple->size;
mtime = tuple->mtime; mtime = tuple->mtime;
if (state == 'n' && mtime == now) { if (state == 'n' && mtime == now) {
/* See pure/parsers.py:pack_dirstate for why we do /* See pure/parsers.py:pack_dirstate for why we do
* this. */ * this. */
mtime = -1; mtime = -1;
mtime_unset = (PyObject *)make_dirstate_item( mtime_unset = (PyObject *)dirstate_item_from_v1_data(
state, mode, size, mtime); state, mode, size, mtime);
if (!mtime_unset) { if (!mtime_unset) {
goto bail; goto bail;
} }
if (PyDict_SetItem(map, k, mtime_unset) == -1) { if (PyDict_SetItem(map, k, mtime_unset) == -1) {
goto bail; goto bail;
} }
Py_DECREF(mtime_unset); Py_DECREF(mtime_unset);
* should not have this module constant. */ * should not have this module constant. */
PyModule_AddStringConstant(mod, "versionerrortext", versionerrortext); PyModule_AddStringConstant(mod, "versionerrortext", versionerrortext);
dirs_module_init(mod); dirs_module_init(mod);
manifest_module_init(mod); manifest_module_init(mod);
revlog_module_init(mod); revlog_module_init(mod);
capsule = PyCapsule_New( capsule = PyCapsule_New(
make_dirstate_item, dirstate_item_from_v1_data,
"mercurial.cext.parsers.make_dirstate_item_CAPI", NULL); "mercurial.cext.parsers.make_dirstate_item_CAPI", NULL);
if (capsule != NULL) if (capsule != NULL)
PyModule_AddObject(mod, "make_dirstate_item_CAPI", capsule); PyModule_AddObject(mod, "make_dirstate_item_CAPI", capsule);
if (PyType_Ready(&dirstateItemType) < 0) { if (PyType_Ready(&dirstateItemType) < 0) {
return; return;
} }
Py_INCREF(&dirstateItemType); Py_INCREF(&dirstateItemType);