annotate: Fix bug when parsing merges with differing real and logical parents.
Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Ryan Anderson committed
Aug 7, 2006 at 05:11 UTC
7c49cb288173ab5264b3b9e4257aeeb13388334c
1 file changed
+122
-6
git-annotate.perl
+122
-6
@@ -147,7 +147,7 @@ sub init_claim {
147
148
149
sub handle_rev {
150
- my $i = 0;
150
+ my $revseen = 0;
151
my %seen;
152
while (my $rev = shift @revqueue) {
153
next if $seen{$rev}++;
@@ -247,22 +247,129 @@ sub git_find_parent {
247
return $parent;
248
}
249
250
+sub git_find_all_parents {
251
+ my ($rev) = @_;
252
+
253
+ my $revparent = open_pipe("git-rev-list","--remove-empty", "--parents","--max-count=1","$rev")
254
+ or die "Failed to open git-rev-list to find a single parent: $!";
255
+
256
+ my $parentline = <$revparent>;
257
+ chomp $parentline;
258
+ my ($origrev, @parents) = split m/\s+/, $parentline;
259
+
260
+ close($revparent);
261
+
262
+ return @parents;
263
+}
264
+
265
+sub git_merge_base {
266
+ my ($rev1, $rev2) = @_;
267
+
268
+ my $mb = open_pipe("git-merge-base", $rev1, $rev2)
269
+ or die "Failed to open git-merge-base: $!";
270
+
271
+ my $base = <$mb>;
272
+ chomp $base;
273
+
274
+ close($mb);
275
+
276
+ return $base;
277
+}
278
+
279
+# Construct a set of pseudo parents that are in the same order,
280
+# and the same quantity as the real parents,
281
+# but whose SHA1s are as similar to the logical parents
282
+# as possible.
283
+sub get_pseudo_parents {
284
+ my ($all, $fake) = @_;
285
+
286
+ my @all = @$all;
287
+ my @fake = @$fake;
288
+
289
+ my @pseudo;
290
+
291
+ my %fake = map {$_ => 1} @fake;
292
+ my %seenfake;
293
+
294
+ my $fakeidx = 0;
295
+ foreach my $p (@all) {
296
+ if (exists $fake{$p}) {
297
+ if ($fake[$fakeidx] ne $p) {
298
+ die sprintf("parent mismatch: %s != %s\nall:%s\nfake:%s\n",
299
+ $fake[$fakeidx], $p,
300
+ join(", ", @all),
301
+ join(", ", @fake),
302
+ );
303
+ }
304
+
305
+ push @pseudo, $p;
306
+ $fakeidx++;
307
+ $seenfake{$p}++;
308
+
309
+ } else {
310
+ my $base = git_merge_base($fake[$fakeidx], $p);
311
+ if ($base ne $fake[$fakeidx]) {
312
+ die sprintf("Result of merge-base doesn't match fake: %s,%s != %s\n",
313
+ $fake[$fakeidx], $p, $base);
314
+ }
315
+
316
+ # The details of how we parse the diffs
317
+ # mean that we cannot have a duplicate
318
+ # revision in the list, so if we've already
319
+ # seen the revision we would normally add, just use
320
+ # the actual revision.
321
+ if ($seenfake{$base}) {
322
+ push @pseudo, $p;
323
+ } else {
324
+ push @pseudo, $base;
325
+ $seenfake{$base}++;
326
+ }
327
+ }
328
+ }
329
+
330
+ return @pseudo;
331
+}
332
+
333
334
# Get a diff between the current revision and a parent.
335
# Record the commit information that results.
336
sub git_diff_parse {
337
my ($parents, $rev, %revinfo) = @_;
338
339
+ my @pseudo_parents;
340
+ my @command = ("git-diff-tree");
341
+ my $revision_spec;
342
+
343
+ if (scalar @$parents == 1) {
344
+
345
+ $revision_spec = join("..", $parents->[0], $rev);
346
+ @pseudo_parents = @$parents;
347
+ } else {
348
+ my @all_parents = git_find_all_parents($rev);
349
+
350
+ if (@all_parents != @$parents) {
351
+ @pseudo_parents = get_pseudo_parents(\@all_parents, $parents);
352
+ } else {
353
+ @pseudo_parents = @$parents;
354
+ }
355
+
356
+ $revision_spec = $rev;
357
+ push @command, "-c";
358
+ }
359
+
360
my @filenames = ( $revs{$rev}{'filename'} );
361
+
362
foreach my $parent (@$parents) {
363
push @filenames, $revs{$parent}{'filename'};
364
}
365
261
- my $diff = open_pipe("git-diff-tree","-M","-p","-c",$rev,"--",
262
- @filenames )
366
+ push @command, "-p", "-M", $revision_spec, "--", @filenames;
367
+
368
+
369
+ my $diff = open_pipe( @command )
370
or die "Failed to call git-diff for annotation: $!";
371
265
- _git_diff_parse($diff, $parents, $rev, %revinfo);
372
+ _git_diff_parse($diff, \@pseudo_parents, $rev, %revinfo);
373
374
close($diff);
375
}
@@ -283,6 +390,7 @@ sub _git_diff_parse {
390
$diff_header_regexp .= "@" x @$parents;
391
$diff_header_regexp .= ' -\d+,\d+' x @$parents;
392
$diff_header_regexp .= ' \+(\d+),\d+';
393
+ $diff_header_regexp .= " " . ("@" x @$parents);
394
395
my %claim_regexps;
396
my $allparentplus = '^' . '\\+' x @$parents . '(.*)$';
@@ -311,6 +419,7 @@ sub _git_diff_parse {
419
DIFF:
420
while(<$diff>) {
421
chomp;
422
+ #printf("%d:%s:\n", $gotheader, $_);
423
if (m/$diff_header_regexp/) {
424
$remstart = $1 - 1;
425
# (0-based arrays)
@@ -391,10 +500,17 @@ sub _git_diff_parse {
500
printf("parent %s is on line %d\n", $parent, $pi{$parent});
501
}
502
503
+ my @context;
504
+ for (my $i = -2; $i < 2; $i++) {
505
+ push @context, get_line($slines, $ri + $i);
506
+ }
507
+ my $context = join("\n", @context);
508
+
509
+ my $justline = substr($_, scalar @$parents);
510
die sprintf("Line %d, does not match:\n|%s|\n|%s|\n%s\n",
511
$ri,
396
- substr($_,scalar @$parents),
397
- get_line($slines,$ri), $rev);
512
+ $justline,
513
+ $context);
514
}
515
foreach my $parent (@$parents) {
516
$plines{$parent}[$pi{$parent}++] = $slines->[$ri];