This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5459

parsers: remove long-dead parse_manifest method
ClosedPublic

Authored by durin42 on Dec 20 2018, 1:41 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG55d6d0ff703b: parsers: remove long-dead parse_manifest method
Summary

We haven't used this in years, I think it's fine to ditch it now. We
had previously kept it around to ease bisecting with built extensions,
but these days we've got a better versioning scheme anyway. Noticed
this method kicking around while looking in parsers.so for likely
fuzzing targets.

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.Dec 20 2018, 1:41 AM
Closed by commit rHG55d6d0ff703b: parsers: remove long-dead parse_manifest method (authored by durin42). · Explain WhyDec 20 2018, 7:33 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 12920

mercurial/cext/parsers.c

Py_ssize_t expected_size; Py_ssize_t expected_size;
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);
} }
/*
* This code assumes that a manifest is stitched together with newline
* ('\n') characters.
*/
static PyObject *parse_manifest(PyObject *self, PyObject *args)
{
PyObject *mfdict, *fdict;
char *str, *start, *end;
int len;
if (!PyArg_ParseTuple(
args, PY23("O!O!s#:parse_manifest", "O!O!y#:parse_manifest"),
&PyDict_Type, &mfdict, &PyDict_Type, &fdict, &str, &len))
goto quit;
start = str;
end = str + len;
while (start < end) {
PyObject *file = NULL, *node = NULL;
PyObject *flags = NULL;
char *zero = NULL, *newline = NULL;
ptrdiff_t nlen;
zero = memchr(start, '\0', end - start);
if (!zero) {
PyErr_SetString(PyExc_ValueError,
"manifest entry has no separator");
goto quit;
}
newline = memchr(zero + 1, '\n', end - (zero + 1));
if (!newline) {
PyErr_SetString(PyExc_ValueError,
"manifest contains trailing garbage");
goto quit;
}
file = PyBytes_FromStringAndSize(start, zero - start);
if (!file)
goto bail;
nlen = newline - zero - 1;
node = unhexlify(zero + 1, nlen > 40 ? 40 : (Py_ssize_t)nlen);
if (!node)
goto bail;
if (nlen > 40) {
flags = PyBytes_FromStringAndSize(zero + 41, nlen - 40);
if (!flags)
goto bail;
if (PyDict_SetItem(fdict, file, flags) == -1)
goto bail;
}
if (PyDict_SetItem(mfdict, file, node) == -1)
goto bail;
start = newline + 1;
Py_XDECREF(flags);
Py_XDECREF(node);
Py_XDECREF(file);
continue;
bail:
Py_XDECREF(flags);
Py_XDECREF(node);
Py_XDECREF(file);
goto quit;
}
Py_INCREF(Py_None);
return Py_None;
quit:
return NULL;
}
static inline dirstateTupleObject *make_dirstate_tuple(char state, int mode, static inline dirstateTupleObject *make_dirstate_tuple(char state, int mode,
int size, int mtime) int size, int mtime)
{ {
dirstateTupleObject *t = dirstateTupleObject *t =
PyObject_New(dirstateTupleObject, &dirstateTupleType); PyObject_New(dirstateTupleObject, &dirstateTupleType);
if (!t) if (!t)
return NULL; return NULL;
t->state = state; t->state = state;
PyObject *lowerencode(PyObject *self, PyObject *args); PyObject *lowerencode(PyObject *self, PyObject *args);
PyObject *parse_index2(PyObject *self, PyObject *args); PyObject *parse_index2(PyObject *self, PyObject *args);
static PyMethodDef methods[] = { static PyMethodDef methods[] = {
{"pack_dirstate", pack_dirstate, METH_VARARGS, "pack a dirstate\n"}, {"pack_dirstate", pack_dirstate, METH_VARARGS, "pack a dirstate\n"},
{"nonnormalotherparententries", nonnormalotherparententries, METH_VARARGS, {"nonnormalotherparententries", nonnormalotherparententries, METH_VARARGS,
"create a set containing non-normal and other parent entries of given " "create a set containing non-normal and other parent entries of given "
"dirstate\n"}, "dirstate\n"},
{"parse_manifest", parse_manifest, METH_VARARGS, "parse a manifest\n"},
{"parse_dirstate", parse_dirstate, METH_VARARGS, "parse a dirstate\n"}, {"parse_dirstate", parse_dirstate, METH_VARARGS, "parse a dirstate\n"},
{"parse_index2", parse_index2, METH_VARARGS, "parse a revlog index\n"}, {"parse_index2", parse_index2, METH_VARARGS, "parse a revlog index\n"},
{"isasciistr", isasciistr, METH_VARARGS, "check if an ASCII string\n"}, {"isasciistr", isasciistr, METH_VARARGS, "check if an ASCII string\n"},
{"asciilower", asciilower, METH_VARARGS, "lowercase an ASCII string\n"}, {"asciilower", asciilower, METH_VARARGS, "lowercase an ASCII string\n"},
{"asciiupper", asciiupper, METH_VARARGS, "uppercase an ASCII string\n"}, {"asciiupper", asciiupper, METH_VARARGS, "uppercase an ASCII string\n"},
{"dict_new_presized", dict_new_presized, METH_VARARGS, {"dict_new_presized", dict_new_presized, METH_VARARGS,
"construct a dict with an expected size\n"}, "construct a dict with an expected size\n"},
{"make_file_foldmap", make_file_foldmap, METH_VARARGS, {"make_file_foldmap", make_file_foldmap, METH_VARARGS,