[Lxr-commits] CVS: lxr/lib/LXR/Files CVS.pm, 1.35, 1.36 BK.pm, 1.4, 1.5 Plain.pm, 1.25, 1.26 GIT.pm
Brought to you by:
ajlittoz
Menu
▾
▴
[Lxr-commits] CVS: lxr/lib/LXR/Files CVS.pm, 1.35, 1.36 BK.pm, 1.4, 1.5 Plain.pm, 1.25, 1.26 GIT.pm, 1.3, 1.4
|
From: AdrianIssott <adr...@us...> - 2009-05-10 11:54:36
|
Update of /cvsroot/lxr/lxr/lib/LXR/Files In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3821/lib/LXR/Files Modified Files: CVS.pm BK.pm Plain.pm GIT.pm Log Message: Feature 1691378 (Rearchitect the DB backends) Part X * Renamed lxr_release.rel -> releaseid for Mysql * Renamed lxr_release.release -> releaseid for Oracle and Postgres * Renamed $release -> $releaseid generally Index: CVS.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/CVS.pm,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- CVS.pm 24 Mar 2009 20:04:23 -0000 1.35 +++ CVS.pm 10 May 2009 11:54:29 -0000 1.36 @@ -52,26 +52,26 @@ } sub filerev { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; - if ($release =~ /rev_([\d\.]+)/) { + if ($releaseid =~ /rev_([\d\.]+)/) { return $1; - } elsif ($release =~ /^([\d\.]+)$/) { + } elsif ($releaseid =~ /^([\d\.]+)$/) { return $1; } else { $self->parsecvs($filename); - return $cvs{'header'}{'symbols'}{$release}; + return $cvs{'header'}{'symbols'}{$releaseid}; } } sub getfiletime { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; - return undef if $self->isdir($filename, $release); + return undef if $self->isdir($filename, $releaseid); $self->parsecvs($filename); - my $rev = $self->filerev($filename, $release); + my $rev = $self->filerev($filename, $releaseid); return undef unless defined($rev); @@ -84,31 +84,31 @@ } sub getfilesize { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; - return length($self->getfile($filename, $release)); + return length($self->getfile($filename, $releaseid)); } sub getfile { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; - my $fileh = $self->getfilehandle($filename, $release); + my $fileh = $self->getfilehandle($filename, $releaseid); return undef unless $fileh; return join('', $fileh->getlines); } sub getannotations { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; $self->parsecvs($filename); - my $rev = $self->filerev($filename, $release); + my $rev = $self->filerev($filename, $releaseid); return () unless defined($rev); my $hrev = $cvs{'header'}{'head'}; my $lrev; my @anno; - my $headfh = $self->getfilehandle($filename, $release); + my $headfh = $self->getfilehandle($filename, $releaseid); my @head = $headfh->getlines; while (1) { @@ -156,19 +156,19 @@ } sub getfilehandle { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; my ($fileh); $self->parsecvs($filename); - my $rev = $self->filerev($filename, $release); + my $rev = $self->filerev($filename, $releaseid); return undef unless defined($rev); - return undef unless defined($self->toreal($filename, $release)); + return undef unless defined($self->toreal($filename, $releaseid)); $rev =~ /([\d\.]*)/; $rev = $1; # untaint - my $clean_filename = $self->cleanstring($self->toreal($filename, $release)); + my $clean_filename = $self->cleanstring($self->toreal($filename, $releaseid)); $clean_filename =~ /(.*)/; $clean_filename = $1; # technically untaint here (cleanstring did the real untainting) @@ -211,10 +211,10 @@ } sub tmpfile { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; my ($tmp, $buf); - $buf = $self->getfile($filename, $release); + $buf = $self->getfile($filename, $releaseid); return undef unless defined($buf); $tmp = $config->tmpdir . '/lxrtmp.' . time . '.' . $$ . '.' . &LXR::Common::tmpcounter; @@ -226,10 +226,10 @@ } sub dirempty { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; my ($node, @dirs, @files); my $DIRH = new IO::Handle; - my $real = $self->toreal($pathname, $release); + my $real = $self->toreal($pathname, $releaseid); opendir($DIRH, $real) || return 1; while (defined($node = readdir($DIRH))) { @@ -245,20 +245,20 @@ closedir($DIRH); foreach $node (@files) { - return 0 if $self->filerev($pathname . $node, $release); + return 0 if $self->filerev($pathname . $node, $releaseid); } foreach $node (@dirs) { - return 0 unless $self->dirempty($pathname . $node, $release); + return 0 unless $self->dirempty($pathname . $node, $releaseid); } return 1; } sub getdir { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; my ($node, @dirs, @files); my $DIRH = new IO::Handle; - my $real = $self->toreal($pathname, $release); + my $real = $self->toreal($pathname, $releaseid); opendir($DIRH, $real) || return (); FILE: while (defined($node = readdir($DIRH))) { @@ -269,11 +269,11 @@ next FILE if $node eq $ignoredir; } if ($node eq 'Attic') { - push(@files, $self->getdir($pathname . $node . '/', $release)); + push(@files, $self->getdir($pathname . $node . '/', $releaseid)); } else { push(@dirs, $node . '/') - unless defined($release) - && $self->dirempty($pathname . $node . '/', $release); + unless defined($releaseid) + && $self->dirempty($pathname . $node . '/', $releaseid); } } elsif ($node =~ /(.*),v$/) { if (!$$LXR::Common::HTTP{'param'}{'showattic'}) { @@ -281,14 +281,14 @@ # you can't just check for 'Attic' because for certain versions the file is alive even if in Attic $self->parsecvs($pathname . substr($node, 0, length($node) - 2)) ; # substr is to remove the ',v' - my $rev = $cvs{'header'}{'symbols'}{$release}; + my $rev = $cvs{'header'}{'symbols'}{$releaseid}; if ($cvs{'branch'}{$rev}{'state'} eq "dead") { next; } } push(@files, $1) - if !defined($release) - || $self->getfiletime($pathname . $1, $release); + if !defined($releaseid) + || $self->getfiletime($pathname . $1, $releaseid); } } closedir($DIRH); @@ -297,7 +297,7 @@ } sub toreal { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; my $real = $self->{'rootpath'} . $pathname; # nearly all (if not all) method calls eventually call toreal(), so this is a good place to block file access @@ -311,7 +311,7 @@ # you can't just check for 'Attic' because for certain versions the file is alive even if in Attic $self->parsecvs($pathname); - my $rev = $cvs{'header'}{'symbols'}{$release}; + my $rev = $cvs{'header'}{'symbols'}{$releaseid}; if ($cvs{'branch'}{$rev}{'state'} eq "dead") { return undef; } @@ -345,21 +345,21 @@ } sub isdir { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; - return -d $self->toreal($pathname, $release); + return -d $self->toreal($pathname, $releaseid); } sub isfile { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; - return -f $self->toreal($pathname, $release); + return -f $self->toreal($pathname, $releaseid); } sub getindex { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; - my $index = $self->getfile($pathname, $release); + my $index = $self->getfile($pathname, $releaseid); return $index =~ /\n(\S*)\s*\n\t-\s*([^\n]*)/gs; } Index: BK.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/BK.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- BK.pm 20 Dec 2006 19:49:29 -0000 1.4 +++ BK.pm 10 May 2009 11:54:29 -0000 1.5 @@ -50,21 +50,21 @@ # sub getdir { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; - $self->fill_cache($release); + $self->fill_cache($releaseid); $pathname = canonise($pathname); $pathname = File::Spec->rootdir() if $pathname eq ''; - my @nodes = keys %{ $tree_cache{$release}->{$pathname} }; + my @nodes = keys %{ $tree_cache{$releaseid}->{$pathname} }; my @dirs = grep m!/$!, @nodes; my @files = grep !m!/$!, @nodes; return (sort(@dirs), sort(@files)); } sub getfile { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; $pathname = canonise($pathname); - my $fileh = $self->getfilehandle($pathname, $release); + my $fileh = $self->getfilehandle($pathname, $releaseid); return undef unless $fileh; my $buffer = join('', $fileh->getlines); @@ -73,11 +73,11 @@ } sub getfilehandle { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; $pathname = canonise($pathname); my $fileh = undef; - if ($self->file_exists($pathname, $release)) { - my $info = $self->getfileinfo($pathname, $release); + if ($self->file_exists($pathname, $releaseid)) { + my $info = $self->getfileinfo($pathname, $releaseid); my $ver = $info->{'revision'}; my $where = $info->{'curpath'}; $fileh = $self->openbkcommand("bk get -p -r$ver $where 2>/dev/null |"); @@ -86,16 +86,16 @@ } sub filerev { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; - my $info = $self->getfileinfo($filename, $release); + my $info = $self->getfileinfo($filename, $releaseid); return sha1_hex($info->{'curpath'} . '-' . $info->{'revision'}); } sub getfiletime { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; - my $info = $self->getfileinfo($pathname, $release); + my $info = $self->getfileinfo($pathname, $releaseid); return undef if !defined $info; if (!defined($info->{'filetime'})) { @@ -112,22 +112,22 @@ } sub getfilesize { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; - my $info = $self->getfileinfo($pathname, $release); + my $info = $self->getfileinfo($pathname, $releaseid); return undef if !defined($info); if (!defined($info->{'filesize'})) { - $info->{'filesize'} = length($self->getfile($pathname, $release)); + $info->{'filesize'} = length($self->getfile($pathname, $releaseid)); } return $info->{'filesize'}; } sub getauthor { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; - my $info = $self->getfileinfo($pathname, $release); + my $info = $self->getfileinfo($pathname, $releaseid); return undef if !defined $info; if (!defined($info->{'author'})) { @@ -158,24 +158,24 @@ } sub isdir { - my ($self, $pathname, $release) = @_; - $self->fill_cache($release); + my ($self, $pathname, $releaseid) = @_; + $self->fill_cache($releaseid); $pathname = canonise($pathname); - my $info = $tree_cache{$release}{$pathname}; + my $info = $tree_cache{$releaseid}{$pathname}; return (defined($info)); } sub isfile { - my ($self, $pathname, $release) = @_; - my $info = $self->getfileinfo($pathname, $release); + my ($self, $pathname, $releaseid) = @_; + my $info = $self->getfileinfo($pathname, $releaseid); return (defined($info)); } sub tmpfile { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; my ($tmp, $buf); - $buf = $self->getfile($filename, $release); + $buf = $self->getfile($filename, $releaseid); return undef unless defined($buf); $tmp = @@ -202,12 +202,12 @@ } sub fill_cache { - my ($self, $release) = @_; + my ($self, $releaseid) = @_; - return if (defined $tree_cache{$release}); + return if (defined $tree_cache{$releaseid}); # Not in cache, so need to build - my @all_entries = $self->get_tree($release); + my @all_entries = $self->get_tree($releaseid); $memcachecount++; my %newtree = (); @@ -233,32 +233,32 @@ $newtree{ File::Spec->rootdir() } = $newtree{''}; delete $newtree{''}; - $tree_cache{$release} = \%newtree; + $tree_cache{$releaseid} = \%newtree; } sub get_tree { - my ($self, $release) = @_; + my ($self, $releaseid) = @_; # Return entire tree as provided by 'bk rset' # First, check if cache exists my $fileh = new IO::File; - if (-r $self->cachename($release)) { - $fileh->open($self->cachename($release)) or die "Whoops, can't open cached version"; + if (-r $self->cachename($releaseid)) { + $fileh->open($self->cachename($releaseid)) or die "Whoops, can't open cached version"; } else { # This command provide 3 part output - the current filename, the historical filename & the revision - $fileh = $self->openbkcommand("bk rset -h -l$release 2>/dev/null |"); + $fileh = $self->openbkcommand("bk rset -h -l$releaseid 2>/dev/null |"); my $line_to_junk = <$fileh>; # Remove the Changelist|Changelist line at start # Now create the cached copy if we can - if(open(CACHE, ">", $self->cachename($release))) { + if(open(CACHE, ">", $self->cachename($releaseid))) { $diskcachecount++; my @data = <$fileh>; close $fileh; print CACHE @data; close CACHE; $fileh = new IO::File; - $fileh->open($self->cachename($release)) or die "Couldn't open cached version!"; + $fileh->open($self->cachename($releaseid)) or die "Couldn't open cached version!"; } } @@ -273,8 +273,8 @@ } sub cachename { - my ($self, $release) = @_; - return $self->{'cache'}."/treecache-".$release; + my ($self, $releaseid) = @_; + return $self->{'cache'}."/treecache-".$releaseid; } sub canonise { @@ -285,21 +285,21 @@ # Check that the specified pathname, version combination exists in repository sub file_exists { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; # Look the file up in the treecache - return defined($self->getfileinfo($pathname, $release)); + return defined($self->getfileinfo($pathname, $releaseid)); } sub getfileinfo { - my ($self, $pathname, $release) = @_; - $self->fill_cache($release); # Normally expect this to be present anyway + my ($self, $pathname, $releaseid) = @_; + $self->fill_cache($releaseid); # Normally expect this to be present anyway $pathname = canonise($pathname); my ($vol, $path, $file) = File::Spec->splitpath($pathname); $path = File::Spec->rootdir() if $path eq ''; - return $tree_cache{$release}{$path}{$file}; + return $tree_cache{$releaseid}{$path}{$file}; } 1; Index: Plain.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/Plain.pm,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- Plain.pm 2 Nov 2005 23:39:55 -0000 1.25 +++ Plain.pm 10 May 2009 11:54:29 -0000 1.26 @@ -35,52 +35,52 @@ } sub filerev { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; - # return $release; + # return $releaseid; return - join("-", $self->getfiletime($filename, $release), $self->getfilesize($filename, $release)); + join("-", $self->getfiletime($filename, $releaseid), $self->getfilesize($filename, $releaseid)); } sub getfiletime { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; - return (stat($self->toreal($filename, $release)))[9]; + return (stat($self->toreal($filename, $releaseid)))[9]; } sub getfilesize { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; - return -s $self->toreal($filename, $release); + return -s $self->toreal($filename, $releaseid); } sub getfile { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; my ($buffer); local ($/) = undef; - open(FILE, "<", $self->toreal($filename, $release)) || return undef; + open(FILE, "<", $self->toreal($filename, $releaseid)) || return undef; $buffer = <FILE>; close(FILE); return $buffer; } sub getfilehandle { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; my ($fileh); - $fileh = new FileHandle($self->toreal($filename, $release)); + $fileh = new FileHandle($self->toreal($filename, $releaseid)); return $fileh; } sub tmpfile { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; my ($tmp, $tries); local ($/) = undef; $tmp = $config->tmpdir . '/lxrtmp.' . time . '.' . $$ . '.' . &LXR::Common::tmpcounter; open(TMP, "> $tmp") || return undef; - open(FILE, "<", $self->toreal($filename, $release)) || return undef; + open(FILE, "<", $self->toreal($filename, $releaseid)) || return undef; print(TMP <FILE>); close(FILE); close(TMP); @@ -97,14 +97,14 @@ } sub getdir { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; my ($dir, $node, @dirs, @files); if($pathname !~ m!/$!) { $pathname = $pathname . '/'; } - $dir = $self->toreal($pathname, $release); + $dir = $self->toreal($pathname, $releaseid); opendir(DIR, $dir) || return (); FILE: while (defined($node = readdir(DIR))) { next if $node =~ /^\.|~$|\.orig$/; @@ -130,32 +130,32 @@ # other possible File classes.) sub toreal { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; # nearly all (if not all) method calls eventually call toreal(), so this is a good place to block file access foreach my $ignoredir ($config->ignoredirs) { return undef if $pathname =~ m|/$ignoredir/|; } - return ($self->{'rootpath'} . $release . $pathname); + return ($self->{'rootpath'} . $releaseid . $pathname); } sub isdir { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; - return -d $self->toreal($pathname, $release); + return -d $self->toreal($pathname, $releaseid); } sub isfile { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; - return -f $self->toreal($pathname, $release); + return -f $self->toreal($pathname, $releaseid); } sub getindex { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; my ($index, %index); - my $indexname = $self->toreal($pathname, $release) . "00-INDEX"; + my $indexname = $self->toreal($pathname, $releaseid) . "00-INDEX"; if (-f $indexname) { open(INDEX, "<", $indexname) Index: GIT.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/GIT.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GIT.pm 21 Dec 2006 09:33:36 -0000 1.3 +++ GIT.pm 10 May 2009 11:54:29 -0000 1.4 @@ -47,39 +47,39 @@ } sub isdir { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; $pathname =~ s/^\///; if ($pathname eq "") { return 1 == 1; } else { my $repo = Git->repository (Directory => "$self->{'rootpath'}"); - my $line = $repo->command_oneline ("ls-tree", "$release", "$pathname"); + my $line = $repo->command_oneline ("ls-tree", "$releaseid", "$pathname"); return $line =~ m/^\d+ tree .*$/; } } sub isfile { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; $pathname =~ s/^\///; if ($pathname eq "") { return 1 == 0; } else { my $repo = Git->repository (Directory => "$self->{'rootpath'}"); - my $line = $repo->command_oneline ("ls-tree", "$release", "$pathname"); + my $line = $repo->command_oneline ("ls-tree", "$releaseid", "$pathname"); return $line =~ m/^\d+ blob .*$/; } } sub getdir { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; my ($dir, $node, @dirs, @files); my $repo = Git->repository (Directory => "$self->{'rootpath'}"); $pathname =~ s/^\///; - my ($fh, $c) = $repo->command_output_pipe ("ls-tree", "$release", "$pathname"); + my ($fh, $c) = $repo->command_output_pipe ("ls-tree", "$releaseid", "$pathname"); while (<$fh>) { if (m/(\d+) (\w+) ([[:xdigit:]]+)\t(.*)/) { my ($entrymode, $entrytype, $objectid, $entryname) = ($1, $2, $3, $4); @@ -111,12 +111,12 @@ } sub getfilesize { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; my $repo = Git->repository (Directory => "$self->{'rootpath'}"); $filename =~ s/^\///; - my $sha1hashline = $repo->command_oneline ("ls-tree", "$release", "$filename"); + my $sha1hashline = $repo->command_oneline ("ls-tree", "$releaseid", "$filename"); if ($sha1hashline =~ m/\d+ blob ([[:xdigit:]]+)\t.*/) { return $repo->command_oneline ("cat-file", "-s", "$1"); @@ -126,12 +126,12 @@ } sub tmpfile { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; my ($tmp, $fileh); $tmp = $config->tmpdir . '/lxrtmp.' . time . '.' . $$ . '.' . &LXR::Common::tmpcounter; open (TMP, "> $tmp") || return undef; - $fileh = $self->getfilehandle ($filename, $release); + $fileh = $self->getfilehandle ($filename, $releaseid); print (TMP <$fileh>); close ($fileh); close (TMP); @@ -140,12 +140,12 @@ } sub filerev { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; my $repo = Git->repository (Directory => "$self->{'rootpath'}"); $filename =~ s/^\///; - my $sha1hashline = $repo->command_oneline ("ls-tree", "$release", "$filename"); + my $sha1hashline = $repo->command_oneline ("ls-tree", "$releaseid", "$filename"); if ($sha1hashline =~ m/\d+ blob ([[:xdigit:]]+)\t.*/) { return $1; @@ -155,7 +155,7 @@ } sub getfiletime { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; $filename =~ s/^\///; @@ -167,7 +167,7 @@ } my $repo = Git->repository (Directory => "$self->{'rootpath'}"); - my $lastcommitline = $repo->command_oneline ("log", "--max-count=1", "--pretty=oneline", "$release", "--", "$filename"); + my $lastcommitline = $repo->command_oneline ("log", "--max-count=1", "--pretty=oneline", "$releaseid", "--", "$filename"); if ($lastcommitline =~ m/([[:xdigit:]]+) /) { my $commithash = $1; @@ -184,12 +184,12 @@ } sub getfilehandle { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; my $repo = Git->repository (Directory => "$self->{'rootpath'}"); $filename =~ s/^\///; - my $sha1hashline = $repo->command_oneline ("ls-tree", "$release", "$filename"); + my $sha1hashline = $repo->command_oneline ("ls-tree", "$releaseid", "$filename"); if ($sha1hashline =~ m/^\d+ blob ([[:xdigit:]]+)\t.*/) { my ($fh, $c) = $repo->command_output_pipe ("cat-file", "blob", "$1"); @@ -200,14 +200,14 @@ } sub getannotations { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; if ($self->{'do_annotations'}) { my $repo = Git->repository (Directory => "$self->{'rootpath'}"); my @revlist = (); $filename =~ s/^\///; - my (@lines, $c) = $repo->command ("blame", "-l", "$release", "--", "$filename"); + my (@lines, $c) = $repo->command ("blame", "-l", "$releaseid", "--", "$filename"); foreach my $line (@lines) { if ($line =~ m/^([[:xdigit:]]+) .*/) { @@ -224,10 +224,10 @@ } sub getauthor { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; # - # Note that $release is a real commit this time + # Note that $releaseid is a real commit this time # (returned by getannotations() above). This is # _not_ a tag name! # @@ -238,7 +238,7 @@ $pathname =~ s/^\///; - my (@lines, $c) = $repo->command ("cat-file", "commit", "$release"); + my (@lines, $c) = $repo->command ("cat-file", "commit", "$releaseid"); foreach my $line (@lines) { if ($line =~ m/^author (.*) </) { return $1 |
