This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4026

revlog: remove unnecessary output parameter from node_check()
ClosedPublic

Authored by martinvonz on Aug 1 2018, 3:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG49628742d264: revlog: remove unnecessary output parameter from node_check()
Summary

The "nodelen" output parameter is always set to 20 if the function
returns successfully.

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.

Revision Contents
Changeset List

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

Diff 9820

mercurial/cext/revlog.c

PyErr_Format(PyExc_IndexError, "could not access rev %d", PyErr_Format(PyExc_IndexError, "could not access rev %d",
(int)pos); (int)pos);
} }
return node; return node;
} }
static int nt_insert(indexObject *self, const char *node, int rev); static int nt_insert(indexObject *self, const char *node, int rev);
static int node_check(PyObject *obj, char **node, Py_ssize_t *nodelen) static int node_check(PyObject *obj, char **node)
{ {
if (PyBytes_AsStringAndSize(obj, node, nodelen) == -1) Py_ssize_t nodelen;
if (PyBytes_AsStringAndSize(obj, node, &nodelen) == -1)
return -1; return -1;
if (*nodelen == 20) if (nodelen == 20)
return 0; return 0;
PyErr_SetString(PyExc_ValueError, "20-byte hash required"); PyErr_SetString(PyExc_ValueError, "20-byte hash required");
return -1; return -1;
} }
static PyObject *index_insert(indexObject *self, PyObject *args) static PyObject *index_insert(indexObject *self, PyObject *args)
{ {
PyObject *obj; PyObject *obj;
char *node; char *node;
int index; int index;
Py_ssize_t len, nodelen; Py_ssize_t len;
if (!PyArg_ParseTuple(args, "iO", &index, &obj)) if (!PyArg_ParseTuple(args, "iO", &index, &obj))
return NULL; return NULL;
if (!PyTuple_Check(obj) || PyTuple_GET_SIZE(obj) != 8) { if (!PyTuple_Check(obj) || PyTuple_GET_SIZE(obj) != 8) {
PyErr_SetString(PyExc_TypeError, "8-tuple required"); PyErr_SetString(PyExc_TypeError, "8-tuple required");
return NULL; return NULL;
} }
if (node_check(PyTuple_GET_ITEM(obj, 7), &node, &nodelen) == -1) if (node_check(PyTuple_GET_ITEM(obj, 7), &node) == -1)
return NULL; return NULL;
len = index_length(self); len = index_length(self);
if (index < 0) if (index < 0)
index += len; index += len;
if (index != len - 1) { if (index != len - 1) {
cleanup: cleanup:
Py_XDECREF(dict); Py_XDECREF(dict);
Py_XDECREF(mod); Py_XDECREF(mod);
} }
static PyObject *index_getitem(indexObject *self, PyObject *value) static PyObject *index_getitem(indexObject *self, PyObject *value)
{ {
char *node; char *node;
Py_ssize_t nodelen;
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));
if (node_check(value, &node, &nodelen) == -1) if (node_check(value, &node) == -1)
return NULL; return NULL;
rev = index_find_node(self, node, nodelen); rev = index_find_node(self, node, 20);
if (rev >= -1) if (rev >= -1)
return PyInt_FromLong(rev); return PyInt_FromLong(rev);
if (rev == -2) if (rev == -2)
raise_revlog_error(); raise_revlog_error();
return NULL; return NULL;
} }
/* /*
if (fullnode == NULL) { if (fullnode == NULL) {
return NULL; return NULL;
} }
return PyBytes_FromStringAndSize(fullnode, 20); return PyBytes_FromStringAndSize(fullnode, 20);
} }
static PyObject *index_shortest(indexObject *self, PyObject *args) static PyObject *index_shortest(indexObject *self, PyObject *args)
{ {
Py_ssize_t nodelen;
PyObject *val; PyObject *val;
char *node; char *node;
int length; int length;
if (!PyArg_ParseTuple(args, "O", &val)) if (!PyArg_ParseTuple(args, "O", &val))
return NULL; return NULL;
if (node_check(val, &node, &nodelen) == -1) if (node_check(val, &node) == -1)
return NULL; return NULL;
self->ntlookups++; self->ntlookups++;
length = nt_shortest(self, node); length = nt_shortest(self, node);
if (length == -3) if (length == -3)
return NULL; return NULL;
if (length == -2) { if (length == -2) {
raise_revlog_error(); raise_revlog_error();
return NULL; return NULL;
} }
return PyInt_FromLong(length); return PyInt_FromLong(length);
} }
static PyObject *index_m_get(indexObject *self, PyObject *args) static PyObject *index_m_get(indexObject *self, PyObject *args)
{ {
Py_ssize_t nodelen;
PyObject *val; PyObject *val;
char *node; char *node;
int rev; int rev;
if (!PyArg_ParseTuple(args, "O", &val)) if (!PyArg_ParseTuple(args, "O", &val))
return NULL; return NULL;
if (node_check(val, &node, &nodelen) == -1) if (node_check(val, &node) == -1)
return NULL; return NULL;
rev = index_find_node(self, node, nodelen); rev = index_find_node(self, node, 20);
if (rev == -3) if (rev == -3)
return NULL; return NULL;
if (rev == -2) if (rev == -2)
Py_RETURN_NONE; Py_RETURN_NONE;
return PyInt_FromLong(rev); return PyInt_FromLong(rev);
} }
static int index_contains(indexObject *self, PyObject *value) static int index_contains(indexObject *self, PyObject *value)
{ {
char *node; char *node;
Py_ssize_t nodelen;
if (PyInt_Check(value)) { if (PyInt_Check(value)) {
long rev = PyInt_AS_LONG(value); long rev = PyInt_AS_LONG(value);
return rev >= -1 && rev < index_length(self); return rev >= -1 && rev < index_length(self);
} }
if (node_check(value, &node, &nodelen) == -1) if (node_check(value, &node) == -1)
return -1; return -1;
switch (index_find_node(self, node, nodelen)) { switch (index_find_node(self, node, 20)) {
case -3: case -3:
return -1; return -1;
case -2: case -2:
return 0; return 0;
default: default:
return 1; return 1;
} }
} }
* slice deletion * slice deletion
* string assignment (extend node->rev mapping) * string assignment (extend node->rev mapping)
* string deletion (shrink node->rev mapping) * string deletion (shrink node->rev mapping)
*/ */
static int index_assign_subscript(indexObject *self, PyObject *item, static int index_assign_subscript(indexObject *self, PyObject *item,
PyObject *value) PyObject *value)
{ {
char *node; char *node;
Py_ssize_t nodelen;
long rev; long rev;
if (PySlice_Check(item) && value == NULL) if (PySlice_Check(item) && value == NULL)
return index_slice_del(self, item); return index_slice_del(self, item);
if (node_check(item, &node, &nodelen) == -1) if (node_check(item, &node) == -1)
return -1; return -1;
if (value == NULL) if (value == NULL)
return self->nt ? nt_insert(self, node, -1) : 0; return self->nt ? nt_insert(self, node, -1) : 0;
rev = PyInt_AsLong(value); rev = PyInt_AsLong(value);
if (rev > INT_MAX || rev < 0) { if (rev > INT_MAX || rev < 0) {
if (!PyErr_Occurred()) if (!PyErr_Occurred())
PyErr_SetString(PyExc_ValueError, "rev out of range"); PyErr_SetString(PyExc_ValueError, "rev out of range");