Fixed consecutive lines with same blame info not appearing in blame.

devnev · Byron · commit 1f6b8bf02086 · 2011-07-18T17:09:00.000+02:00
This fixes a bug when parsing blame -p output: Full commit info headers
only appear for the first line from a particular commit, but other lines
were ignored as the blame info dict was reset after each line.

This patch handles both multiple consecutive lines from a commit and
interleaved lines from multiple commits.
diff --git a/git/repo/base.py b/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
