Fixed issue with commit traversal due to missing visit_once in the traversal method, improved code performance by disabling the visit-once flag by default for trees, which by nature are not recursive

2 files changed, 19 insertions, 0 deletions

diff --git a/lib/git/objects/tree.py b/lib/git/objects/tree.py
index e6fa3f18..c80450fc 100644
--- a/lib/git/objects/tree.py
+++ b/lib/git/objects/tree.py
@@ -181,6 +181,14 @@ class Tree(base.IndexObject, diff.Diffable, utils.Traversable):
 		return [ i for i in self if i.type == "blob" ]
 
 
+	def traverse( self, predicate = lambda i,d: True,
+						   prune = lambda i,d: False, depth = -1, branch_first=True,
+						   visit_once = False, ignore_self=1 ):
+		"""For documentation, see utils.Traversable.traverse
+		
+		Trees are set to visist_once = False to gain more performance in the traversal"""
+		return super(Tree, self).traverse(predicate, prune, depth, branch_first, visit_once, ignore_self)
+
 	# List protocol
 	def __getslice__(self,i,j):
 		return self._cache[i:j]
diff --git a/lib/git/objects/utils.py b/lib/git/objects/utils.py
index a3c6edc7..a9c25da2 100644
--- a/lib/git/objects/utils.py
+++ b/lib/git/objects/utils.py
@@ -113,9 +113,14 @@ class Traversable(object):
 		``branch_first``
 			if True, items will be returned branch first, otherwise depth first
 			
+		``visit_once``
+			if True, items will only be returned once, although they might be encountered
+			several times. Loops are prevented that way.
+		
 		``ignore_self``
 			if True, self will be ignored and automatically pruned from
 			the result. Otherwise it will be the first item to be returned"""
+		visited = set()
 		stack = Deque()
 		stack.append( ( 0 ,self ) )		# self is always depth level 0
 	
@@ -132,6 +137,12 @@ class Traversable(object):
 		while stack:
 			d, item = stack.pop()			# depth of item, item
 			
+			if visit_once and item in visited:
+				continue
+				
+			if visit_once:
+				visited.add(item)
+			
 			if prune( item, d ):
 				continue