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

Convert git-annotate to use Git.pm

Browse Source 
Together with the other converted scripts, this is probably still pu
material; it appears to work fine for me, though. The speed gain from
get_object() is about 10% (I expected more...).

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Petr Baudis 2006-07-03 22:48:07 +02:00 committed by Junio C Hamano
parent 3c479c37f8
commit 7fb39d5f58
1 changed files with 31 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
git-annotate.perl
View File

@ -11,6 +11,7 @@ use strict;
use Getopt::Long; use Getopt::Long;
use POSIX qw(strftime gmtime); use POSIX qw(strftime gmtime);
use File::Basename qw(basename dirname); use File::Basename qw(basename dirname);
use Git;
sub usage() { sub usage() {
print STDERR "Usage: ${\basename $0} [-s] [-S revs-file] file [ revision ] print STDERR "Usage: ${\basename $0} [-s] [-S revs-file] file [ revision ]
@ -29,7 +30,7 @@ sub usage() {
exit(1); exit(1);
} }
our ($help, $longrev, $rename, $rawtime, $starting_rev, $rev_file) = (0, 0, 1); our ($help, $longrev, $rename, $rawtime, $starting_rev, $rev_file, $repo) = (0, 0, 1);
my $rc = GetOptions( "long|l" => \$longrev, my $rc = GetOptions( "long|l" => \$longrev,
"time|t" => \$rawtime, "time|t" => \$rawtime,
@ -52,6 +53,8 @@ my @stack = (
}, },
); );
$repo = Git->repository();
our @filelines = (); our @filelines = ();
if (defined $starting_rev) { if (defined $starting_rev) {
@ -102,15 +105,11 @@ while (my $bound = pop @stack) {
push @revqueue, $head; push @revqueue, $head;
init_claim( defined $starting_rev ? $head : 'dirty'); init_claim( defined $starting_rev ? $head : 'dirty');
unless (defined $starting_rev) { unless (defined $starting_rev) {
my $diff = open_pipe("git","diff","-R", "HEAD", "--",$filename) my %ident;
or die "Failed to call git diff to check for dirty state: $!"; @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", ( _git_diff_parse($diff, $head, "dirty", %ident);
'author' => gitvar_name("GIT_AUTHOR_IDENT"), $repo->command_close_pipe($diff);
'author_date' => sprintf("%s +0000",time()),
)
);
close($diff);
} }
handle_rev(); handle_rev();
@ -181,8 +180,7 @@ sub git_rev_list {
open($revlist, '<' . $rev_file) open($revlist, '<' . $rev_file)
or die "Failed to open $rev_file : $!"; or die "Failed to open $rev_file : $!";
} else { } else {
$revlist = open_pipe("git-rev-list","--parents","--remove-empty",$rev,"--",$file) $revlist = $repo->command_output_pipe('rev-list', '--parents', '--remove-empty', $rev, '--', $file);
or die "Failed to exec git-rev-list: $!";
} }
my @revs; my @revs;
@ -191,7 +189,7 @@ sub git_rev_list {
my ($rev, @parents) = split /\s+/, $line; my ($rev, @parents) = split /\s+/, $line;
push @revs, [ $rev, @parents ]; push @revs, [ $rev, @parents ];
} }
close($revlist); $repo->command_close_pipe($revlist);
printf("0 revs found for rev %s (%s)\n", $rev, $file) if (@revs == 0); printf("0 revs found for rev %s (%s)\n", $rev, $file) if (@revs == 0);
return @revs; return @revs;
@ -200,8 +198,7 @@ sub git_rev_list {
sub find_parent_renames { sub find_parent_renames {
my ($rev, $file) = @_; my ($rev, $file) = @_;
my $patch = open_pipe("git-diff-tree", "-M50", "-r","--name-status", "-z","$rev") my $patch = $repo->command_output_pipe('diff-tree', '-M50', '-r', '--name-status', '-z', $rev);
or die "Failed to exec git-diff: $!";
local $/ = "\0"; local $/ = "\0";
my %bound; my %bound;
@ -227,7 +224,7 @@ sub find_parent_renames {
} }
} }
} }
close($patch); $repo->command_close_pipe($patch);
return \%bound; return \%bound;
} }
@ -236,14 +233,9 @@ sub find_parent_renames {
sub git_find_parent { sub git_find_parent {
my ($rev, $filename) = @_; my ($rev, $filename) = @_;
my $revparent = open_pipe("git-rev-list","--remove-empty", "--parents","--max-count=1","$rev","--",$filename) my $parentline = $repo->command_oneline('rev-list', '--remove-empty',
or die "Failed to open git-rev-list to find a single parent: $!"; '--parents', '--max-count=1', $rev, '--', $filename);
my ($revfound, $parent) = split m/\s+/, $parentline;
my $parentline = <$revparent>;
chomp $parentline;
my ($revfound,$parent) = split m/\s+/, $parentline;
close($revparent);
return $parent; return $parent;
} }
@ -254,13 +246,13 @@ sub git_find_parent {
sub git_diff_parse { sub git_diff_parse {
my ($parent, $rev, %revinfo) = @_; my ($parent, $rev, %revinfo) = @_;
my $diff = open_pipe("git-diff-tree","-M","-p",$rev,$parent,"--", my $diff = $repo->command_output_pipe('diff-tree', '-M', '-p',
$revs{$rev}{'filename'}, $revs{$parent}{'filename'}) $rev, $parent, '--',
or die "Failed to call git-diff for annotation: $!"; $revs{$rev}{'filename'}, $revs{$parent}{'filename'});
_git_diff_parse($diff, $parent, $rev, %revinfo); _git_diff_parse($diff, $parent, $rev, %revinfo);
close($diff); $repo->command_close_pipe($diff);
} }
sub _git_diff_parse { sub _git_diff_parse {
@ -351,36 +343,25 @@ sub git_cat_file {
my $blob = git_ls_tree($rev, $filename); my $blob = git_ls_tree($rev, $filename);
die "Failed to find a blob for $filename in rev $rev\n" if !defined $blob; die "Failed to find a blob for $filename in rev $rev\n" if !defined $blob;
my $catfile = open_pipe("git","cat-file", "blob", $blob) my @lines = split(/\n/, $repo->get_object('blob', $blob));
or die "Failed to git-cat-file blob $blob (rev $rev, file $filename): " . $!; pop @lines unless $lines[$#lines]; # Trailing newline
my @lines;
while(<$catfile>) {
chomp;
push @lines, $_;
}
close($catfile);
return @lines; return @lines;
} }
sub git_ls_tree { sub git_ls_tree {
my ($rev, $filename) = @_; my ($rev, $filename) = @_;
my $lstree = open_pipe("git","ls-tree",$rev,$filename) my $lstree = $repo->command_output_pipe('ls-tree', $rev, $filename);
or die "Failed to call git ls-tree: $!";
my ($mode, $type, $blob, $tfilename); my ($mode, $type, $blob, $tfilename);
while(<$lstree>) { while(<$lstree>) {
chomp; chomp;
($mode, $type, $blob, $tfilename) = split(/\s+/, $_, 4); ($mode, $type, $blob, $tfilename) = split(/\s+/, $_, 4);
last if ($tfilename eq $filename); last if ($tfilename eq $filename);
} }
close($lstree); $repo->command_close_pipe($lstree);
return $blob if ($tfilename eq $filename); return $blob if ($tfilename eq $filename);
die "git-ls-tree failed to find blob for $filename"; die "git-ls-tree failed to find blob for $filename";
} }
@ -396,25 +377,17 @@ sub claim_line {
sub git_commit_info { sub git_commit_info {
my ($rev) = @_; my ($rev) = @_;
my $commit = open_pipe("git-cat-file", "commit", $rev) my $commit = $repo->get_object('commit', $rev);
or die "Failed to call git-cat-file: $!";
my %info; my %info;
while(<$commit>) { while ($commit =~ /(.*?)\n/g) {
chomp; my $line = $1;
last if (length $_ == 0); if ($line =~ s/^author //) {
@info{'author', 'author_email', 'author_date'} = $repo->ident($line);
if (m/^author (.*) <(.*)> (.*)$/) { } elsif ($line =~ s/^committer//) {
$info{'author'} = $1; @info{'committer', 'committer_email', 'committer_date'} = $repo->ident($line);
$info{'author_email'} = $2;
$info{'author_date'} = $3;
} elsif (m/^committer (.*) <(.*)> (.*)$/) {
$info{'committer'} = $1;
$info{'committer_email'} = $2;
$info{'committer_date'} = $3;
} }
} }
close($commit);
return %info; return %info;
} }
@ -432,81 +405,3 @@ sub format_date {
my $t = $timestamp + $minutes * 60; my $t = $timestamp + $minutes * 60;
return strftime("%Y-%m-%d %H:%M:%S " . $timezone, gmtime($t)); return strftime("%Y-%m-%d %H:%M:%S " . $timezone, gmtime($t));
} }
# Copied from git-send-email.perl - We need a Git.pm module..
sub gitvar {
my ($var) = @_;
my $fh;
my $pid = open($fh, '-|');
die "$!" unless defined $pid;
if (!$pid) {
exec('git-var', $var) or die "$!";
}
my ($val) = <$fh>;
close $fh or die "$!";
chomp($val);
return $val;
}
sub gitvar_name {
my ($name) = @_;
my $val = gitvar($name);
my @field = split(/\s+/, $val);
return join(' ', @field[0...(@field-4)]);
}
sub open_pipe {
if ($^O eq '##INSERT_ACTIVESTATE_STRING_HERE##') {
return open_pipe_activestate(@_);
} else {
return open_pipe_normal(@_);
}
}
sub open_pipe_activestate {
tie *fh, "Git::ActiveStatePipe", @_;
return *fh;
}
sub open_pipe_normal {
my (@execlist) = @_;
my $pid = open my $kid, "-|";
defined $pid or die "Cannot fork: $!";
unless ($pid) {
exec @execlist;
die "Cannot exec @execlist: $!";
}
return $kid;
}
package Git::ActiveStatePipe;
use strict;
sub TIEHANDLE {
my ($class, @params) = @_;
my $cmdline = join " ", @params;
my @data = qx{$cmdline};
bless { i => 0, data => \@data }, $class;
}
sub READLINE {
my $self = shift;
if ($self->{i} >= scalar @{$self->{data}}) {
return undef;
}
return $self->{'data'}->[ $self->{i}++ ];
}
sub CLOSE {
my $self = shift;
delete $self->{data};
delete $self->{i};
}
sub EOF {
my $self = shift;
return ($self->{i} >= scalar @{$self->{data}});
}