Merge branch 'iteration_and_retrieval' into improvements

* iteration_and_retrieval:
  test_performance: module containing benchmarks to get an idea of the achieved throughput
  Removed plenty of mocked tree tests as they cannot work anymore with persistent commands that require stdin AND binary data - not even an adapter would help here. These tests will have to be replaced.
  tree: now reads tress directly by parsing the binary data, allowing it to safe possibly hundreds of command calls
  Refs are now truly dynamic - this costs a little bit of (persistent command) work, but assures refs behave as expected
  persistent command signature changed to also return the hexsha from a possible input ref - the objects pointed to by refs are now baked on demand - perhaps it should change to always be re-retrieved using a property as it is relatively fast - this way refs can always be cached
  test_blob: removed many redundant tests that would fail now as the mock cannot handle the complexity of the command backend
  Implemented git command facility to keep persistent commands for fast object information retrieval
  test: Added time-consuming test which could also be a benchmark in fact - currently it cause hundreds of command invocations which is slow
  cmd: added option to return the process directly, allowing to read the output directly from the output stream
  added Iterable interface to Ref type
  renamed find_all to list_all, changed commit to use iterable interface in preparation for command changes
  Added base for all iteratable objects
  unified name of utils module, recently it was named util and utils in different packages
  tree: renamed content_from_string to _from_string to make it private. Removed tests that were testing that method
  tree: now behaves like a list with string indexing functionality - using a dict as cache is a problem as the tree is ordered, added blobs, trees and traverse method
  test_base: Improved basic object creation as well as set hash tests
  repo.active_branch now returns a Head object, not a string
  IndexObjects are now checking their slots to raise a proper error message in case someone tries to access an unset path or mode - this information cannot be retrieved afterwards as IndexObject information is kept in the object that pointed at them. To find this information, one would have to search all objects which is not feasible
  refs now take repo as first argument and derive from LazyMixin to allow them to dynamically retrieve their objects

1 files changed, 27 insertions, 132 deletions

diff --git a/test/git/test_tree.py b/test/git/test_tree.py
index cb8ebb04..dafb6f3f 100644
--- a/test/git/test_tree.py
+++ b/test/git/test_tree.py
@@ -7,143 +7,38 @@
 from test.testlib import *
 from git import *
 
-class TestTree(object):
-	def setup(self):
-		self.repo = Repo(GIT_REPO)
-
-	@patch_object(Git, '_call_process')
-	def test_contents_should_cache(self, git):
-		git.return_value = fixture('ls_tree_a') + fixture('ls_tree_b')
+class TestTree(TestCase):
 	
-		tree = self.repo.tree('master')
-
-		child = tree['grit']
-		child.items()
-		child.items()
-		
-		assert_true(git.called)
-		assert_equal(2, git.call_count)
-		assert_equal(git.call_args, (('ls_tree', '34868e6e7384cb5ee51c543a8187fdff2675b5a7'), {}))
-  
-	def test_content_from_string_tree_should_return_tree(self):
-		text = fixture('ls_tree_a').splitlines()[-1]
-		tree = Tree.content__from_string(None, text)
-
-		assert_equal(Tree, tree.__class__)
-		assert_equal("650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44", tree.id)
-		assert_equal(0,tree.mode)		# git tree objects always use this mode
-		assert_equal("test", tree.path)
-  
-	def test_content_from_string_tree_should_return_blob(self):
-		text = fixture('ls_tree_b').split("\n")[0]
-		
-		tree = Tree.content__from_string(None, text)
-
-		assert_equal(Blob, tree.__class__)
-		assert_equal("aa94e396335d2957ca92606f909e53e7beaf3fbb", tree.id)
-		assert_mode_644(tree.mode)
-		assert_equal("grit.rb", tree.path)
+	def setUp(self):
+		self.repo = Repo(GIT_REPO)
 
-	def test_content_from_string_tree_should_return_commit(self):
-		text = fixture('ls_tree_commit').split("\n")[1]
-	
-		tree = Tree.content__from_string(None, text)
-		assert_none(tree)
 	
