openstack/deb-python-pygit2
Code Issues Proposed changes

TreeBuilder: allow the source to be a Tree

Browse Source 
If the user passes a tree, use it as the source for the
TreeBuilder. On the way, make sure we free the tree we looked up, and
fix a test to make sure the TreeBuilder starts empty.
This commit is contained in:
Carlos Martín Nieto
2012-03-09 12:12:05 +01:00
parent 3e73d3a2b8
commit 242f3c2ffa
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pygit2.c
View File

@@ -942,17 +942,24 @@ Repository_TreeBuilder(Repository *self, PyObject *args)
{ {
TreeBuilder *builder; TreeBuilder *builder;
git_treebuilder *bld; git_treebuilder *bld;
PyObject *py_oid = NULL; PyObject *py_src = NULL;
size_t oid_len; size_t oid_len;
git_oid oid; git_oid oid;
git_tree *tree = NULL; git_tree *tree = NULL;
int err; int err;
if (!PyArg_ParseTuple(args, "|O", &py_oid)) if (!PyArg_ParseTuple(args, "|O", &py_src))
return NULL; return NULL;
if (py_oid) { if (py_src) {
oid_len = py_str_to_git_oid(py_oid, &oid); if (PyObject_TypeCheck(py_src, &TreeType)) {
Tree *py_tree = (Tree *)py_src;
if (py_tree->repo->repo != self->repo) {
return Error_set(GIT_EINVALIDARGS);
}
tree = py_tree->tree;
} else {
oid_len = py_str_to_git_oid(py_src, &oid);
TODO_SUPPORT_SHORT_HEXS(oid_len) TODO_SUPPORT_SHORT_HEXS(oid_len)
if (oid_len == 0) if (oid_len == 0)
return NULL; return NULL;
@@ -961,8 +968,10 @@ Repository_TreeBuilder(Repository *self, PyObject *args)
if (err < 0) if (err < 0)
return Error_set(err); return Error_set(err);
} }
}
err = git_treebuilder_create(&bld, tree); err = git_treebuilder_create(&bld, tree);
git_tree_free(tree);
if (err < 0) if (err < 0)
return Error_set(err); return Error_set(err);

8
test/test_treebuilder.py
View File

@@ -50,9 +50,15 @@ class TreeBuilderTest(utils.BareRepoTestCase):
result = bld.write() result = bld.write()
self.assertEqual(tree.oid, result) self.assertEqual(tree.oid, result)
def test_noop_treebuilder_from_tree(self):
tree = self.repo[TREE_SHA]
bld = self.repo.TreeBuilder(tree)
result = bld.write()
self.assertEqual(tree.oid, result)
def test_rebuild_treebuilder(self): def test_rebuild_treebuilder(self):
tree = self.repo[TREE_SHA] tree = self.repo[TREE_SHA]
bld = self.repo.TreeBuilder(TREE_SHA) bld = self.repo.TreeBuilder()
for e in tree: for e in tree:
bld.insert(e) bld.insert(e)