Skip to content

Commit

Permalink
Convert git-annotate to use Git.pm
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Petr Baudis authored and Junio C Hamano committed Jul 9, 2006
1 parent 3c479c3 commit 7fb39d5
Showing 1 changed file with 31 additions and 136 deletions.
167 changes: 31 additions & 136 deletions git-annotate.perl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Getopt::Long;
use POSIX qw(strftime gmtime);
use File::Basename qw(basename dirname);
use Git;

sub usage() {
print STDERR "Usage: ${\basename $0} [-s] [-S revs-file] file [ revision ]
Expand All @@ -29,7 +30,7 @@ ()
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,
"time|t" => \$rawtime,
Expand All @@ -52,6 +53,8 @@ ()
},
);

$repo = Git->repository();

our @filelines = ();

if (defined $starting_rev) {
Expand Down Expand Up @@ -102,15 +105,11 @@ ()
push @revqueue, $head;
init_claim( defined $starting_rev ? $head : 'dirty');
unless (defined $starting_rev) {
my $diff = open_pipe("git","diff","-R", "HEAD", "--",$filename)
or die "Failed to call git diff to check for dirty state: $!";

_git_diff_parse($diff, $head, "dirty", (
'author' => gitvar_name("GIT_AUTHOR_IDENT"),
'author_date' => sprintf("%s +0000",time()),
)
);
close($diff);
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);
$repo->command_close_pipe($diff);
}
handle_rev();

Expand Down Expand Up @@ -181,8 +180,7 @@ sub git_rev_list {
open($revlist, '<' . $rev_file)
or die "Failed to open $rev_file : $!";
} else {
$revlist = open_pipe("git-rev-list","--parents","--remove-empty",$rev,"--",$file)
or die "Failed to exec git-rev-list: $!";
$revlist = $repo->command_output_pipe('rev-list', '--parents', '--remove-empty', $rev, '--', $file);
}

my @revs;
Expand All @@ -191,7 +189,7 @@ sub git_rev_list {
my ($rev, @parents) = split /\s+/, $line;
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);
return @revs;
Expand All @@ -200,8 +198,7 @@ sub git_rev_list {
sub find_parent_renames {
my ($rev, $file) = @_;

my $patch = open_pipe("git-diff-tree", "-M50", "-r","--name-status", "-z","$rev")
or die "Failed to exec git-diff: $!";
my $patch = $repo->command_output_pipe('diff-tree', '-M50', '-r', '--name-status', '-z', $rev);

local $/ = "\0";
my %bound;
Expand All @@ -227,7 +224,7 @@ sub find_parent_renames {
}
}
}
close($patch);
$repo->command_close_pipe($patch);

return \%bound;
}
Expand All @@ -236,14 +233,9 @@ sub find_parent_renames {
sub git_find_parent {
my ($rev, $filename) = @_;

my $revparent = open_pipe("git-rev-list","--remove-empty", "--parents","--max-count=1","$rev","--",$filename)
or die "Failed to open git-rev-list to find a single parent: $!";

my $parentline = <$revparent>;
chomp $parentline;
my ($revfound,$parent) = split m/\s+/, $parentline;

close($revparent);
my $parentline = $repo->command_oneline('rev-list', '--remove-empty',
'--parents', '--max-count=1', $rev, '--', $filename);
my ($revfound, $parent) = split m/\s+/, $parentline;

return $parent;
}
Expand All @@ -254,13 +246,13 @@ sub git_find_parent {
sub git_diff_parse {
my ($parent, $rev, %revinfo) = @_;

my $diff = open_pipe("git-diff-tree","-M","-p",$rev,$parent,"--",
$revs{$rev}{'filename'}, $revs{$parent}{'filename'})
or die "Failed to call git-diff for annotation: $!";
my $diff = $repo->command_output_pipe('diff-tree', '-M', '-p',
$rev, $parent, '--',
$revs{$rev}{'filename'}, $revs{$parent}{'filename'});

_git_diff_parse($diff, $parent, $rev, %revinfo);

close($diff);
$repo->command_close_pipe($diff);
}

sub _git_diff_parse {
Expand Down Expand Up @@ -351,36 +343,25 @@ sub git_cat_file {
my $blob = git_ls_tree($rev, $filename);
die "Failed to find a blob for $filename in rev $rev\n" if !defined $blob;

my $catfile = open_pipe("git","cat-file", "blob", $blob)
or die "Failed to git-cat-file blob $blob (rev $rev, file $filename): " . $!;

my @lines;
while(<$catfile>) {
chomp;
push @lines, $_;
}
close($catfile);

my @lines = split(/\n/, $repo->get_object('blob', $blob));
pop @lines unless $lines[$#lines]; # Trailing newline
return @lines;
}

sub git_ls_tree {
my ($rev, $filename) = @_;

my $lstree = open_pipe("git","ls-tree",$rev,$filename)
or die "Failed to call git ls-tree: $!";

my $lstree = $repo->command_output_pipe('ls-tree', $rev, $filename);
my ($mode, $type, $blob, $tfilename);
while(<$lstree>) {
chomp;
($mode, $type, $blob, $tfilename) = split(/\s+/, $_, 4);
last if ($tfilename eq $filename);
}
close($lstree);
$repo->command_close_pipe($lstree);

return $blob if ($tfilename eq $filename);
die "git-ls-tree failed to find blob for $filename";

}


Expand All @@ -396,25 +377,17 @@ sub claim_line {

sub git_commit_info {
my ($rev) = @_;
my $commit = open_pipe("git-cat-file", "commit", $rev)
or die "Failed to call git-cat-file: $!";
my $commit = $repo->get_object('commit', $rev);

my %info;
while(<$commit>) {
chomp;
last if (length $_ == 0);

if (m/^author (.*) <(.*)> (.*)$/) {
$info{'author'} = $1;
$info{'author_email'} = $2;
$info{'author_date'} = $3;
} elsif (m/^committer (.*) <(.*)> (.*)$/) {
$info{'committer'} = $1;
$info{'committer_email'} = $2;
$info{'committer_date'} = $3;
while ($commit =~ /(.*?)\n/g) {
my $line = $1;
if ($line =~ s/^author //) {
@info{'author', 'author_email', 'author_date'} = $repo->ident($line);
} elsif ($line =~ s/^committer//) {
@info{'committer', 'committer_email', 'committer_date'} = $repo->ident($line);
}
}
close($commit);

return %info;
}
Expand All @@ -432,81 +405,3 @@ sub format_date {
my $t = $timestamp + $minutes * 60;
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}});
}

0 comments on commit 7fb39d5

Please sign in to comment.