2 # Copyright 2006, Ryan Anderson <ryan@michonline.com>
6 # This file is licensed under the GPL v2, or a later version
7 # at the discretion of Linus Torvalds.
12 use POSIX
qw(strftime gmtime);
13 use File
::Basename
qw(basename dirname);
17 print STDERR
"Usage: ${\basename $0} [-s] [-S revs-file] file [ revision ]
19 Show long rev (Defaults off)
21 Show raw timestamp (Defaults off)
23 Follow renames (Defaults on).
24 -S, --rev-file revs-file
25 Use revs from revs-file instead of calling git-rev-list
33 our ($help, $longrev, $rename, $rawtime, $starting_rev, $rev_file, $repo) = (0, 0, 1);
35 my $rc = GetOptions
( "long|l" => \
$longrev,
36 "time|t" => \
$rawtime,
38 "rename|r" => \
$rename,
39 "rev-file|S=s" => \
$rev_file);
40 if (!$rc or $help or !@ARGV) {
44 my $filename = shift @ARGV;
46 $starting_rev = shift @ARGV;
51 'rev' => defined $starting_rev ?
$starting_rev : "HEAD",
52 'filename' => $filename,
56 $repo = Git
->repository();
60 if (defined $starting_rev) {
61 @filelines = git_cat_file
($starting_rev, $filename);
64 or die "Failed to open filename: $!";
78 my $revsprocessed = 0;
79 while (my $bound = pop @stack) {
80 my @revisions = git_rev_list
($bound->{'rev'}, $bound->{'filename'});
81 foreach my $revinst (@revisions) {
82 my ($rev, @parents) = @
$revinst;
88 $revs{$rev}{'filename'} = $bound->{'filename'};
89 if (scalar @parents > 0) {
90 $revs{$rev}{'parents'} = \
@parents;
98 my $newbound = find_parent_renames
($rev, $bound->{'filename'});
99 if ( exists $newbound->{'filename'} && $newbound->{'filename'} ne $bound->{'filename'}) {
100 push @stack, $newbound;
101 $revs{$rev}{'parents'} = [$newbound->{'rev'}];
105 push @revqueue, $head;
106 init_claim
( defined $starting_rev ?
$head : 'dirty');
107 unless (defined $starting_rev) {
109 @ident{'author', 'author_email', 'author_date'} = $repo->ident('author');
110 my $diff = $repo->command_output_pipe('diff', '-R', 'HEAD', '--', $filename);
111 _git_diff_parse
($diff, [$head], "dirty", %ident);
112 $repo->command_close_pipe($diff);
118 foreach my $l (@filelines) {
119 my ($output, $rev, $committer, $date);
120 if (ref $l eq 'ARRAY') {
121 ($output, $rev, $committer, $date) = @
$l;
122 if (!$longrev && length($rev) > 8) {
123 $rev = substr($rev,0,8);
127 ($rev, $committer, $date) = ('unknown', 'unknown', 'unknown');
130 printf("%s\t(%10s\t%10s\t%d)%s\n", $rev, $committer,
131 format_date
($date), ++$i, $output);
136 for (my $i = 0; $i < @filelines; $i++) {
137 $filelines[$i] = [ $filelines[$i], '', '', '', 1];
142 # 1 <-- belongs to the original file.
144 $revs{$rev}{'lines'} = \
@filelines;
151 while (my $rev = shift @revqueue) {
152 next if $seen{$rev}++;
154 my %revinfo = git_commit_info
($rev);
156 if (exists $revs{$rev}{parents
} &&
157 scalar @
{$revs{$rev}{parents
}} != 0) {
159 git_diff_parse
($revs{$rev}{'parents'}, $rev, %revinfo);
160 push @revqueue, @
{$revs{$rev}{'parents'}};
163 # We must be at the initial rev here, so claim everything that is left.
164 for (my $i = 0; $i < @
{$revs{$rev}{lines
}}; $i++) {
165 if (ref ${$revs{$rev}{lines
}}[$i] eq '' || ${$revs{$rev}{lines
}}[$i][1] eq '') {
166 claim_line
($i, $rev, $revs{$rev}{lines
}, %revinfo);
175 my ($rev, $file) = @_;
179 open($revlist, '<' . $rev_file)
180 or die "Failed to open $rev_file : $!";
182 $revlist = $repo->command_output_pipe('rev-list', '--parents', '--remove-empty', $rev, '--', $file);
186 while(my $line = <$revlist>) {
188 my ($rev, @parents) = split /\s+/, $line;
189 push @revs, [ $rev, @parents ];
191 $repo->command_close_pipe($revlist);
193 printf("0 revs found for rev %s (%s)\n", $rev, $file) if (@revs == 0);
197 sub find_parent_renames
{
198 my ($rev, $file) = @_;
200 my $patch = $repo->command_output_pipe('diff-tree', '-M50', '-r', '--name-status', '-z', $rev);
205 while (my $change = <$patch>) {
207 my $filename = <$patch>;
208 if (!defined $filename) {
213 if ($change =~ m/^[AMD]$/ ) {
215 } elsif ($change =~ m/^R/ ) {
216 my $oldfilename = $filename;
217 $filename = <$patch>;
219 if ( $file eq $filename ) {
220 my $parent = git_find_parent
($rev, $oldfilename);
221 @bound{'rev','filename'} = ($parent, $oldfilename);
226 $repo->command_close_pipe($patch);
232 sub git_find_parent
{
233 my ($rev, $filename) = @_;
235 my $parentline = $repo->command_oneline('rev-list', '--remove-empty',
236 '--parents', '--max-count=1', $rev, '--', $filename);
237 my ($revfound, $parent) = split m/\s+/, $parentline;
242 sub git_find_all_parents
{
245 my $parentline = $repo->command_oneline("rev-list","--remove-empty", "--parents","--max-count=1","$rev");
246 my ($origrev, @parents) = split m/\s+/, $parentline;
252 my ($rev1, $rev2) = @_;
254 my $base = $repo->command_oneline("merge-base", $rev1, $rev2);
258 # Construct a set of pseudo parents that are in the same order,
259 # and the same quantity as the real parents,
260 # but whose SHA1s are as similar to the logical parents
262 sub get_pseudo_parents
{
263 my ($all, $fake) = @_;
270 my %fake = map {$_ => 1} @fake;
274 foreach my $p (@all) {
275 if (exists $fake{$p}) {
276 if ($fake[$fakeidx] ne $p) {
277 die sprintf("parent mismatch: %s != %s\nall:%s\nfake:%s\n",
289 my $base = git_merge_base
($fake[$fakeidx], $p);
290 if ($base ne $fake[$fakeidx]) {
291 die sprintf("Result of merge-base doesn't match fake: %s,%s != %s\n",
292 $fake[$fakeidx], $p, $base);
295 # The details of how we parse the diffs
296 # mean that we cannot have a duplicate
297 # revision in the list, so if we've already
298 # seen the revision we would normally add, just use
299 # the actual revision.
300 if ($seenfake{$base}) {
313 # Get a diff between the current revision and a parent.
314 # Record the commit information that results.
316 my ($parents, $rev, %revinfo) = @_;
319 my @command = ("diff-tree");
322 if (scalar @
$parents == 1) {
324 $revision_spec = join("..", $parents->[0], $rev);
325 @pseudo_parents = @
$parents;
327 my @all_parents = git_find_all_parents
($rev);
329 if (@all_parents != @
$parents) {
330 @pseudo_parents = get_pseudo_parents
(\
@all_parents, $parents);
332 @pseudo_parents = @
$parents;
335 $revision_spec = $rev;
339 my @filenames = ( $revs{$rev}{'filename'} );
341 foreach my $parent (@
$parents) {
342 push @filenames, $revs{$parent}{'filename'};
345 push @command, "-p", "-M", $revision_spec, "--", @filenames;
348 my $diff = $repo->command_output_pipe(@command);
350 _git_diff_parse
($diff, \
@pseudo_parents, $rev, %revinfo);
352 $repo->command_close_pipe($diff);
355 sub _git_diff_parse
{
356 my ($diff, $parents, $rev, %revinfo) = @_;
360 my $slines = $revs{$rev}{'lines'};
365 my $parent_count = @
$parents;
367 my $diff_header_regexp = "^@";
368 $diff_header_regexp .= "@" x @
$parents;
369 $diff_header_regexp .= ' -\d+,\d+' x @
$parents;
370 $diff_header_regexp .= ' \+(\d+),\d+';
371 $diff_header_regexp .= " " . ("@" x @
$parents);
374 my $allparentplus = '^' . '\\+' x @
$parents . '(.*)$';
378 foreach my $parent (@
$parents) {
381 my $r = '^' . '.' x @
$parents . '(.*)$';
383 substr($p,$i+1, 1) = '\\+';
386 substr($m,$i+1, 1) = '-';
388 $claim_regexps{$parent}{plus
} = $p;
389 $claim_regexps{$parent}{minus
} = $m;
391 $plines{$parent} = [];
400 #printf("%d:%s:\n", $gotheader, $_);
401 if (m/$diff_header_regexp/) {
407 foreach my $parent (@
$parents) {
408 for (my $i = $ri; $i < $remstart; $i++) {
409 $plines{$parent}[$pi{$parent}++] = $slines->[$i];
416 } elsif (!$gotheader) {
417 # Skip over the leadin.
423 # Skip \No newline at end of file.
424 # But this can be internationalized, so only look
433 if (m/$allparentplus/) {
434 claim_line
($ri, $rev, $slines, %revinfo);
440 foreach my $parent (keys %claim_regexps) {
441 my $m = $claim_regexps{$parent}{minus
};
442 my $p = $claim_regexps{$parent}{plus
};
446 $plines{$parent}[$pi{$parent}++] = [ $line, '', '', '', 0 ];
451 if (get_line
($slines, $ri) eq $line) {
452 # Found a match, claim
456 die sprintf("Sync error: %d\n|%s\n|%s\n%s => %s\n",
458 get_line
($slines, $ri),
465 foreach my $parent (@
$parents) {
466 next if $claims{$parent} || $allclaimed;
467 $plines{$parent}[$pi{$parent}++] = $slines->[$ri];
468 #[ $line, '', '', '', 0 ];
472 } elsif ($negclaim) {
476 if (substr($_,scalar @
$parents) ne get_line
($slines,$ri) ) {
477 foreach my $parent (@
$parents) {
478 printf("parent %s is on line %d\n", $parent, $pi{$parent});
482 for (my $i = -2; $i < 2; $i++) {
483 push @context, get_line
($slines, $ri + $i);
485 my $context = join("\n", @context);
487 my $justline = substr($_, scalar @
$parents);
488 die sprintf("Line %d, does not match:\n|%s|\n|%s|\n%s\n",
493 foreach my $parent (@
$parents) {
494 $plines{$parent}[$pi{$parent}++] = $slines->[$ri];
501 for (my $i = $ri; $i < @
{$slines} ; $i++) {
502 foreach my $parent (@
$parents) {
503 push @
{$plines{$parent}}, $slines->[$ri];
508 foreach my $parent (@
$parents) {
509 $revs{$parent}{lines
} = $plines{$parent};
516 my ($lines, $index) = @_;
518 return ref $lines->[$index] ne '' ?
$lines->[$index][0] : $lines->[$index];
522 my ($rev, $filename) = @_;
523 return () unless defined $rev && defined $filename;
525 my $blob = git_ls_tree
($rev, $filename);
526 die "Failed to find a blob for $filename in rev $rev\n" if !defined $blob;
528 my @lines = split(/\n/, $repo->get_object('blob', $blob));
529 pop @lines unless $lines[$#lines]; # Trailing newline
534 my ($rev, $filename) = @_;
536 my $lstree = $repo->command_output_pipe('ls-tree', $rev, $filename);
537 my ($mode, $type, $blob, $tfilename);
540 ($mode, $type, $blob, $tfilename) = split(/\s+/, $_, 4);
541 last if ($tfilename eq $filename);
543 $repo->command_close_pipe($lstree);
545 return $blob if ($tfilename eq $filename);
546 die "git-ls-tree failed to find blob for $filename";
552 my ($floffset, $rev, $lines, %revinfo) = @_;
553 my $oline = get_line
($lines, $floffset);
554 @
{$lines->[$floffset]} = ( $oline, $rev,
555 $revinfo{'author'}, $revinfo{'author_date'} );
556 #printf("Claiming line %d with rev %s: '%s'\n",
557 # $floffset, $rev, $oline) if 1;
560 sub git_commit_info
{
562 my $commit = $repo->get_object('commit', $rev);
565 while ($commit =~ /(.*?)\n/g) {
567 if ($line =~ s/^author //) {
568 @info{'author', 'author_email', 'author_date'} = $repo->ident($line);
569 } elsif ($line =~ s/^committer//) {
570 @info{'committer', 'committer_email', 'committer_date'} = $repo->ident($line);
581 my ($timestamp, $timezone) = split(' ', $_[0]);
582 my $minutes = abs($timezone);
583 $minutes = int($minutes / 100) * 60 + ($minutes % 100);
585 $minutes = -$minutes;
587 my $t = $timestamp + $minutes * 60;
588 return strftime
("%Y-%m-%d %H:%M:%S " . $timezone, gmtime($t));