openstack/deb-python-pygit2
Code Issues Proposed changes

add len(diff) instead of diff.size

Browse Source
This commit is contained in:
Huang Huang
2013-11-01 14:32:49 +08:00
parent 9730564c73
commit c0b1ab9024
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/diff.c
View File

@@ -249,11 +249,11 @@ PyTypeObject DiffIterType = {
(iternextfunc) DiffIter_iternext, /* tp_iternext */ (iternextfunc) DiffIter_iternext, /* tp_iternext */
}; };
PyDoc_STRVAR(Diff_size__doc__, "Returns the number of deltas/patches in this diff."); Py_ssize_t
PyObject * Diff_len(Diff *self)
Diff_size__get__(Diff *self)
{ {
return PyLong_FromSize_t(git_diff_num_deltas(self->list)); assert(self->list);
return (Py_ssize_t)git_diff_num_deltas(self->list);
} }
PyDoc_STRVAR(Diff_patch__doc__, "Patch diff string."); PyDoc_STRVAR(Diff_patch__doc__, "Patch diff string.");
@@ -446,12 +446,11 @@ Diff_dealloc(Diff *self)
PyGetSetDef Diff_getseters[] = { PyGetSetDef Diff_getseters[] = {
GETTER(Diff, patch), GETTER(Diff, patch),
GETTER(Diff, size),
{NULL} {NULL}
}; };
PyMappingMethods Diff_as_mapping = { PyMappingMethods Diff_as_mapping = {
0, /* mp_length */ (lenfunc)Diff_len, /* mp_length */
(binaryfunc)Diff_getitem, /* mp_subscript */ (binaryfunc)Diff_getitem, /* mp_subscript */
0, /* mp_ass_subscript */ 0, /* mp_ass_subscript */
}; };

2
test/test_diff.py
View File

@@ -254,7 +254,7 @@ class DiffTest(utils.BareRepoTestCase):
diff = commit_a.tree.diff_to_tree(commit_b.tree) diff = commit_a.tree.diff_to_tree(commit_b.tree)
self.assertEqual(diff.patch, PATCH) self.assertEqual(diff.patch, PATCH)
self.assertEqual(diff.size, len([patch for patch in diff])) self.assertEqual(len(diff), len([patch for patch in diff]))
def test_diff_oids(self): def test_diff_oids(self):
commit_a = self.repo[COMMIT_SHA1_1] commit_a = self.repo[COMMIT_SHA1_1]