openstack/deb-python-pygit2
Code Issues Proposed changes

Merge remote-tracking branch 'cholin/features/diff_tree_empty'

Browse Source
This commit is contained in:
J. David Ibáñez
2013-05-06 19:31:02 +02:00
parent b9c3340c99 b7b9728115
commit c3a5a36631
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/tree.c
View File

@@ -286,38 +286,38 @@ PyDoc_STRVAR(Tree_diff__doc__,
" TODO"); " TODO");
PyObject * PyObject *
Tree_diff(Tree *self, PyObject *args) Tree_diff(Tree *self, PyObject *args, PyObject *kwds)
{ {
git_diff_options opts = GIT_DIFF_OPTIONS_INIT; git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
git_diff_list *diff; git_diff_list *diff;
int err; git_tree* tree = NULL;
git_index* index;
git_repository* repo;
int err, empty_tree = 0;
char *keywords[] = {"obj", "flags", "empty_tree", NULL};
Diff *py_diff; Diff *py_diff;
PyObject *py_obj = NULL; PyObject *py_obj = NULL;
if (!PyArg_ParseTuple(args, "|Oi", &py_obj, &opts.flags)) if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oii", keywords,
&py_obj, &opts.flags, &empty_tree))
return NULL; return NULL;
repo = self->repo->repo;
if (py_obj == NULL) { if (py_obj == NULL) {
err = git_diff_tree_to_workdir( if (empty_tree > 0)
&diff, err = git_diff_tree_to_tree(&diff, repo, self->tree, NULL, &opts);
self->repo->repo, else
self->tree, err = git_diff_tree_to_workdir(&diff, repo, self->tree, &opts);
&opts);
} else if (PyObject_TypeCheck(py_obj, &TreeType)) { } else if (PyObject_TypeCheck(py_obj, &TreeType)) {
err = git_diff_tree_to_tree( tree = ((Tree *)py_obj)->tree;
&diff, err = git_diff_tree_to_tree(&diff, repo, self->tree, tree, &opts);
self->repo->repo,
self->tree,
((Tree *)py_obj)->tree,
&opts);
} else if (PyObject_TypeCheck(py_obj, &IndexType)) { } else if (PyObject_TypeCheck(py_obj, &IndexType)) {
err = git_diff_tree_to_index( index = ((Index *)py_obj)->index;
&diff, err = git_diff_tree_to_index(&diff, repo, self->tree, index, &opts);
self->repo->repo,
self->tree,
((Index *)py_obj)->index,
&opts);
} else { } else {
PyErr_SetObject(PyExc_TypeError, py_obj); PyErr_SetObject(PyExc_TypeError, py_obj);
return NULL; return NULL;
@@ -355,7 +355,7 @@ PyMappingMethods Tree_as_mapping = {
}; };
PyMethodDef Tree_methods[] = { PyMethodDef Tree_methods[] = {
METHOD(Tree, diff, METH_VARARGS), METHOD(Tree, diff, METH_VARARGS | METH_KEYWORDS),
{NULL} {NULL}
}; };

6
test/test_diff.py
View File

@@ -142,6 +142,12 @@ class DiffTest(utils.BareRepoTestCase):
self.assertEqual(patch.old_file_path, 'a') self.assertEqual(patch.old_file_path, 'a')
self.assertEqual(patch.new_file_path, 'a') self.assertEqual(patch.new_file_path, 'a')
def test_diff_empty_tree(self):
commit_a = self.repo[COMMIT_SHA1_1]
diff = commit_a.tree.diff(empty_tree=True)
entries = [p.new_file_path for p in diff]
self.assertAll(lambda x: commit_a.tree[x], entries)
def test_diff_tree_opts(self): def test_diff_tree_opts(self):
commit_c = self.repo[COMMIT_SHA1_3] commit_c = self.repo[COMMIT_SHA1_3]
commit_d = self.repo[COMMIT_SHA1_4] commit_d = self.repo[COMMIT_SHA1_4]