@matheusbsbs / matheus-bagliano / commits / 3f492ba1fc
Fork 0

annotate: Correct most merge following to annotate correctly.

There is still a bug involving octopus merges, somewhere, but this gets normal merges correct, so it's still an improvement over the existing version. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Ryan Anderson committed Jul 3, 2006 at 21:30 UTC 3f492ba1fc4e63073378cc097154bed1ed2563c8
1 file changed +139 -58
git-annotate.perl
+139 -58
@@ -102,10 +102,10 @@ while (my $bound = pop @stack) {
102 push @revqueue, $head;
103 init_claim( defined $starting_rev ? $head : 'dirty');
104 unless (defined $starting_rev) {
105 - my $diff = open_pipe("git","diff","-R", "HEAD", "--",$filename)
105 + my $diff = open_pipe("git","diff","HEAD", "--",$filename)
106 or die "Failed to call git diff to check for dirty state: $!";
107
108 - _git_diff_parse($diff, $head, "dirty", (
108 + _git_diff_parse($diff, [$head], "dirty", (
109 'author' => gitvar_name("GIT_AUTHOR_IDENT"),
110 'author_date' => sprintf("%s +0000",time()),
111 )
@@ -154,14 +154,13 @@ sub handle_rev {
154
155 my %revinfo = git_commit_info($rev);
156
157 - foreach my $p (@{$revs{$rev}{'parents'}}) {
158 -
159 - git_diff_parse($p, $rev, %revinfo);
160 - push @revqueue, $p;
161 - }
157 + if (exists $revs{$rev}{parents} &&
158 + scalar @{$revs{$rev}{parents}} != 0) {
159
160 + git_diff_parse($revs{$rev}{'parents'}, $rev, %revinfo);
161 + push @revqueue, @{$revs{$rev}{'parents'}};
162
164 - if (scalar @{$revs{$rev}{parents}} == 0) {
163 + } else {
164 # We must be at the initial rev here, so claim everything that is left.
165 for (my $i = 0; $i < @{$revs{$rev}{lines}}; $i++) {
166 if (ref ${$revs{$rev}{lines}}[$i] eq '' || ${$revs{$rev}{lines}}[$i][1] eq '') {
@@ -252,89 +251,171 @@ sub git_find_parent {
251 # Get a diff between the current revision and a parent.
252 # Record the commit information that results.
253 sub git_diff_parse {
255 - my ($parent, $rev, %revinfo) = @_;
254 + my ($parents, $rev, %revinfo) = @_;
255
257 - my $diff = open_pipe("git-diff-tree","-M","-p",$rev,$parent,"--",
258 - $revs{$rev}{'filename'}, $revs{$parent}{'filename'})
256 + my @filenames = ( $revs{$rev}{'filename'} );
257 + foreach my $parent (@$parents) {
258 + push @filenames, $revs{$parent}{'filename'};
259 + }
260 +
261 + my $diff = open_pipe("git-diff-tree","-M","-p","-c",$rev,"--",
262 + @filenames )
263 or die "Failed to call git-diff for annotation: $!";
264
261 - _git_diff_parse($diff, $parent, $rev, %revinfo);
265 + _git_diff_parse($diff, $parents, $rev, %revinfo);
266
267 close($diff);
268 }
269
270 sub _git_diff_parse {
267 - my ($diff, $parent, $rev, %revinfo) = @_;
271 + my ($diff, $parents, $rev, %revinfo) = @_;
272 +
273 + my $ri = 0;
274
269 - my ($ri, $pi) = (0,0);
275 my $slines = $revs{$rev}{'lines'};
271 - my @plines;
276 + my (%plines, %pi);
277
278 my $gotheader = 0;
279 my ($remstart);
275 - my ($hunk_start, $hunk_index);
280 + my $parent_count = @$parents;
281 +
282 + my $diff_header_regexp = "^@";
283 + $diff_header_regexp .= "@" x @$parents;
284 + $diff_header_regexp .= ' -\d+,\d+' x @$parents;
285 + $diff_header_regexp .= ' \+(\d+),\d+';
286 +
287 + my %claim_regexps;
288 + my $allparentplus = '^' . '\\+' x @$parents . '(.*)$';
289 +
290 + {
291 + my $i = 0;
292 + foreach my $parent (@$parents) {
293 +
294 + $pi{$parent} = 0;
295 + my $r = '^' . '.' x @$parents . '(.*)$';
296 + my $p = $r;
297 + substr($p,$i+1, 1) = '\\+';
298 +
299 + my $m = $r;
300 + substr($m,$i+1, 1) = '-';
301 +
302 + $claim_regexps{$parent}{plus} = $p;
303 + $claim_regexps{$parent}{minus} = $m;
304 +
305 + $plines{$parent} = [];
306 +
307 + $i++;
308 + }
309 + }
310 +
311 + DIFF:
312 while(<$diff>) {
313 chomp;
278 - if (m/^@@ -(\d+),(\d+) \+(\d+),(\d+)/) {
279 - $remstart = $1;
280 - # Adjust for 0-based arrays
281 - $remstart--;
282 - # Reinit hunk tracking.
283 - $hunk_start = $remstart;
284 - $hunk_index = 0;
314 + if (m/$diff_header_regexp/) {
315 + $remstart = $1 - 1;
316 + # (0-based arrays)
317 +
318 $gotheader = 1;
319
287 - for (my $i = $ri; $i < $remstart; $i++) {
288 - $plines[$pi++] = $slines->[$i];
289 - $ri++;
320 + printf("Copying from %d to %d\n", $ri, $remstart);
321 + foreach my $parent (@$parents) {
322 + for (my $i = $ri; $i < $remstart; $i++) {
323 + $plines{$parent}[$pi{$parent}++] = $slines->[$i];
324 + }
325 }
291 - next;
292 - } elsif (!$gotheader) {
293 - next;
294 - }
326 + $ri = $remstart;
327
296 - if (m/^\+(.*)$/) {
297 - my $line = $1;
298 - $plines[$pi++] = [ $line, '', '', '', 0 ];
299 - next;
328 + next DIFF;
329
301 - } elsif (m/^-(.*)$/) {
302 - my $line = $1;
303 - if (get_line($slines, $ri) eq $line) {
304 - # Found a match, claim
305 - claim_line($ri, $rev, $slines, %revinfo);
306 - } else {
307 - die sprintf("Sync error: %d/%d\n|%s\n|%s\n%s => %s\n",
308 - $ri, $hunk_start + $hunk_index,
309 - $line,
310 - get_line($slines, $ri),
311 - $rev, $parent);
312 - }
313 - $ri++;
330 + } elsif (!$gotheader) {
331 + # Skip over the leadin.
332 + next DIFF;
333 + }
334
315 - } elsif (m/^\\/) {
335 + if (m/^\\/) {
336 ;
337 # Skip \No newline at end of file.
338 # But this can be internationalized, so only look
339 # for an initial \
340
341 } else {
322 - if (substr($_,1) ne get_line($slines,$ri) ) {
323 - die sprintf("Line %d (%d) does not match:\n|%s\n|%s\n%s => %s\n",
324 - $hunk_start + $hunk_index, $ri,
325 - substr($_,1),
326 - get_line($slines,$ri),
327 - $rev, $parent);
342 + my %claims = ();
343 + my $negclaim = 0;
344 + my $allclaimed = 0;
345 + my $line;
346 +
347 + if (m/$allparentplus/) {
348 + claim_line($ri, $rev, $slines, %revinfo);
349 + $allclaimed = 1;
350 +
351 + }
352 +
353 + PARENT:
354 + foreach my $parent (keys %claim_regexps) {
355 + my $m = $claim_regexps{$parent}{minus};
356 + my $p = $claim_regexps{$parent}{plus};
357 +
358 + if (m/$m/) {
359 + $line = $1;
360 + $plines{$parent}[$pi{$parent}++] = [ $line, '', '', '', 0 ];
361 + $negclaim++;
362 +
363 + } elsif (m/$p/) {
364 + $line = $1;
365 + if (get_line($slines, $ri) eq $line) {
366 + # Found a match, claim
367 + $claims{$parent}++;
368 +
369 + } else {
370 + die sprintf("Sync error: %d\n|%s\n|%s\n%s => %s\n",
371 + $ri, $line,
372 + get_line($slines, $ri),
373 + $rev, $parent);
374 + }
375 + }
376 + }
377 +
378 + if (%claims) {
379 + foreach my $parent (@$parents) {
380 + next if $claims{$parent} || $allclaimed;
381 + $plines{$parent}[$pi{$parent}++] = $slines->[$ri];
382 + #[ $line, '', '', '', 0 ];
383 + }
384 + $ri++;
385 +
386 + } elsif ($negclaim) {
387 + next DIFF;
388 +
389 + } else {
390 + if (substr($_,scalar @$parents) ne get_line($slines,$ri) ) {
391 + foreach my $parent (@$parents) {
392 + printf("parent %s is on line %d\n", $parent, $pi{$parent});
393 + }
394 +
395 + die sprintf("Line %d, does not match:\n|%s|\n|%s|\n%s\n",
396 + $ri,
397 + substr($_,scalar @$parents),
398 + get_line($slines,$ri), $rev);
399 + }
400 + foreach my $parent (@$parents) {
401 + $plines{$parent}[$pi{$parent}++] = $slines->[$ri];
402 + }
403 + $ri++;
404 }
329 - $plines[$pi++] = $slines->[$ri++];
405 }
331 - $hunk_index++;
406 }
407 +
408 for (my $i = $ri; $i < @{$slines} ; $i++) {
334 - push @plines, $slines->[$ri++];
409 + foreach my $parent (@$parents) {
410 + push @{$plines{$parent}}, $slines->[$ri];
411 + }
412 + $ri++;
413 + }
414 +
415 + foreach my $parent (@$parents) {
416 + $revs{$parent}{lines} = $plines{$parent};
417 }
418
337 - $revs{$parent}{lines} = \@plines;
419 return;
420 }
421