annotate: Handle dirty state and arbitrary revisions.
Also, use Getopt::Long and only process each rev once. (Thanks to Morten Welinder for spotting the performance problems.) Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Ryan Anderson committed
Feb 25, 2006 at 20:48 UTC
87475f4dfce96b040fffbaefda9a4daa789786b2
1 file changed
+113
-37
git-annotate.perl
+113
-37
@@ -8,44 +8,62 @@
8
9
use warnings;
10
use strict;
11
-use Getopt::Std;
11
+use Getopt::Long;
12
use POSIX qw(strftime gmtime);
13
14
sub usage() {
15
- print STDERR 'Usage: ${\basename $0} [-s] [-S revs-file] file
16
-
17
- -l show long rev
18
- -r follow renames
19
- -S commit use revs from revs-file instead of calling git-rev-list
15
+ print STDERR 'Usage: ${\basename $0} [-s] [-S revs-file] file [ revision ]
16
+ -l, --long
17
+ Show long rev (Defaults off)
18
+ -r, --rename
19
+ Follow renames (Defaults on).
20
+ -S, --rev-file revs-file
21
+ use revs from revs-file instead of calling git-rev-list
22
+ -h, --help
23
+ This message.
24
';
25
26
exit(1);
27
}
28
25
-our ($opt_h, $opt_l, $opt_r, $opt_S);
26
-getopts("hlrS:") or usage();
27
-$opt_h && usage();
29
+our ($help, $longrev, $rename, $starting_rev, $rev_file) = (0, 0, 1);
30
+
31
+my $rc = GetOptions( "long|l" => \$longrev,
32
+ "help|h" => \$help,
33
+ "rename|r" => \$rename,
34
+ "rev-file|S" => \$rev_file);
35
+if (!$rc or $help) {
36
+ usage();
37
+}
38
39
my $filename = shift @ARGV;
40
+if (@ARGV) {
41
+ $starting_rev = shift @ARGV;
42
+}
43
44
my @stack = (
45
{
33
- 'rev' => "HEAD",
46
+ 'rev' => defined $starting_rev ? $starting_rev : "HEAD",
47
'filename' => $filename,
48
},
49
);
50
38
-our (@lineoffsets, @pendinglineoffsets);
51
our @filelines = ();
40
-open(F,"<",$filename)
41
- or die "Failed to open filename: $!";
52
43
-while(<F>) {
44
- chomp;
45
- push @filelines, $_;
53
+if (defined $starting_rev) {
54
+ @filelines = git_cat_file($starting_rev, $filename);
55
+} else {
56
+ open(F,"<",$filename)
57
+ or die "Failed to open filename: $!";
58
+
59
+ while(<F>) {
60
+ chomp;
61
+ push @filelines, $_;
62
+ }
63
+ close(F);
64
+
65
}
47
-close(F);
48
-our $leftover_lines = @filelines;
66
+
67
our %revs;
68
our @revqueue;
69
our $head;
@@ -66,7 +84,7 @@ while (my $bound = pop @stack) {
84
next;
85
}
86
69
- if (!$opt_r) {
87
+ if (!$rename) {
88
next;
89
}
90
@@ -78,8 +96,18 @@ while (my $bound = pop @stack) {
96
}
97
}
98
push @revqueue, $head;
81
-init_claim($head);
82
-$revs{$head}{'lineoffsets'} = {};
99
+init_claim( defined $starting_rev ? $starting_rev : 'dirty');
100
+unless (defined $starting_rev) {
101
+ open(DIFF,"-|","git","diff","-R", "HEAD", "--",$filename)
102
+ or die "Failed to call git diff to check for dirty state: $!";
103
+
104
+ _git_diff_parse(*DIFF, $head, "dirty", (
105
+ 'author' => gitvar_name("GIT_AUTHOR_IDENT"),
106
+ 'author_date' => sprintf("%s +0000",time()),
107
+ )
108
+ );
109
+ close(DIFF);
110
+}
111
handle_rev();
112
113
@@ -88,7 +116,7 @@ foreach my $l (@filelines) {
116
my ($output, $rev, $committer, $date);
117
if (ref $l eq 'ARRAY') {
118
($output, $rev, $committer, $date) = @$l;
91
- if (!$opt_l && length($rev) > 8) {
119
+ if (!$longrev && length($rev) > 8) {
120
$rev = substr($rev,0,8);
121
}
122
} else {
@@ -102,7 +130,6 @@ foreach my $l (@filelines) {
130
131
sub init_claim {
132
my ($rev) = @_;
105
- my %revinfo = git_commit_info($rev);
133
for (my $i = 0; $i < @filelines; $i++) {
134
$filelines[$i] = [ $filelines[$i], '', '', '', 1];
135
# line,
@@ -117,7 +144,9 @@ sub init_claim {
144
145
sub handle_rev {
146
my $i = 0;
147
+ my %seen;
148
while (my $rev = shift @revqueue) {
149
+ next if $seen{$rev}++;
150
151
my %revinfo = git_commit_info($rev);
152
@@ -143,8 +172,8 @@ sub handle_rev {
172
sub git_rev_list {
173
my ($rev, $file) = @_;
174
146
- if ($opt_S) {
147
- open(P, '<' . $opt_S);
175
+ if ($rev_file) {
176
+ open(P, '<' . $rev_file);
177
} else {
178
open(P,"-|","git-rev-list","--parents","--remove-empty",$rev,"--",$file)
179
or die "Failed to exec git-rev-list: $!";
@@ -216,24 +245,31 @@ sub git_find_parent {
245
sub git_diff_parse {
246
my ($parent, $rev, %revinfo) = @_;
247
219
- my ($ri, $pi) = (0,0);
248
open(DIFF,"-|","git-diff-tree","-M","-p",$rev,$parent,"--",
249
$revs{$rev}{'filename'}, $revs{$parent}{'filename'})
250
or die "Failed to call git-diff for annotation: $!";
251
252
+ _git_diff_parse(*DIFF, $parent, $rev, %revinfo);
253
+
254
+ close(DIFF);
255
+}
256
+
257
+sub _git_diff_parse {
258
+ my ($diff, $parent, $rev, %revinfo) = @_;
259
+
260
+ my ($ri, $pi) = (0,0);
261
my $slines = $revs{$rev}{'lines'};
262
my @plines;
263
264
my $gotheader = 0;
228
- my ($remstart, $remlength, $addstart, $addlength);
229
- my ($hunk_start, $hunk_index, $hunk_adds);
265
+ my ($remstart);
266
+ my ($hunk_start, $hunk_index);
267
while(<DIFF>) {
268
chomp;
269
if (m/^@@ -(\d+),(\d+) \+(\d+),(\d+)/) {
233
- ($remstart, $remlength, $addstart, $addlength) = ($1, $2, $3, $4);
270
+ $remstart = $1;
271
# Adjust for 0-based arrays
272
$remstart--;
236
- $addstart--;
273
# Reinit hunk tracking.
274
$hunk_start = $remstart;
275
$hunk_index = 0;
@@ -279,7 +315,6 @@ sub git_diff_parse {
315
}
316
$hunk_index++;
317
}
282
- close(DIFF);
318
for (my $i = $ri; $i < @{$slines} ; $i++) {
319
push @plines, $slines->[$ri++];
320
}
@@ -295,13 +330,13 @@ sub get_line {
330
}
331
332
sub git_cat_file {
298
- my ($parent, $filename) = @_;
299
- return () unless defined $parent && defined $filename;
300
- my $blobline = `git-ls-tree $parent $filename`;
301
- my ($mode, $type, $blob, $tfilename) = split(/\s+/, $blobline, 4);
333
+ my ($rev, $filename) = @_;
334
+ return () unless defined $rev && defined $filename;
335
303
- open(C,"-|","git-cat-file", "blob", $blob)
304
- or die "Failed to git-cat-file blob $blob (rev $parent, file $filename): " . $!;
336
+ my $blob = git_ls_tree($rev, $filename);
337
+
338
+ open(C,"-|","git","cat-file", "blob", $blob)
339
+ or die "Failed to git-cat-file blob $blob (rev $rev, file $filename): " . $!;
340
341
my @lines;
342
while(<C>) {
@@ -313,6 +348,25 @@ sub git_cat_file {
348
return @lines;
349
}
350
351
+sub git_ls_tree {
352
+ my ($rev, $filename) = @_;
353
+
354
+ open(T,"-|","git","ls-tree",$rev,$filename)
355
+ or die "Failed to call git ls-tree: $!";
356
+
357
+ my ($mode, $type, $blob, $tfilename);
358
+ while(<T>) {
359
+ ($mode, $type, $blob, $tfilename) = split(/\s+/, $_, 4);
360
+ last if ($tfilename eq $filename);
361
+ }
362
+ close(T);
363
+
364
+ return $blob if $filename eq $filename;
365
+ die "git-ls-tree failed to find blob for $filename";
366
+
367
+}
368
+
369
+
370
371
sub claim_line {
372
my ($floffset, $rev, $lines, %revinfo) = @_;
@@ -354,3 +408,25 @@ sub format_date {
408
return strftime("%Y-%m-%d %H:%M:%S " . $timezone, gmtime($timestamp));
409
}
410
411
+# Copied from git-send-email.perl - We need a Git.pm module..
412
+sub gitvar {
413
+ my ($var) = @_;
414
+ my $fh;
415
+ my $pid = open($fh, '-|');
416
+ die "$!" unless defined $pid;
417
+ if (!$pid) {
418
+ exec('git-var', $var) or die "$!";
419
+ }
420
+ my ($val) = <$fh>;
421
+ close $fh or die "$!";
422
+ chomp($val);
423
+ return $val;
424
+}
425
+
426
+sub gitvar_name {
427
+ my ($name) = @_;
428
+ my $val = gitvar($name);
429
+ my @field = split(/\s+/, $val);
430
+ return join(' ', @field[0...(@field-4)]);
431
+}
432
+