Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 1 | #!/usr/bin/perl |
| 2 | # Copyright 2006, Ryan Anderson <ryan@michonline.com> |
| 3 | # |
| 4 | # GPL v2 (See COPYING) |
| 5 | # |
| 6 | # This file is licensed under the GPL v2, or a later version |
| 7 | # at the discretion of Linus Torvalds. |
| 8 | |
| 9 | use warnings; |
| 10 | use strict; |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 11 | use Getopt::Long; |
Johannes Schindelin | 4788d11 | 2006-02-20 16:20:10 +0100 | [diff] [blame] | 12 | use POSIX qw(strftime gmtime); |
Matthias Kestenholz | fe77bb1 | 2006-04-28 10:41:19 +0200 | [diff] [blame] | 13 | use File::Basename qw(basename dirname); |
Johannes Schindelin | 4788d11 | 2006-02-20 16:20:10 +0100 | [diff] [blame] | 14 | |
| 15 | sub usage() { |
Matthias Kestenholz | fe77bb1 | 2006-04-28 10:41:19 +0200 | [diff] [blame] | 16 | print STDERR "Usage: ${\basename $0} [-s] [-S revs-file] file [ revision ] |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 17 | -l, --long |
| 18 | Show long rev (Defaults off) |
Junio C Hamano | d920e18 | 2006-03-02 01:50:09 -0800 | [diff] [blame] | 19 | -t, --time |
| 20 | Show raw timestamp (Defaults off) |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 21 | -r, --rename |
| 22 | Follow renames (Defaults on). |
| 23 | -S, --rev-file revs-file |
sean | be767c9 | 2006-03-11 02:39:28 -0500 | [diff] [blame] | 24 | Use revs from revs-file instead of calling git-rev-list |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 25 | -h, --help |
| 26 | This message. |
Matthias Kestenholz | fe77bb1 | 2006-04-28 10:41:19 +0200 | [diff] [blame] | 27 | "; |
Johannes Schindelin | 4788d11 | 2006-02-20 16:20:10 +0100 | [diff] [blame] | 28 | |
| 29 | exit(1); |
| 30 | } |
| 31 | |
Junio C Hamano | d920e18 | 2006-03-02 01:50:09 -0800 | [diff] [blame] | 32 | our ($help, $longrev, $rename, $rawtime, $starting_rev, $rev_file) = (0, 0, 1); |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 33 | |
| 34 | my $rc = GetOptions( "long|l" => \$longrev, |
Junio C Hamano | d920e18 | 2006-03-02 01:50:09 -0800 | [diff] [blame] | 35 | "time|t" => \$rawtime, |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 36 | "help|h" => \$help, |
| 37 | "rename|r" => \$rename, |
Martin Langhoff | 0093154 | 2006-03-02 17:24:30 +1300 | [diff] [blame] | 38 | "rev-file|S=s" => \$rev_file); |
Matthias Kestenholz | fe77bb1 | 2006-04-28 10:41:19 +0200 | [diff] [blame] | 39 | if (!$rc or $help or !@ARGV) { |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 40 | usage(); |
| 41 | } |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 42 | |
| 43 | my $filename = shift @ARGV; |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 44 | if (@ARGV) { |
| 45 | $starting_rev = shift @ARGV; |
| 46 | } |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 47 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 48 | my @stack = ( |
| 49 | { |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 50 | 'rev' => defined $starting_rev ? $starting_rev : "HEAD", |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 51 | 'filename' => $filename, |
| 52 | }, |
| 53 | ); |
| 54 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 55 | our @filelines = (); |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 56 | |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 57 | if (defined $starting_rev) { |
| 58 | @filelines = git_cat_file($starting_rev, $filename); |
| 59 | } else { |
| 60 | open(F,"<",$filename) |
| 61 | or die "Failed to open filename: $!"; |
| 62 | |
| 63 | while(<F>) { |
| 64 | chomp; |
| 65 | push @filelines, $_; |
| 66 | } |
| 67 | close(F); |
| 68 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 69 | } |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 70 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 71 | our %revs; |
| 72 | our @revqueue; |
| 73 | our $head; |
| 74 | |
| 75 | my $revsprocessed = 0; |
| 76 | while (my $bound = pop @stack) { |
| 77 | my @revisions = git_rev_list($bound->{'rev'}, $bound->{'filename'}); |
| 78 | foreach my $revinst (@revisions) { |
| 79 | my ($rev, @parents) = @$revinst; |
| 80 | $head ||= $rev; |
| 81 | |
Johannes Schindelin | 4788d11 | 2006-02-20 16:20:10 +0100 | [diff] [blame] | 82 | if (!defined($rev)) { |
| 83 | $rev = ""; |
| 84 | } |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 85 | $revs{$rev}{'filename'} = $bound->{'filename'}; |
| 86 | if (scalar @parents > 0) { |
| 87 | $revs{$rev}{'parents'} = \@parents; |
| 88 | next; |
| 89 | } |
| 90 | |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 91 | if (!$rename) { |
Johannes Schindelin | 4788d11 | 2006-02-20 16:20:10 +0100 | [diff] [blame] | 92 | next; |
| 93 | } |
| 94 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 95 | my $newbound = find_parent_renames($rev, $bound->{'filename'}); |
| 96 | if ( exists $newbound->{'filename'} && $newbound->{'filename'} ne $bound->{'filename'}) { |
| 97 | push @stack, $newbound; |
| 98 | $revs{$rev}{'parents'} = [$newbound->{'rev'}]; |
| 99 | } |
| 100 | } |
| 101 | } |
| 102 | push @revqueue, $head; |
Ryan Anderson | 5fcab3d | 2006-03-05 21:43:53 -0500 | [diff] [blame] | 103 | init_claim( defined $starting_rev ? $head : 'dirty'); |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 104 | unless (defined $starting_rev) { |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 105 | my $diff = open_pipe("git","diff","HEAD", "--",$filename) |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 106 | or die "Failed to call git diff to check for dirty state: $!"; |
| 107 | |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 108 | _git_diff_parse($diff, [$head], "dirty", ( |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 109 | 'author' => gitvar_name("GIT_AUTHOR_IDENT"), |
| 110 | 'author_date' => sprintf("%s +0000",time()), |
| 111 | ) |
| 112 | ); |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 113 | close($diff); |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 114 | } |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 115 | handle_rev(); |
| 116 | |
| 117 | |
| 118 | my $i = 0; |
| 119 | foreach my $l (@filelines) { |
| 120 | my ($output, $rev, $committer, $date); |
| 121 | if (ref $l eq 'ARRAY') { |
| 122 | ($output, $rev, $committer, $date) = @$l; |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 123 | if (!$longrev && length($rev) > 8) { |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 124 | $rev = substr($rev,0,8); |
| 125 | } |
| 126 | } else { |
| 127 | $output = $l; |
| 128 | ($rev, $committer, $date) = ('unknown', 'unknown', 'unknown'); |
| 129 | } |
| 130 | |
Johannes Schindelin | 4788d11 | 2006-02-20 16:20:10 +0100 | [diff] [blame] | 131 | printf("%s\t(%10s\t%10s\t%d)%s\n", $rev, $committer, |
Luck, Tony | c6d4217 | 2006-03-02 15:27:31 -0800 | [diff] [blame] | 132 | format_date($date), ++$i, $output); |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 133 | } |
| 134 | |
| 135 | sub init_claim { |
| 136 | my ($rev) = @_; |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 137 | for (my $i = 0; $i < @filelines; $i++) { |
| 138 | $filelines[$i] = [ $filelines[$i], '', '', '', 1]; |
| 139 | # line, |
| 140 | # rev, |
| 141 | # author, |
| 142 | # date, |
| 143 | # 1 <-- belongs to the original file. |
| 144 | } |
| 145 | $revs{$rev}{'lines'} = \@filelines; |
| 146 | } |
| 147 | |
| 148 | |
| 149 | sub handle_rev { |
Ryan Anderson | 7c49cb2 | 2006-08-07 05:11:24 -0700 | [diff] [blame] | 150 | my $revseen = 0; |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 151 | my %seen; |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 152 | while (my $rev = shift @revqueue) { |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 153 | next if $seen{$rev}++; |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 154 | |
| 155 | my %revinfo = git_commit_info($rev); |
| 156 | |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 157 | if (exists $revs{$rev}{parents} && |
| 158 | scalar @{$revs{$rev}{parents}} != 0) { |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 159 | |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 160 | git_diff_parse($revs{$rev}{'parents'}, $rev, %revinfo); |
| 161 | push @revqueue, @{$revs{$rev}{'parents'}}; |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 162 | |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 163 | } else { |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 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 '') { |
| 167 | claim_line($i, $rev, $revs{$rev}{lines}, %revinfo); |
| 168 | } |
| 169 | } |
| 170 | } |
| 171 | } |
| 172 | } |
| 173 | |
| 174 | |
| 175 | sub git_rev_list { |
| 176 | my ($rev, $file) = @_; |
| 177 | |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 178 | my $revlist; |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 179 | if ($rev_file) { |
Martin Langhoff | 0093154 | 2006-03-02 17:24:30 +1300 | [diff] [blame] | 180 | open($revlist, '<' . $rev_file) |
| 181 | or die "Failed to open $rev_file : $!"; |
Johannes Schindelin | 4788d11 | 2006-02-20 16:20:10 +0100 | [diff] [blame] | 182 | } else { |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 183 | $revlist = open_pipe("git-rev-list","--parents","--remove-empty",$rev,"--",$file) |
Johannes Schindelin | 4788d11 | 2006-02-20 16:20:10 +0100 | [diff] [blame] | 184 | or die "Failed to exec git-rev-list: $!"; |
| 185 | } |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 186 | |
| 187 | my @revs; |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 188 | while(my $line = <$revlist>) { |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 189 | chomp $line; |
| 190 | my ($rev, @parents) = split /\s+/, $line; |
| 191 | push @revs, [ $rev, @parents ]; |
| 192 | } |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 193 | close($revlist); |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 194 | |
| 195 | printf("0 revs found for rev %s (%s)\n", $rev, $file) if (@revs == 0); |
| 196 | return @revs; |
| 197 | } |
| 198 | |
| 199 | sub find_parent_renames { |
| 200 | my ($rev, $file) = @_; |
| 201 | |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 202 | my $patch = open_pipe("git-diff-tree", "-M50", "-r","--name-status", "-z","$rev") |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 203 | or die "Failed to exec git-diff: $!"; |
| 204 | |
| 205 | local $/ = "\0"; |
| 206 | my %bound; |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 207 | my $junk = <$patch>; |
| 208 | while (my $change = <$patch>) { |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 209 | chomp $change; |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 210 | my $filename = <$patch>; |
Matthias Kestenholz | d0ad165 | 2006-04-28 10:42:28 +0200 | [diff] [blame] | 211 | if (!defined $filename) { |
| 212 | next; |
| 213 | } |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 214 | chomp $filename; |
| 215 | |
| 216 | if ($change =~ m/^[AMD]$/ ) { |
| 217 | next; |
| 218 | } elsif ($change =~ m/^R/ ) { |
| 219 | my $oldfilename = $filename; |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 220 | $filename = <$patch>; |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 221 | chomp $filename; |
| 222 | if ( $file eq $filename ) { |
| 223 | my $parent = git_find_parent($rev, $oldfilename); |
| 224 | @bound{'rev','filename'} = ($parent, $oldfilename); |
| 225 | last; |
| 226 | } |
| 227 | } |
| 228 | } |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 229 | close($patch); |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 230 | |
| 231 | return \%bound; |
| 232 | } |
| 233 | |
| 234 | |
| 235 | sub git_find_parent { |
| 236 | my ($rev, $filename) = @_; |
| 237 | |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 238 | my $revparent = open_pipe("git-rev-list","--remove-empty", "--parents","--max-count=1","$rev","--",$filename) |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 239 | or die "Failed to open git-rev-list to find a single parent: $!"; |
| 240 | |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 241 | my $parentline = <$revparent>; |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 242 | chomp $parentline; |
| 243 | my ($revfound,$parent) = split m/\s+/, $parentline; |
| 244 | |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 245 | close($revparent); |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 246 | |
| 247 | return $parent; |
| 248 | } |
| 249 | |
Ryan Anderson | 7c49cb2 | 2006-08-07 05:11:24 -0700 | [diff] [blame] | 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 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 333 | |
| 334 | # Get a diff between the current revision and a parent. |
| 335 | # Record the commit information that results. |
| 336 | sub git_diff_parse { |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 337 | my ($parents, $rev, %revinfo) = @_; |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 338 | |
Ryan Anderson | 7c49cb2 | 2006-08-07 05:11:24 -0700 | [diff] [blame] | 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 | |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 360 | my @filenames = ( $revs{$rev}{'filename'} ); |
Ryan Anderson | 7c49cb2 | 2006-08-07 05:11:24 -0700 | [diff] [blame] | 361 | |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 362 | foreach my $parent (@$parents) { |
| 363 | push @filenames, $revs{$parent}{'filename'}; |
| 364 | } |
| 365 | |
Ryan Anderson | 7c49cb2 | 2006-08-07 05:11:24 -0700 | [diff] [blame] | 366 | push @command, "-p", "-M", $revision_spec, "--", @filenames; |
| 367 | |
| 368 | |
| 369 | my $diff = open_pipe( @command ) |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 370 | or die "Failed to call git-diff for annotation: $!"; |
| 371 | |
Ryan Anderson | 7c49cb2 | 2006-08-07 05:11:24 -0700 | [diff] [blame] | 372 | _git_diff_parse($diff, \@pseudo_parents, $rev, %revinfo); |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 373 | |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 374 | close($diff); |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 375 | } |
| 376 | |
| 377 | sub _git_diff_parse { |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 378 | my ($diff, $parents, $rev, %revinfo) = @_; |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 379 | |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 380 | my $ri = 0; |
| 381 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 382 | my $slines = $revs{$rev}{'lines'}; |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 383 | my (%plines, %pi); |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 384 | |
| 385 | my $gotheader = 0; |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 386 | my ($remstart); |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 387 | my $parent_count = @$parents; |
| 388 | |
| 389 | my $diff_header_regexp = "^@"; |
| 390 | $diff_header_regexp .= "@" x @$parents; |
| 391 | $diff_header_regexp .= ' -\d+,\d+' x @$parents; |
| 392 | $diff_header_regexp .= ' \+(\d+),\d+'; |
Ryan Anderson | 7c49cb2 | 2006-08-07 05:11:24 -0700 | [diff] [blame] | 393 | $diff_header_regexp .= " " . ("@" x @$parents); |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 394 | |
| 395 | my %claim_regexps; |
| 396 | my $allparentplus = '^' . '\\+' x @$parents . '(.*)$'; |
| 397 | |
| 398 | { |
| 399 | my $i = 0; |
| 400 | foreach my $parent (@$parents) { |
| 401 | |
| 402 | $pi{$parent} = 0; |
| 403 | my $r = '^' . '.' x @$parents . '(.*)$'; |
| 404 | my $p = $r; |
| 405 | substr($p,$i+1, 1) = '\\+'; |
| 406 | |
| 407 | my $m = $r; |
| 408 | substr($m,$i+1, 1) = '-'; |
| 409 | |
| 410 | $claim_regexps{$parent}{plus} = $p; |
| 411 | $claim_regexps{$parent}{minus} = $m; |
| 412 | |
| 413 | $plines{$parent} = []; |
| 414 | |
| 415 | $i++; |
| 416 | } |
| 417 | } |
| 418 | |
| 419 | DIFF: |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 420 | while(<$diff>) { |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 421 | chomp; |
Ryan Anderson | 7c49cb2 | 2006-08-07 05:11:24 -0700 | [diff] [blame] | 422 | #printf("%d:%s:\n", $gotheader, $_); |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 423 | if (m/$diff_header_regexp/) { |
| 424 | $remstart = $1 - 1; |
| 425 | # (0-based arrays) |
| 426 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 427 | $gotheader = 1; |
| 428 | |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 429 | foreach my $parent (@$parents) { |
| 430 | for (my $i = $ri; $i < $remstart; $i++) { |
| 431 | $plines{$parent}[$pi{$parent}++] = $slines->[$i]; |
| 432 | } |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 433 | } |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 434 | $ri = $remstart; |
| 435 | |
| 436 | next DIFF; |
| 437 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 438 | } elsif (!$gotheader) { |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 439 | # Skip over the leadin. |
| 440 | next DIFF; |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 441 | } |
| 442 | |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 443 | if (m/^\\/) { |
Ryan Anderson | e5971d7 | 2006-03-02 00:23:37 -0500 | [diff] [blame] | 444 | ; |
| 445 | # Skip \No newline at end of file. |
| 446 | # But this can be internationalized, so only look |
| 447 | # for an initial \ |
| 448 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 449 | } else { |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 450 | my %claims = (); |
| 451 | my $negclaim = 0; |
| 452 | my $allclaimed = 0; |
| 453 | my $line; |
| 454 | |
| 455 | if (m/$allparentplus/) { |
| 456 | claim_line($ri, $rev, $slines, %revinfo); |
| 457 | $allclaimed = 1; |
| 458 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 459 | } |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 460 | |
| 461 | PARENT: |
| 462 | foreach my $parent (keys %claim_regexps) { |
| 463 | my $m = $claim_regexps{$parent}{minus}; |
| 464 | my $p = $claim_regexps{$parent}{plus}; |
| 465 | |
| 466 | if (m/$m/) { |
| 467 | $line = $1; |
| 468 | $plines{$parent}[$pi{$parent}++] = [ $line, '', '', '', 0 ]; |
| 469 | $negclaim++; |
| 470 | |
| 471 | } elsif (m/$p/) { |
| 472 | $line = $1; |
| 473 | if (get_line($slines, $ri) eq $line) { |
| 474 | # Found a match, claim |
| 475 | $claims{$parent}++; |
| 476 | |
| 477 | } else { |
| 478 | die sprintf("Sync error: %d\n|%s\n|%s\n%s => %s\n", |
| 479 | $ri, $line, |
| 480 | get_line($slines, $ri), |
| 481 | $rev, $parent); |
| 482 | } |
| 483 | } |
| 484 | } |
| 485 | |
| 486 | if (%claims) { |
| 487 | foreach my $parent (@$parents) { |
| 488 | next if $claims{$parent} || $allclaimed; |
| 489 | $plines{$parent}[$pi{$parent}++] = $slines->[$ri]; |
| 490 | #[ $line, '', '', '', 0 ]; |
| 491 | } |
| 492 | $ri++; |
| 493 | |
| 494 | } elsif ($negclaim) { |
| 495 | next DIFF; |
| 496 | |
| 497 | } else { |
| 498 | if (substr($_,scalar @$parents) ne get_line($slines,$ri) ) { |
| 499 | foreach my $parent (@$parents) { |
| 500 | printf("parent %s is on line %d\n", $parent, $pi{$parent}); |
| 501 | } |
| 502 | |
Ryan Anderson | 7c49cb2 | 2006-08-07 05:11:24 -0700 | [diff] [blame] | 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); |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 510 | die sprintf("Line %d, does not match:\n|%s|\n|%s|\n%s\n", |
| 511 | $ri, |
Ryan Anderson | 7c49cb2 | 2006-08-07 05:11:24 -0700 | [diff] [blame] | 512 | $justline, |
| 513 | $context); |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 514 | } |
| 515 | foreach my $parent (@$parents) { |
| 516 | $plines{$parent}[$pi{$parent}++] = $slines->[$ri]; |
| 517 | } |
| 518 | $ri++; |
| 519 | } |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 520 | } |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 521 | } |
| 522 | |
Ryan Anderson | 3f492ba | 2006-07-03 21:30:02 -0400 | [diff] [blame] | 523 | for (my $i = $ri; $i < @{$slines} ; $i++) { |
| 524 | foreach my $parent (@$parents) { |
| 525 | push @{$plines{$parent}}, $slines->[$ri]; |
| 526 | } |
| 527 | $ri++; |
| 528 | } |
| 529 | |
| 530 | foreach my $parent (@$parents) { |
| 531 | $revs{$parent}{lines} = $plines{$parent}; |
| 532 | } |
| 533 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 534 | return; |
| 535 | } |
| 536 | |
| 537 | sub get_line { |
| 538 | my ($lines, $index) = @_; |
| 539 | |
| 540 | return ref $lines->[$index] ne '' ? $lines->[$index][0] : $lines->[$index]; |
| 541 | } |
| 542 | |
| 543 | sub git_cat_file { |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 544 | my ($rev, $filename) = @_; |
| 545 | return () unless defined $rev && defined $filename; |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 546 | |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 547 | my $blob = git_ls_tree($rev, $filename); |
Ryan Anderson | 5fcab3d | 2006-03-05 21:43:53 -0500 | [diff] [blame] | 548 | die "Failed to find a blob for $filename in rev $rev\n" if !defined $blob; |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 549 | |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 550 | my $catfile = open_pipe("git","cat-file", "blob", $blob) |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 551 | or die "Failed to git-cat-file blob $blob (rev $rev, file $filename): " . $!; |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 552 | |
| 553 | my @lines; |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 554 | while(<$catfile>) { |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 555 | chomp; |
| 556 | push @lines, $_; |
| 557 | } |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 558 | close($catfile); |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 559 | |
| 560 | return @lines; |
| 561 | } |
| 562 | |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 563 | sub git_ls_tree { |
| 564 | my ($rev, $filename) = @_; |
| 565 | |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 566 | my $lstree = open_pipe("git","ls-tree",$rev,$filename) |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 567 | or die "Failed to call git ls-tree: $!"; |
| 568 | |
| 569 | my ($mode, $type, $blob, $tfilename); |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 570 | while(<$lstree>) { |
Ryan Anderson | 5fcab3d | 2006-03-05 21:43:53 -0500 | [diff] [blame] | 571 | chomp; |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 572 | ($mode, $type, $blob, $tfilename) = split(/\s+/, $_, 4); |
| 573 | last if ($tfilename eq $filename); |
| 574 | } |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 575 | close($lstree); |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 576 | |
Ryan Anderson | 5fcab3d | 2006-03-05 21:43:53 -0500 | [diff] [blame] | 577 | return $blob if ($tfilename eq $filename); |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 578 | die "git-ls-tree failed to find blob for $filename"; |
| 579 | |
| 580 | } |
| 581 | |
| 582 | |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 583 | |
| 584 | sub claim_line { |
| 585 | my ($floffset, $rev, $lines, %revinfo) = @_; |
| 586 | my $oline = get_line($lines, $floffset); |
| 587 | @{$lines->[$floffset]} = ( $oline, $rev, |
| 588 | $revinfo{'author'}, $revinfo{'author_date'} ); |
| 589 | #printf("Claiming line %d with rev %s: '%s'\n", |
| 590 | # $floffset, $rev, $oline) if 1; |
| 591 | } |
| 592 | |
| 593 | sub git_commit_info { |
| 594 | my ($rev) = @_; |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 595 | my $commit = open_pipe("git-cat-file", "commit", $rev) |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 596 | or die "Failed to call git-cat-file: $!"; |
| 597 | |
| 598 | my %info; |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 599 | while(<$commit>) { |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 600 | chomp; |
| 601 | last if (length $_ == 0); |
| 602 | |
| 603 | if (m/^author (.*) <(.*)> (.*)$/) { |
| 604 | $info{'author'} = $1; |
| 605 | $info{'author_email'} = $2; |
| 606 | $info{'author_date'} = $3; |
| 607 | } elsif (m/^committer (.*) <(.*)> (.*)$/) { |
| 608 | $info{'committer'} = $1; |
| 609 | $info{'committer_email'} = $2; |
| 610 | $info{'committer_date'} = $3; |
| 611 | } |
| 612 | } |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 613 | close($commit); |
Ryan Anderson | c65e898 | 2006-02-20 05:46:09 -0500 | [diff] [blame] | 614 | |
| 615 | return %info; |
| 616 | } |
Johannes Schindelin | 4788d11 | 2006-02-20 16:20:10 +0100 | [diff] [blame] | 617 | |
| 618 | sub format_date { |
Junio C Hamano | d920e18 | 2006-03-02 01:50:09 -0800 | [diff] [blame] | 619 | if ($rawtime) { |
| 620 | return $_[0]; |
| 621 | } |
Johannes Schindelin | 4788d11 | 2006-02-20 16:20:10 +0100 | [diff] [blame] | 622 | my ($timestamp, $timezone) = split(' ', $_[0]); |
Junio C Hamano | cfea8e0 | 2006-03-05 14:48:01 -0800 | [diff] [blame] | 623 | my $minutes = abs($timezone); |
| 624 | $minutes = int($minutes / 100) * 60 + ($minutes % 100); |
| 625 | if ($timezone < 0) { |
| 626 | $minutes = -$minutes; |
| 627 | } |
| 628 | my $t = $timestamp + $minutes * 60; |
| 629 | return strftime("%Y-%m-%d %H:%M:%S " . $timezone, gmtime($t)); |
Johannes Schindelin | 4788d11 | 2006-02-20 16:20:10 +0100 | [diff] [blame] | 630 | } |
| 631 | |
Ryan Anderson | 87475f4 | 2006-02-25 20:48:33 -0500 | [diff] [blame] | 632 | # Copied from git-send-email.perl - We need a Git.pm module.. |
| 633 | sub gitvar { |
| 634 | my ($var) = @_; |
| 635 | my $fh; |
| 636 | my $pid = open($fh, '-|'); |
| 637 | die "$!" unless defined $pid; |
| 638 | if (!$pid) { |
| 639 | exec('git-var', $var) or die "$!"; |
| 640 | } |
| 641 | my ($val) = <$fh>; |
| 642 | close $fh or die "$!"; |
| 643 | chomp($val); |
| 644 | return $val; |
| 645 | } |
| 646 | |
| 647 | sub gitvar_name { |
| 648 | my ($name) = @_; |
| 649 | my $val = gitvar($name); |
| 650 | my @field = split(/\s+/, $val); |
| 651 | return join(' ', @field[0...(@field-4)]); |
| 652 | } |
| 653 | |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 654 | sub open_pipe { |
Ryan Anderson | f60d469 | 2006-02-26 16:09:12 -0500 | [diff] [blame] | 655 | if ($^O eq '##INSERT_ACTIVESTATE_STRING_HERE##') { |
| 656 | return open_pipe_activestate(@_); |
| 657 | } else { |
| 658 | return open_pipe_normal(@_); |
| 659 | } |
| 660 | } |
| 661 | |
| 662 | sub open_pipe_activestate { |
| 663 | tie *fh, "Git::ActiveStatePipe", @_; |
| 664 | return *fh; |
| 665 | } |
| 666 | |
| 667 | sub open_pipe_normal { |
Ryan Anderson | 6b3e21d | 2006-02-25 22:02:05 -0500 | [diff] [blame] | 668 | my (@execlist) = @_; |
| 669 | |
| 670 | my $pid = open my $kid, "-|"; |
| 671 | defined $pid or die "Cannot fork: $!"; |
| 672 | |
| 673 | unless ($pid) { |
| 674 | exec @execlist; |
| 675 | die "Cannot exec @execlist: $!"; |
| 676 | } |
| 677 | |
| 678 | return $kid; |
| 679 | } |
Ryan Anderson | f60d469 | 2006-02-26 16:09:12 -0500 | [diff] [blame] | 680 | |
| 681 | package Git::ActiveStatePipe; |
| 682 | use strict; |
| 683 | |
| 684 | sub TIEHANDLE { |
| 685 | my ($class, @params) = @_; |
| 686 | my $cmdline = join " ", @params; |
| 687 | my @data = qx{$cmdline}; |
| 688 | bless { i => 0, data => \@data }, $class; |
| 689 | } |
| 690 | |
| 691 | sub READLINE { |
| 692 | my $self = shift; |
| 693 | if ($self->{i} >= scalar @{$self->{data}}) { |
| 694 | return undef; |
| 695 | } |
| 696 | return $self->{'data'}->[ $self->{i}++ ]; |
| 697 | } |
| 698 | |
| 699 | sub CLOSE { |
| 700 | my $self = shift; |
| 701 | delete $self->{data}; |
| 702 | delete $self->{i}; |
| 703 | } |
| 704 | |
| 705 | sub EOF { |
| 706 | my $self = shift; |
| 707 | return ($self->{i} >= scalar @{$self->{data}}); |
| 708 | } |