ItemTraversal: Predicate and prune functions now provide depth information, allowing the callee to know more about its environment

Byron · Byron · commit a1391bf06a83 · 2009-11-27T11:22:40.000+01:00
diff --git a/lib/git/objects/utils.py b/lib/git/objects/utils.py
@@ -90,18 +90,18 @@ def _get_intermediate_items(cls, item):
 		raise NotImplementedError("To be implemented in subclass")
 			
 	
-	def traverse( self, predicate = lambda i: True,
-						   prune = lambda i: False, depth = -1, branch_first=True,
+	def traverse( self, predicate = lambda i,d: True,
+						   prune = lambda i,d: False, depth = -1, branch_first=True,
 						   visit_once = True, ignore_self=1 ):
 		"""
 		``Returns``
 			iterator yieling of items found when traversing self
 			
 		``predicate``
-			f(i) returns False if item i should not be included in the result
+			f(i,d) returns False if item i at depth d should not be included in the result
 			
 		``prune``
-			f(i) return True if the search should stop at item i.
+			f(i,d) return True if the search should stop at item i at depth d.
 			Item i will not be returned.
 			
 		``depth``
@@ -132,11 +132,11 @@ def addToStack( stack, lst, branch_first, dpth ):
 		while stack:
 			d, item = stack.pop()			# depth of item, item
 			
-			if prune( item ):
+			if prune( item, d ):
 				continue
 	
 			skipStartItem = ignore_self and ( item == self )
-			if not skipStartItem and predicate( item ):
+			if not skipStartItem and predicate( item, d ):
 				yield item
 	
 			# only continue to next level if this is appropriate !
diff --git a/test/git/test_commit.py b/test/git/test_commit.py
@@ -69,10 +69,10 @@ def test_traversal(self):
 		assert len(list(start.traverse(ignore_self=False, depth=0))) == 1
 		
 		# prune
-		assert start.traverse(branch_first=1, prune=lambda i: i==p0).next() == p1
+		assert start.traverse(branch_first=1, prune=lambda i,d: i==p0).next() == p1
 		
 		# predicate
-		assert start.traverse(branch_first=1, predicate=lambda i: i==p1).next() == p1
+		assert start.traverse(branch_first=1, predicate=lambda i,d: i==p1).next() == p1
 		
 	@patch_object(Git, '_call_process')
 	def test_rev_list_bisect_all(self, git):
diff --git a/test/git/test_index.py b/test/git/test_index.py
@@ -84,7 +84,7 @@ def _cmp_tree_index(self, tree, index):
 		
 		num_blobs = 0
 		blist = list()
-		for blob in tree.traverse(predicate = lambda e: e.type == "blob", branch_first=False):
+		for blob in tree.traverse(predicate = lambda e,d: e.type == "blob", branch_first=False):
 			assert (blob.path,0) in index.entries
 			blist.append(blob)
 		# END for each blob in tree
@@ -134,7 +134,7 @@ def test_index_file_from_tree(self):
 		tree = three_way_index.write_tree()
 		assert isinstance(tree, Tree)
 		num_blobs = 0
-		for blob in tree.traverse(predicate=lambda item: item.type == "blob"):
+		for blob in tree.traverse(predicate=lambda item,d: item.type == "blob"):
 			assert (blob.path,0) in three_way_index.entries
 			num_blobs += 1
 		# END for each blob
diff --git a/test/git/test_tree.py b/test/git/test_tree.py
@@ -32,12 +32,12 @@ def test_traverse(self):
 		assert len(list(root)) == len(list(root.traverse(depth=1)))
 		
 		# only choose trees
-		trees_only = lambda i: i.type == "tree"
+		trees_only = lambda i,d: 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) ))
+		assert len(trees) == len(list( i for i in root.traverse() if trees_only(i,0) ))
 		
 		# test prune
-		lib_folder = lambda t: t.path == "lib"
+		lib_folder = lambda t,d: t.path == "lib"
 		pruned_trees = list(root.traverse(predicate = trees_only,prune = lib_folder))
 		assert len(pruned_trees) < len(trees)
 		
