Mercurial > hg-stable
diff mercurial/parsers.c @ 25311:d2e88f960d1a
parsers: move index_get_parents's declaration higher
index_get_parents needs to be used in the phase computation code so we need
to move its declaration higher to be able to call it. It cannot be moved any
higher than that so we won't have any more patch doing the same thing.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Wed, 27 May 2015 17:00:28 -0700 |
parents | 3966e39fea98 |
children | ee02728dd5f9 |
line wrap: on
line diff
--- a/mercurial/parsers.c Wed May 27 15:49:24 2015 -0700 +++ b/mercurial/parsers.c Wed May 27 17:00:28 2015 -0700 @@ -741,6 +741,22 @@ return PyString_AS_STRING(self->data) + pos * v1_hdrsize; } +static inline void index_get_parents(indexObject *self, Py_ssize_t rev, + int *ps) +{ + if (rev >= self->length - 1) { + PyObject *tuple = PyList_GET_ITEM(self->added, + rev - self->length + 1); + ps[0] = (int)PyInt_AS_LONG(PyTuple_GET_ITEM(tuple, 5)); + ps[1] = (int)PyInt_AS_LONG(PyTuple_GET_ITEM(tuple, 6)); + } else { + const char *data = index_deref(self, rev); + ps[0] = getbe32(data + 24); + ps[1] = getbe32(data + 28); + } +} + + /* * RevlogNG format (all in big endian, data may be inlined): * 6 bytes: offset @@ -1177,21 +1193,6 @@ return ret; } -static inline void index_get_parents(indexObject *self, Py_ssize_t rev, - int *ps) -{ - if (rev >= self->length - 1) { - PyObject *tuple = PyList_GET_ITEM(self->added, - rev - self->length + 1); - ps[0] = (int)PyInt_AS_LONG(PyTuple_GET_ITEM(tuple, 5)); - ps[1] = (int)PyInt_AS_LONG(PyTuple_GET_ITEM(tuple, 6)); - } else { - const char *data = index_deref(self, rev); - ps[0] = getbe32(data + 24); - ps[1] = getbe32(data + 28); - } -} - static PyObject *index_headrevs(indexObject *self, PyObject *args) { Py_ssize_t i, j, len;