Merge branch 'blamefix' into 0.3

Author: Byron

git/repo/base.py

@@ -570,11 +570,14 @@ def blame(self, rev, file):
 			if self.re_hexsha_only.search(firstpart):
 				# handles 
 				# 634396b2f541a9f2d58b00be1a07f0c358b999b3 1 1 7		- indicates blame-data start
-				# 634396b2f541a9f2d58b00be1a07f0c358b999b3 2 2
+				# 634396b2f541a9f2d58b00be1a07f0c358b999b3 2 2			- indicates another line of blame with the same data
 				digits = parts[-1].split(" ")
 				if len(digits) == 3:
 					info = {'id': firstpart}
 					blames.append([None, []])
+				elif info['id'] != firstpart:
+					info = {'id': firstpart}
+					blames.append([commits.get(firstpart), []])
 				# END blame data initialization
 			else:
 				m = self.re_author_committer_start.search(firstpart)
@@ -622,7 +625,7 @@ def blame(self, rev, file):
 							text,  = m.groups()
 							blames[-1][0] = c
 							blames[-1][1].append( text )
-							info = None
+							info = {'id': sha}
 						# END if we collected commit info
 					# END distinguish filename,summary,rest
 				# END distinguish author|committer vs filename,summary,rest

git/test/test_repo.py

@@ -269,6 +269,15 @@ def test_should_display_blame_information(self, git):
 		assert_true( isinstance( tlist[0], basestring ) )
 		assert_true( len( tlist ) < sum( len(t) for t in tlist ) )				 # test for single-char bug
 
+	def test_blame_real(self):
+		c = 0
+		for item in self.rorepo.head.commit.tree.traverse(
+					predicate=lambda i, d: i.type == 'blob' and i.path.endswith('.py')):
+			c += 1
+			b = self.rorepo.blame(self.rorepo.head, item.path)
+		#END for each item to traverse
+		assert b
+		
 	def test_untracked_files(self):
 		base = self.rorepo.working_tree_dir
 		files = (	join_path_native(base, "__test_myfile"),