From a6a36ad80352ed13b87dda59cae4d8b8e1128110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
Date: Sun, 11 Mar 2012 22:50:55 +0100
Subject: [PATCH] Now TreeEntry points back to the repo
Instead of pointing back to the tree.
---
pygit2.c | 23 +++++++++--------------
test/test_tree.py | 5 ++---
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/pygit2.c b/pygit2.c
index fbc7226..6a53012 100644
--- a/pygit2.c
+++ b/pygit2.c
@@ -104,12 +104,7 @@ OBJECT_STRUCT(Blob, git_blob, blob)
OBJECT_STRUCT(Tag, git_tag, tag)
OBJECT_STRUCT(Index, git_index, index)
OBJECT_STRUCT(Walker, git_revwalk, walk)
-
-typedef struct {
- PyObject_HEAD
- const git_tree_entry *entry;
- Tree *tree;
-} TreeEntry;
+OBJECT_STRUCT(TreeEntry, git_tree_entry, entry)
typedef struct {
PyObject_HEAD
@@ -1329,7 +1324,7 @@ static PyTypeObject CommitType = {
static void
TreeEntry_dealloc(TreeEntry *self)
{
- Py_XDECREF(self->tree);
+ Py_XDECREF(self->repo);
PyObject_Del(self);
}
@@ -1366,7 +1361,7 @@ TreeEntry_to_object(TreeEntry *self)
const git_oid *entry_oid;
entry_oid = git_tree_entry_id(self->entry);
- return lookup_object(self->tree->repo, entry_oid, GIT_OBJ_ANY);
+ return lookup_object(self->repo, entry_oid, GIT_OBJ_ANY);
}
static PyGetSetDef TreeEntry_getseters[] = {
@@ -1444,15 +1439,15 @@ Tree_contains(Tree *self, PyObject *py_name)
}
static TreeEntry *
-wrap_tree_entry(const git_tree_entry *entry, Tree *tree)
+wrap_tree_entry(const git_tree_entry *entry, Repository *repo)
{
TreeEntry *py_entry;
py_entry = PyObject_New(TreeEntry, &TreeEntryType);
if (py_entry) {
py_entry->entry = entry;
- py_entry->tree = tree;
- Py_INCREF(tree);
+ py_entry->repo = repo;
+ Py_INCREF(repo);
}
return py_entry;
}
@@ -1515,7 +1510,7 @@ Tree_getitem_by_index(Tree *self, PyObject *py_index)
PyErr_SetObject(PyExc_IndexError, py_index);
return NULL;
}
- return wrap_tree_entry(entry, self);
+ return wrap_tree_entry(entry, self->repo);
}
static TreeEntry *
@@ -1537,7 +1532,7 @@ Tree_getitem(Tree *self, PyObject *value)
PyErr_SetObject(PyExc_KeyError, value);
return NULL;
}
- return wrap_tree_entry(entry, self);
+ return wrap_tree_entry(entry, self->repo);
}
static PySequenceMethods Tree_as_sequence = {
@@ -1732,7 +1727,7 @@ TreeIter_iternext(TreeIter *self)
return NULL;
self->i += 1;
- return (TreeEntry*)wrap_tree_entry(tree_entry, self->owner);
+ return (TreeEntry*)wrap_tree_entry(tree_entry, self->owner->repo);
}
static PyTypeObject TreeIterType = {
diff --git a/test/test_tree.py b/test/test_tree.py
index 571f702..6c1a916 100644
--- a/test/test_tree.py
+++ b/test/test_tree.py
@@ -80,9 +80,8 @@ class TreeTest(utils.BareRepoTestCase):
sha = '297efb891a47de80be0cfe9c639e4b8c9b450989'
self.assertTreeEntryEqual(subtree[0], sha, 'd', 0o0100644)
- # XXX Creating new trees was removed from libgit2 by v0.11.0, we
- # deactivate this test temporarily, since the feature may come back in
- # a near feature (if it does not this test will be removed).
+ # TODO This test worked with libgit2 v0.10.0, update to use the
+ # tree-builder
def xtest_new_tree(self):
tree = pygit2.Tree(self.repo)
self.assertEqual(0, len(tree))