-	@raises(TypeError)
-	def test_content_from_string_invalid_type_should_raise(self):
-		Tree.content__from_string(None, "040000 bogus 650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44	test")
-
-	@patch_object(Blob, 'size')
-	@patch_object(Git, '_call_process')
-	def test_slash(self, git, blob):
-		git.return_value = fixture('ls_tree_a')
-		blob.return_value = 1
-		
-		tree = self.repo.tree('master')
-		
-		assert_equal('aa06ba24b4e3f463b3c4a85469d0fb9e5b421cf8', (tree/'lib').id)
-		assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', (tree/'README.txt').id)
-		
-		assert_true(git.called)
-		assert_equal(git.call_args, (('ls_tree', 'master'), {}))
-  
-	@patch_object(Blob, 'size')
-	@patch_object(Git, '_call_process')
-	def test_slash_with_zero_length_file(self, git, blob):
-		git.return_value = fixture('ls_tree_a')
-		blob.return_value = 0
-		
-		tree = self.repo.tree('master')
-		
-		assert_not_none(tree/'README.txt')
-		assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', (tree/'README.txt').id)
 		
-		assert_true(git.called)
-		assert_equal(git.call_args, (('ls_tree', 'master'), {}))
+	def test_traverse(self):
+		root = self.repo.tree()
+		num_recursive = 0
+		all_items = list()
+		for obj in root.traverse():
+			if "/" in obj.path:
+				num_recursive += 1
+				
+			assert isinstance(obj, (Blob, Tree))
+			all_items.append(obj)
+		# END for each object
+		# limit recursion level to 0 - should be same as default iteration
+		assert all_items
+		assert 'CHANGES' in root
+		assert len(list(root)) == len(list(root.traverse(max_depth=0)))
+		
+		# only choose trees
+		trees_only = lambda i: i.type == "tree"
+		trees = list(root.traverse(predicate = trees_only))
+		assert len(trees) == len(list( i for i in root.traverse() if trees_only(i) ))
+		
+		# trees and blobs
+		assert len(set(trees)|set(root.trees)) == len(trees)
+		assert len(set(b for b in root if isinstance(b, Blob)) | set(root.blobs)) == len( root.blobs )
   
-	@patch_object(Git, '_call_process')
-	def test_slash_with_commits(self, git):
-		git.return_value = fixture('ls_tree_commit')
-
-		tree = self.repo.tree('master')
-	
-		assert_none(tree/'bar')
-		assert_equal('2afb47bcedf21663580d5e6d2f406f08f3f65f19', (tree/'foo').id)
-		assert_equal('f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', (tree/'baz').id)
-
-		assert_true(git.called)
-		assert_equal(git.call_args, (('ls_tree', 'master'), {}))
-
-	@patch_object(Blob, 'size')
-	@patch_object(Git, '_call_process')
-	def test_dict(self, git, blob):
-		git.return_value = fixture('ls_tree_a')
-		blob.return_value = 1
-
-		tree = self.repo.tree('master')
-
-		assert_equal('aa06ba24b4e3f463b3c4a85469d0fb9e5b421cf8', tree['lib'].id)
-		assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', tree['README.txt'].id)
-
-		assert_true(git.called)
-		assert_equal(git.call_args, (('ls_tree', 'master'), {}))
-
-	@patch_object(Blob, 'size')
-	@patch_object(Git, '_call_process')
-	def test_dict_with_zero_length_file(self, git, blob):
-		git.return_value = fixture('ls_tree_a')
-		blob.return_value = 0
-
-		tree = self.repo.tree('master')
-
-		assert_not_none(tree['README.txt'])
-		assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', tree['README.txt'].id)
-
-		assert_true(git.called)
-		assert_equal(git.call_args, (('ls_tree', 'master'), {}))
-
-	@patch_object(Git, '_call_process')
-	def test_dict_with_commits(self, git):
-		git.return_value = fixture('ls_tree_commit')
-
-		tree = self.repo.tree('master')
-
-		assert_none(tree.get('bar'))
-		assert_equal('2afb47bcedf21663580d5e6d2f406f08f3f65f19', tree['foo'].id)
-		assert_equal('f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', tree['baz'].id)
-
-		assert_true(git.called)
-		assert_equal(git.call_args, (('ls_tree', 'master'), {}))
-
-	@patch_object(Git, '_call_process')
-	@raises(KeyError)
-	def test_dict_with_non_existant_file(self, git):
-		git.return_value = fixture('ls_tree_commit')
-
-		tree = self.repo.tree('master')
-		tree['bar']
-
 	def test_repr(self):
 		tree = Tree(self.repo, id='abc')
 		assert_equal('<git.Tree "abc">', repr(tree))