Merge branch 'master' into pb/gitpm
This is to resolve the conflicts with Ryan's annotate updates early.
This commit is contained in:
Junio C Hamano
@@ -108,7 +108,7 @@ unless (defined $starting_rev) {
|
||||
my %ident;
|
||||
@ident{'author', 'author_email', 'author_date'} = $repo->ident('author');
|
||||
my $diff = $repo->command_output_pipe('diff', '-R', 'HEAD', '--', $filename);
|
||||
_git_diff_parse($diff, $head, "dirty", %ident);
|
||||
_git_diff_parse($diff, [$head], "dirty", %ident);
|
||||
$repo->command_close_pipe($diff);
|
||||
}
|
||||
handle_rev();
|
||||
@@ -146,21 +146,20 @@ sub init_claim {
|
||||
|
||||
|
||||
sub handle_rev {
|
||||
my $i = 0;
|
||||
my $revseen = 0;
|
||||
my %seen;
|
||||
while (my $rev = shift @revqueue) {
|
||||
next if $seen{$rev}++;
|
||||
|
||||
my %revinfo = git_commit_info($rev);
|
||||
|
||||
foreach my $p (@{$revs{$rev}{'parents'}}) {
|
||||
if (exists $revs{$rev}{parents} &&
|
||||
scalar @{$revs{$rev}{parents}} != 0) {
|
||||
|
||||
git_diff_parse($p, $rev, %revinfo);
|
||||
push @revqueue, $p;
|
||||
}
|
||||
git_diff_parse($revs{$rev}{'parents'}, $rev, %revinfo);
|
||||
push @revqueue, @{$revs{$rev}{'parents'}};
|
||||
|
||||
|
||||
if (scalar @{$revs{$rev}{parents}} == 0) {
|
||||
} else {
|
||||
# We must be at the initial rev here, so claim everything that is left.
|
||||
for (my $i = 0; $i < @{$revs{$rev}{lines}}; $i++) {
|
||||
if (ref ${$revs{$rev}{lines}}[$i] eq '' || ${$revs{$rev}{lines}}[$i][1] eq '') {
|
||||
@@ -240,93 +239,276 @@ sub git_find_parent {
|
||||
return $parent;
|
||||
}
|
||||
|
||||
sub git_find_all_parents {
|
||||
my ($rev) = @_;
|
||||
|
||||
my $parentline = $repo->command_oneline("rev-list","--remove-empty", "--parents","--max-count=1","$rev");
|
||||
my ($origrev, @parents) = split m/\s+/, $parentline;
|
||||
|
||||
return @parents;
|
||||
}
|
||||
|
||||
sub git_merge_base {
|
||||
my ($rev1, $rev2) = @_;
|
||||
|
||||
my $base = $repo->command_oneline("merge-base", $rev1, $rev2);
|
||||
return $base;
|
||||
}
|
||||
|
||||
# Construct a set of pseudo parents that are in the same order,
|
||||
# and the same quantity as the real parents,
|
||||
# but whose SHA1s are as similar to the logical parents
|
||||
# as possible.
|
||||
sub get_pseudo_parents {
|
||||
my ($all, $fake) = @_;
|
||||
|
||||
my @all = @$all;
|
||||
my @fake = @$fake;
|
||||
|
||||
my @pseudo;
|
||||
|
||||
my %fake = map {$_ => 1} @fake;
|
||||
my %seenfake;
|
||||
|
||||
my $fakeidx = 0;
|
||||
foreach my $p (@all) {
|
||||
if (exists $fake{$p}) {
|
||||
if ($fake[$fakeidx] ne $p) {
|
||||
die sprintf("parent mismatch: %s != %s\nall:%s\nfake:%s\n",
|
||||
$fake[$fakeidx], $p,
|
||||
join(", ", @all),
|
||||
join(", ", @fake),
|
||||
);
|
||||
}
|
||||
|
||||
push @pseudo, $p;
|
||||
$fakeidx++;
|
||||
$seenfake{$p}++;
|
||||
|
||||
} else {
|
||||
my $base = git_merge_base($fake[$fakeidx], $p);
|
||||
if ($base ne $fake[$fakeidx]) {
|
||||
die sprintf("Result of merge-base doesn't match fake: %s,%s != %s\n",
|
||||
$fake[$fakeidx], $p, $base);
|
||||
}
|
||||
|
||||
# The details of how we parse the diffs
|
||||
# mean that we cannot have a duplicate
|
||||
# revision in the list, so if we've already
|
||||
# seen the revision we would normally add, just use
|
||||
# the actual revision.
|
||||
if ($seenfake{$base}) {
|
||||
push @pseudo, $p;
|
||||
} else {
|
||||
push @pseudo, $base;
|
||||
$seenfake{$base}++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return @pseudo;
|
||||
}
|
||||
|
||||
|
||||
# Get a diff between the current revision and a parent.
|
||||
# Record the commit information that results.
|
||||
sub git_diff_parse {
|
||||
my ($parent, $rev, %revinfo) = @_;
|
||||
my ($parents, $rev, %revinfo) = @_;
|
||||
|
||||
my $diff = $repo->command_output_pipe('diff-tree', '-M', '-p',
|
||||
$rev, $parent, '--',
|
||||
$revs{$rev}{'filename'}, $revs{$parent}{'filename'});
|
||||
my @pseudo_parents;
|
||||
my @command = ("diff-tree");
|
||||
my $revision_spec;
|
||||
|
||||
_git_diff_parse($diff, $parent, $rev, %revinfo);
|
||||
if (scalar @$parents == 1) {
|
||||
|
||||
$revision_spec = join("..", $parents->[0], $rev);
|
||||
@pseudo_parents = @$parents;
|
||||
} else {
|
||||
my @all_parents = git_find_all_parents($rev);
|
||||
|
||||
if (@all_parents != @$parents) {
|
||||
@pseudo_parents = get_pseudo_parents(\@all_parents, $parents);
|
||||
} else {
|
||||
@pseudo_parents = @$parents;
|
||||
}
|
||||
|
||||
$revision_spec = $rev;
|
||||
push @command, "-c";
|
||||
}
|
||||
|
||||
my @filenames = ( $revs{$rev}{'filename'} );
|
||||
|
||||
foreach my $parent (@$parents) {
|
||||
push @filenames, $revs{$parent}{'filename'};
|
||||
}
|
||||
|
||||
push @command, "-p", "-M", $revision_spec, "--", @filenames;
|
||||
|
||||
|
||||
my $diff = $repo->command_output_pipe(@command);
|
||||
|
||||
_git_diff_parse($diff, \@pseudo_parents, $rev, %revinfo);
|
||||
|
||||
$repo->command_close_pipe($diff);
|
||||
}
|
||||
|
||||
sub _git_diff_parse {
|
||||
my ($diff, $parent, $rev, %revinfo) = @_;
|
||||
my ($diff, $parents, $rev, %revinfo) = @_;
|
||||
|
||||
my $ri = 0;
|
||||
|
||||
my ($ri, $pi) = (0,0);
|
||||
my $slines = $revs{$rev}{'lines'};
|
||||
my @plines;
|
||||
my (%plines, %pi);
|
||||
|
||||
my $gotheader = 0;
|
||||
my ($remstart);
|
||||
my ($hunk_start, $hunk_index);
|
||||
my $parent_count = @$parents;
|
||||
|
||||
my $diff_header_regexp = "^@";
|
||||
$diff_header_regexp .= "@" x @$parents;
|
||||
$diff_header_regexp .= ' -\d+,\d+' x @$parents;
|
||||
$diff_header_regexp .= ' \+(\d+),\d+';
|
||||
$diff_header_regexp .= " " . ("@" x @$parents);
|
||||
|
||||
my %claim_regexps;
|
||||
my $allparentplus = '^' . '\\+' x @$parents . '(.*)$';
|
||||
|
||||
{
|
||||
my $i = 0;
|
||||
foreach my $parent (@$parents) {
|
||||
|
||||
$pi{$parent} = 0;
|
||||
my $r = '^' . '.' x @$parents . '(.*)$';
|
||||
my $p = $r;
|
||||
substr($p,$i+1, 1) = '\\+';
|
||||
|
||||
my $m = $r;
|
||||
substr($m,$i+1, 1) = '-';
|
||||
|
||||
$claim_regexps{$parent}{plus} = $p;
|
||||
$claim_regexps{$parent}{minus} = $m;
|
||||
|
||||
$plines{$parent} = [];
|
||||
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
|
||||
DIFF:
|
||||
while(<$diff>) {
|
||||
chomp;
|
||||
if (m/^@@ -(\d+),(\d+) \+(\d+),(\d+)/) {
|
||||
$remstart = $1;
|
||||
# Adjust for 0-based arrays
|
||||
$remstart--;
|
||||
# Reinit hunk tracking.
|
||||
$hunk_start = $remstart;
|
||||
$hunk_index = 0;
|
||||
#printf("%d:%s:\n", $gotheader, $_);
|
||||
if (m/$diff_header_regexp/) {
|
||||
$remstart = $1 - 1;
|
||||
# (0-based arrays)
|
||||
|
||||
$gotheader = 1;
|
||||
|
||||
for (my $i = $ri; $i < $remstart; $i++) {
|
||||
$plines[$pi++] = $slines->[$i];
|
||||
$ri++;
|
||||
foreach my $parent (@$parents) {
|
||||
for (my $i = $ri; $i < $remstart; $i++) {
|
||||
$plines{$parent}[$pi{$parent}++] = $slines->[$i];
|
||||
}
|
||||
}
|
||||
next;
|
||||
$ri = $remstart;
|
||||
|
||||
next DIFF;
|
||||
|
||||
} elsif (!$gotheader) {
|
||||
next;
|
||||
# Skip over the leadin.
|
||||
next DIFF;
|
||||
}
|
||||
|
||||
if (m/^\+(.*)$/) {
|
||||
my $line = $1;
|
||||
$plines[$pi++] = [ $line, '', '', '', 0 ];
|
||||
next;
|
||||
|
||||
} elsif (m/^-(.*)$/) {
|
||||
my $line = $1;
|
||||
if (get_line($slines, $ri) eq $line) {
|
||||
# Found a match, claim
|
||||
claim_line($ri, $rev, $slines, %revinfo);
|
||||
} else {
|
||||
die sprintf("Sync error: %d/%d\n|%s\n|%s\n%s => %s\n",
|
||||
$ri, $hunk_start + $hunk_index,
|
||||
$line,
|
||||
get_line($slines, $ri),
|
||||
$rev, $parent);
|
||||
}
|
||||
$ri++;
|
||||
|
||||
} elsif (m/^\\/) {
|
||||
if (m/^\\/) {
|
||||
;
|
||||
# Skip \No newline at end of file.
|
||||
# But this can be internationalized, so only look
|
||||
# for an initial \
|
||||
|
||||
} else {
|
||||
if (substr($_,1) ne get_line($slines,$ri) ) {
|
||||
die sprintf("Line %d (%d) does not match:\n|%s\n|%s\n%s => %s\n",
|
||||
$hunk_start + $hunk_index, $ri,
|
||||
substr($_,1),
|
||||
get_line($slines,$ri),
|
||||
$rev, $parent);
|
||||
my %claims = ();
|
||||
my $negclaim = 0;
|
||||
my $allclaimed = 0;
|
||||
my $line;
|
||||
|
||||
if (m/$allparentplus/) {
|
||||
claim_line($ri, $rev, $slines, %revinfo);
|
||||
$allclaimed = 1;
|
||||
|
||||
}
|
||||
|
||||
PARENT:
|
||||
foreach my $parent (keys %claim_regexps) {
|
||||
my $m = $claim_regexps{$parent}{minus};
|
||||
my $p = $claim_regexps{$parent}{plus};
|
||||
|
||||
if (m/$m/) {
|
||||
$line = $1;
|
||||
$plines{$parent}[$pi{$parent}++] = [ $line, '', '', '', 0 ];
|
||||
$negclaim++;
|
||||
|
||||
} elsif (m/$p/) {
|
||||
$line = $1;
|
||||
if (get_line($slines, $ri) eq $line) {
|
||||
# Found a match, claim
|
||||
$claims{$parent}++;
|
||||
|
||||
} else {
|
||||
die sprintf("Sync error: %d\n|%s\n|%s\n%s => %s\n",
|
||||
$ri, $line,
|
||||
get_line($slines, $ri),
|
||||
$rev, $parent);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (%claims) {
|
||||
foreach my $parent (@$parents) {
|
||||
next if $claims{$parent} || $allclaimed;
|
||||
$plines{$parent}[$pi{$parent}++] = $slines->[$ri];
|
||||
#[ $line, '', '', '', 0 ];
|
||||
}
|
||||
$ri++;
|
||||
|
||||
} elsif ($negclaim) {
|
||||
next DIFF;
|
||||
|
||||
} else {
|
||||
if (substr($_,scalar @$parents) ne get_line($slines,$ri) ) {
|
||||
foreach my $parent (@$parents) {
|
||||
printf("parent %s is on line %d\n", $parent, $pi{$parent});
|
||||
}
|
||||
|
||||
my @context;
|
||||
for (my $i = -2; $i < 2; $i++) {
|
||||
push @context, get_line($slines, $ri + $i);
|
||||
}
|
||||
my $context = join("\n", @context);
|
||||
|
||||
my $justline = substr($_, scalar @$parents);
|
||||
die sprintf("Line %d, does not match:\n|%s|\n|%s|\n%s\n",
|
||||
$ri,
|
||||
$justline,
|
||||
$context);
|
||||
}
|
||||
foreach my $parent (@$parents) {
|
||||
$plines{$parent}[$pi{$parent}++] = $slines->[$ri];
|
||||
}
|
||||
$ri++;
|
||||
}
|
||||
$plines[$pi++] = $slines->[$ri++];
|
||||
}
|
||||
$hunk_index++;
|
||||
}
|
||||
for (my $i = $ri; $i < @{$slines} ; $i++) {
|
||||
push @plines, $slines->[$ri++];
|
||||
}
|
||||
|
||||
$revs{$parent}{lines} = \@plines;
|
||||
for (my $i = $ri; $i < @{$slines} ; $i++) {
|
||||
foreach my $parent (@$parents) {
|
||||
push @{$plines{$parent}}, $slines->[$ri];
|
||||
}
|
||||
$ri++;
|
||||
}
|
||||
|
||||
foreach my $parent (@$parents) {
|
||||
$revs{$parent}{lines} = $plines{$parent};
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user