Revert "Convert git-annotate to use Git.pm"
This reverts commit 7fb39d5f58efd05e982fe148630edc97ded753b6.
Junio C Hamano committed
Sep 2, 2006 at 22:57 UTC
3c2f5886c78454276a045c1312eca652c11d98d6
1 file changed
+151
-32
git-annotate.perl
+151
-32
@@ -11,7 +11,6 @@ use strict;
11
use Getopt::Long;
12
use POSIX qw(strftime gmtime);
13
use File::Basename qw(basename dirname);
14
-use Git;
14
15
sub usage() {
16
print STDERR "Usage: ${\basename $0} [-s] [-S revs-file] file [ revision ]
@@ -30,7 +29,7 @@ sub usage() {
29
exit(1);
30
}
31
33
-our ($help, $longrev, $rename, $rawtime, $starting_rev, $rev_file, $repo) = (0, 0, 1);
32
+our ($help, $longrev, $rename, $rawtime, $starting_rev, $rev_file) = (0, 0, 1);
33
34
my $rc = GetOptions( "long|l" => \$longrev,
35
"time|t" => \$rawtime,
@@ -53,8 +52,6 @@ my @stack = (
52
},
53
);
54
56
-$repo = Git->repository();
57
-
55
our @filelines = ();
56
57
if (defined $starting_rev) {
@@ -105,11 +102,15 @@ while (my $bound = pop @stack) {
102
push @revqueue, $head;
103
init_claim( defined $starting_rev ? $head : 'dirty');
104
unless (defined $starting_rev) {
108
- my %ident;
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);
105
+ my $diff = open_pipe("git","diff","HEAD", "--",$filename)
106
+ or die "Failed to call git diff to check for dirty state: $!";
107
+
108
+ _git_diff_parse($diff, [$head], "dirty", (
109
+ 'author' => gitvar_name("GIT_AUTHOR_IDENT"),
110
+ 'author_date' => sprintf("%s +0000",time()),
111
+ )
112
+ );
113
+ close($diff);
114
}
115
handle_rev();
116
@@ -179,7 +180,8 @@ sub git_rev_list {
180
open($revlist, '<' . $rev_file)
181
or die "Failed to open $rev_file : $!";
182
} else {
182
- $revlist = $repo->command_output_pipe('rev-list', '--parents', '--remove-empty', $rev, '--', $file);
183
+ $revlist = open_pipe("git-rev-list","--parents","--remove-empty",$rev,"--",$file)
184
+ or die "Failed to exec git-rev-list: $!";
185
}
186
187
my @revs;
@@ -188,7 +190,7 @@ sub git_rev_list {
190
my ($rev, @parents) = split /\s+/, $line;
191
push @revs, [ $rev, @parents ];
192
}
191
- $repo->command_close_pipe($revlist);
193
+ close($revlist);
194
195
printf("0 revs found for rev %s (%s)\n", $rev, $file) if (@revs == 0);
196
return @revs;
@@ -197,7 +199,8 @@ sub git_rev_list {
199
sub find_parent_renames {
200
my ($rev, $file) = @_;
201
200
- my $patch = $repo->command_output_pipe('diff-tree', '-M50', '-r', '--name-status', '-z', $rev);
202
+ my $patch = open_pipe("git-diff-tree", "-M50", "-r","--name-status", "-z","$rev")
203
+ or die "Failed to exec git-diff: $!";
204
205
local $/ = "\0";
206
my %bound;
@@ -223,7 +226,7 @@ sub find_parent_renames {
226
}
227
}
228
}
226
- $repo->command_close_pipe($patch);
229
+ close($patch);
230
231
return \%bound;
232
}
@@ -232,9 +235,14 @@ sub find_parent_renames {
235
sub git_find_parent {
236
my ($rev, $filename) = @_;
237
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;
238
+ my $revparent = open_pipe("git-rev-list","--remove-empty", "--parents","--max-count=1","$rev","--",$filename)
239
+ or die "Failed to open git-rev-list to find a single parent: $!";
240
+
241
+ my $parentline = <$revparent>;
242
+ chomp $parentline;
243
+ my ($revfound,$parent) = split m/\s+/, $parentline;
244
+
245
+ close($revparent);
246
247
return $parent;
248
}
@@ -242,16 +250,29 @@ sub git_find_parent {
250
sub git_find_all_parents {
251
my ($rev) = @_;
252
245
- my $parentline = $repo->command_oneline("rev-list","--remove-empty", "--parents","--max-count=1","$rev");
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
254
- my $base = $repo->command_oneline("merge-base", $rev1, $rev2);
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
@@ -316,7 +337,7 @@ sub git_diff_parse {
337
my ($parents, $rev, %revinfo) = @_;
338
339
my @pseudo_parents;
319
- my @command = ("diff-tree");
340
+ my @command = ("git-diff-tree");
341
my $revision_spec;
342
343
if (scalar @$parents == 1) {
@@ -345,11 +366,12 @@ sub git_diff_parse {
366
push @command, "-p", "-M", $revision_spec, "--", @filenames;
367
368
348
- my $diff = $repo->command_output_pipe(@command);
369
+ my $diff = open_pipe( @command )
370
+ or die "Failed to call git-diff for annotation: $!";
371
372
_git_diff_parse($diff, \@pseudo_parents, $rev, %revinfo);
373
352
- $repo->command_close_pipe($diff);
374
+ close($diff);
375
}
376
377
sub _git_diff_parse {
@@ -525,25 +547,36 @@ sub git_cat_file {
547
my $blob = git_ls_tree($rev, $filename);
548
die "Failed to find a blob for $filename in rev $rev\n" if !defined $blob;
549
528
- my @lines = split(/\n/, $repo->get_object('blob', $blob));
529
- pop @lines unless $lines[$#lines]; # Trailing newline
550
+ my $catfile = open_pipe("git","cat-file", "blob", $blob)
551
+ or die "Failed to git-cat-file blob $blob (rev $rev, file $filename): " . $!;
552
+
553
+ my @lines;
554
+ while(<$catfile>) {
555
+ chomp;
556
+ push @lines, $_;
557
+ }
558
+ close($catfile);
559
+
560
return @lines;
561
}
562
563
sub git_ls_tree {
564
my ($rev, $filename) = @_;
565
536
- my $lstree = $repo->command_output_pipe('ls-tree', $rev, $filename);
566
+ my $lstree = open_pipe("git","ls-tree",$rev,$filename)
567
+ or die "Failed to call git ls-tree: $!";
568
+
569
my ($mode, $type, $blob, $tfilename);
570
while(<$lstree>) {
571
chomp;
572
($mode, $type, $blob, $tfilename) = split(/\s+/, $_, 4);
573
last if ($tfilename eq $filename);
574
}
543
- $repo->command_close_pipe($lstree);
575
+ close($lstree);
576
577
return $blob if ($tfilename eq $filename);
578
die "git-ls-tree failed to find blob for $filename";
579
+
580
}
581
582
@@ -559,17 +592,25 @@ sub claim_line {
592
593
sub git_commit_info {
594
my ($rev) = @_;
562
- my $commit = $repo->get_object('commit', $rev);
595
+ my $commit = open_pipe("git-cat-file", "commit", $rev)
596
+ or die "Failed to call git-cat-file: $!";
597
598
my %info;
565
- while ($commit =~ /(.*?)\n/g) {
566
- my $line = $1;
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);
599
+ while(<$commit>) {
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
}
613
+ close($commit);
614
615
return %info;
616
}
@@ -587,3 +628,81 @@ sub format_date {
628
my $t = $timestamp + $minutes * 60;
629
return strftime("%Y-%m-%d %H:%M:%S " . $timezone, gmtime($t));
630
}
631
+
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
+
654
+sub open_pipe {
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 {
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
+}
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
+}