This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3456

revlog: extract function for getting node from known-to-exist rev
ClosedPublic

Authored by martinvonz on May 7 2018, 12:55 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa91f31a1e281: revlog: extract function for getting node from known-to-exist rev
Summary

Many of the calls to index_node() (which converts a rev to a nodeid)
are done with a rev that's know to exist. If the function fails,
there's something really wrong and we should just abort. This was done
in only one place. This patch starts by extracting that code to a
function that we can reuse in later patches.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

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

Diff 8481

mercurial/cext/revlog.c

str = PyTuple_GetItem(tuple, 7); str = PyTuple_GetItem(tuple, 7);
return str ? PyBytes_AS_STRING(str) : NULL; return str ? PyBytes_AS_STRING(str) : NULL;
} }
data = index_deref(self, pos); data = index_deref(self, pos);
return data ? data + 32 : NULL; return data ? data + 32 : NULL;
} }
/*
* Return the 20-byte SHA of the node corresponding to the given rev. The
* rev is assumed to be existing. If not, an exception is set.
*/
static const char *index_node_existing(indexObject *self, Py_ssize_t pos) {
const char *node = index_node(self, pos);
if (node == NULL) {
PyErr_Format(PyExc_IndexError, "could not access rev %d", (int)pos);
}
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, Py_ssize_t *nodelen)
{ {
if (PyBytes_AsStringAndSize(obj, node, nodelen) == -1) if (PyBytes_AsStringAndSize(obj, node, nodelen) == -1)
return -1; return -1;
if (*nodelen == 20) if (*nodelen == 20)
return 0; return 0;
case -3: case -3:
return NULL; return NULL;
case -2: case -2:
Py_RETURN_NONE; Py_RETURN_NONE;
case -1: case -1:
return PyBytes_FromStringAndSize(nullid, 20); return PyBytes_FromStringAndSize(nullid, 20);
} }
fullnode = index_node(self, rev); fullnode = index_node_existing(self, rev);
if (fullnode == NULL) { if (fullnode == NULL) {
PyErr_Format(PyExc_IndexError,
"could not access rev %d", rev);
return NULL; return NULL;
} }
return PyBytes_FromStringAndSize(fullnode, 20); return PyBytes_FromStringAndSize(fullnode, 20);
} }
static PyObject *index_m_get(indexObject *self, PyObject *args) static PyObject *index_m_get(indexObject *self, PyObject *args)
{ {
Py_ssize_t nodelen; Py_ssize_t nodelen;