comparison mercurial/manifest.c @ 24294:3d485727e45e

lazymanifest: extract function for iterating to next line

This will soon be reused by keys iterator.

24293:30e9ee203846

	lmIter *self = (lmIter *)o;
	Py_DECREF(self->m);
	PyObject_Del(self);
}

static PyObject *lmiter_iternext(PyObject *o)
{
	size_t pl;
	line *l;
	Py_ssize_t consumed;
	PyObject *ret = NULL, *path = NULL, *hash = NULL, *flags = NULL;
	lmIter *self = (lmIter *)o;
	do {
		self->pos++;
		if (self->pos >= self->m->numlines) {
			goto bail;
		}
		/* skip over deleted manifest entries */
	} while (self->m->lines[self->pos].deleted);
	l = self->m->lines + self->pos;
	pl = pathlen(l);
	path = PyString_FromStringAndSize(l->start, pl);
	hash = nodeof(l);
	consumed = pl + 41;
	flags = PyString_FromStringAndSize(l->start + consumed,
									   l->len - consumed - 1);
	if (!path || !hash || !flags) {
		goto bail;
	}
	ret = PyTuple_Pack(3, path, hash, flags);
 bail:
	Py_XDECREF(path);
	Py_XDECREF(hash);
	Py_XDECREF(flags);
	return ret;
}

static PyTypeObject lazymanifestIterator = {
	PyObject_HEAD_INIT(NULL)
	0,                               /*ob_size */

24294:3d485727e45e

	lmIter *self = (lmIter *)o;
	Py_DECREF(self->m);
	PyObject_Del(self);
}

static line *lmiter_nextline(lmIter *self)
{
	do {
		self->pos++;
		if (self->pos >= self->m->numlines) {
			return NULL;
		}
		/* skip over deleted manifest entries */
	} while (self->m->lines[self->pos].deleted);
	return self->m->lines + self->pos;
}

static PyObject *lmiter_iternext(PyObject *o)
{
	size_t pl;
	line *l;
	Py_ssize_t consumed;
	PyObject *path = NULL, *hash = NULL, *flags = NULL;
	l = lmiter_nextline((lmIter *)o);
	if (!l) {
		goto bail;
	}
	pl = pathlen(l);
	path = PyString_FromStringAndSize(l->start, pl);
	hash = nodeof(l);
	consumed = pl + 41;
	flags = PyString_FromStringAndSize(l->start + consumed,
									   l->len - consumed - 1);
	if (!path || !hash || !flags) {
		goto bail;
	}
	return PyTuple_Pack(3, path, hash, flags);
 bail:
	Py_XDECREF(path);
	Py_XDECREF(hash);
	Py_XDECREF(flags);
	return NULL;
}

static PyTypeObject lazymanifestIterator = {
	PyObject_HEAD_INIT(NULL)
	0,                               /*ob_size */