This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4119

index: move raise_revlog_error() further up
ClosedPublic

Authored by martinvonz on Aug 5 2018, 3:58 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf85b25608252: index: move raise_revlog_error() further up
Summary

I will add another caller below it.

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

martinvonz created this revision.Aug 5 2018, 3:58 AM
martinvonz updated this revision to Diff 9925.Aug 5 2018, 4:03 AM
martinvonz updated this revision to Diff 9984.Aug 6 2018, 9:24 AM
martinvonz updated this revision to Diff 10043.Aug 7 2018, 2:27 AM
martinvonz updated this revision to Diff 10083.Aug 8 2018, 8:09 PM
martinvonz updated this revision to Diff 10094.Aug 9 2018, 3:27 AM
martinvonz updated this revision to Diff 10457.Aug 20 2018, 3:35 AM
Closed by commit rHGf85b25608252: index: move raise_revlog_error() further up (authored by martinvonz). · Explain WhyAug 20 2018, 6:52 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/revlog.c (60 lines)

Diff 10483

mercurial/cext/revlog.c

static const char *const tuple_format = PY23("Kiiiiiis#", "Kiiiiiiy#"); static const char *const tuple_format = PY23("Kiiiiiis#", "Kiiiiiiy#");
#else #else
static const char *const tuple_format = PY23("kiiiiiis#", "kiiiiiiy#"); static const char *const tuple_format = PY23("kiiiiiis#", "kiiiiiiy#");
#endif #endif
/* A RevlogNG v1 index entry is 64 bytes long. */ /* A RevlogNG v1 index entry is 64 bytes long. */
static const long v1_hdrsize = 64; static const long v1_hdrsize = 64;
static void raise_revlog_error(void)
{
PyObject *mod = NULL, *dict = NULL, *errclass = NULL;
mod = PyImport_ImportModule("mercurial.error");
if (mod == NULL) {
goto cleanup;
}
dict = PyModule_GetDict(mod);
if (dict == NULL) {
goto cleanup;
}
Py_INCREF(dict);
errclass = PyDict_GetItemString(dict, "RevlogError");
if (errclass == NULL) {
PyErr_SetString(PyExc_SystemError,
"could not find RevlogError");
goto cleanup;
}
/* value of exception is ignored by callers */
PyErr_SetString(errclass, "RevlogError");
cleanup:
Py_XDECREF(dict);
Py_XDECREF(mod);
}
/* /*
* Return a pointer to the beginning of a RevlogNG record. * Return a pointer to the beginning of a RevlogNG record.
*/ */
static const char *index_deref(indexObject *self, Py_ssize_t pos) static const char *index_deref(indexObject *self, Py_ssize_t pos)
{ {
if (self->inlined && pos > 0) { if (self->inlined && pos > 0) {
if (self->offsets == NULL) { if (self->offsets == NULL) {
self->offsets = PyMem_Malloc(self->raw_length * self->offsets = PyMem_Malloc(self->raw_length *
self->ntrev = rev; self->ntrev = rev;
} }
if (rev >= 0) if (rev >= 0)
return rev; return rev;
return -2; return -2;
} }
static void raise_revlog_error(void)
{
PyObject *mod = NULL, *dict = NULL, *errclass = NULL;
mod = PyImport_ImportModule("mercurial.error");
if (mod == NULL) {
goto cleanup;
}
dict = PyModule_GetDict(mod);
if (dict == NULL) {
goto cleanup;
}
Py_INCREF(dict);
errclass = PyDict_GetItemString(dict, "RevlogError");
if (errclass == NULL) {
PyErr_SetString(PyExc_SystemError,
"could not find RevlogError");
goto cleanup;
}
/* value of exception is ignored by callers */
PyErr_SetString(errclass, "RevlogError");
cleanup:
Py_XDECREF(dict);
Py_XDECREF(mod);
}
static PyObject *index_getitem(indexObject *self, PyObject *value) static PyObject *index_getitem(indexObject *self, PyObject *value)
{ {
char *node; char *node;
int rev; int rev;
if (PyInt_Check(value)) if (PyInt_Check(value))
return index_get(self, PyInt_AS_LONG(value)); return index_get(self, PyInt_AS_LONG(value));