undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ra/anno' into next

Browse Source 
* ra/anno:
  Use Ryan's git-annotate instead of jsannotate
This commit is contained in:
Junio C Hamano 2006-02-22 02:07:20 -08:00
commit 52670c9730
1 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
git-annotate.perl
View File

@ -8,10 +8,26 @@
use warnings; use warnings;
use strict; use strict;
use Getopt::Std;
use POSIX qw(strftime gmtime);
sub usage() {
print STDERR 'Usage: ${\basename $0} [-s] [-S revs-file] file
-l show long rev
-r follow renames
-S commit use revs from revs-file instead of calling git-rev-list
';
exit(1);
}
our ($opt_h, $opt_l, $opt_r, $opt_S);
getopts("hlrS:") or usage();
$opt_h && usage();
my $filename = shift @ARGV; my $filename = shift @ARGV;
my @stack = ( my @stack = (
{ {
'rev' => "HEAD", 'rev' => "HEAD",
@ -41,12 +57,19 @@ while (my $bound = pop @stack) {
my ($rev, @parents) = @$revinst; my ($rev, @parents) = @$revinst;
$head ||= $rev; $head ||= $rev;
if (!defined($rev)) {
$rev = "";
}
$revs{$rev}{'filename'} = $bound->{'filename'}; $revs{$rev}{'filename'} = $bound->{'filename'};
if (scalar @parents > 0) { if (scalar @parents > 0) {
$revs{$rev}{'parents'} = \@parents; $revs{$rev}{'parents'} = \@parents;
next; next;
} }
if (!$opt_r) {
next;
}
my $newbound = find_parent_renames($rev, $bound->{'filename'}); my $newbound = find_parent_renames($rev, $bound->{'filename'});
if ( exists $newbound->{'filename'} && $newbound->{'filename'} ne $bound->{'filename'}) { if ( exists $newbound->{'filename'} && $newbound->{'filename'} ne $bound->{'filename'}) {
push @stack, $newbound; push @stack, $newbound;
@ -65,7 +88,7 @@ foreach my $l (@filelines) {
my ($output, $rev, $committer, $date); my ($output, $rev, $committer, $date);
if (ref $l eq 'ARRAY') { if (ref $l eq 'ARRAY') {
($output, $rev, $committer, $date) = @$l; ($output, $rev, $committer, $date) = @$l;
if (length($rev) > 8) { if (!$opt_l && length($rev) > 8) {
$rev = substr($rev,0,8); $rev = substr($rev,0,8);
} }
} else { } else {
@ -73,7 +96,8 @@ foreach my $l (@filelines) {
($rev, $committer, $date) = ('unknown', 'unknown', 'unknown'); ($rev, $committer, $date) = ('unknown', 'unknown', 'unknown');
} }
printf("(%8s %10s %10s %d)%s\n", $rev, $committer, $date, $i++, $output); printf("%s\t(%10s\t%10s\t%d)%s\n", $rev, $committer,
format_date($date), $i++, $output);
} }
sub init_claim { sub init_claim {
@ -119,8 +143,12 @@ sub handle_rev {
sub git_rev_list { sub git_rev_list {
my ($rev, $file) = @_; my ($rev, $file) = @_;
open(P,"-|","git-rev-list","--parents","--remove-empty",$rev,"--",$file) if ($opt_S) {
or die "Failed to exec git-rev-list: $!"; open(P, '<' . $opt_S);
} else {
open(P,"-|","git-rev-list","--parents","--remove-empty",$rev,"--",$file)
or die "Failed to exec git-rev-list: $!";
}
my @revs; my @revs;
while(my $line = <P>) { while(my $line = <P>) {
@ -319,3 +347,10 @@ sub git_commit_info {
return %info; return %info;
} }
sub format_date {
my ($timestamp, $timezone) = split(' ', $_[0]);
return strftime("%Y-%m-%d %H:%M:%S " . $timezone, gmtime($timestamp));
}