=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 1.1.1.12 retrieving revision 1.1.1.13 diff -u -p -r1.1.1.12 -r1.1.1.13 --- cvsweb/cvsweb.cgi 2000/11/04 19:19:48 1.1.1.12 +++ cvsweb/cvsweb.cgi 2000/12/07 12:45:50 1.1.1.13 @@ -43,7 +43,7 @@ # SUCH DAMAGE. # # $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $ -# $kId: cvsweb.cgi,v 1.39 2000/11/04 15:32:17 knu Exp $ +# $kId: cvsweb.cgi,v 1.41 2000/12/06 18:19:12 knu Exp $ # ### @@ -63,10 +63,10 @@ use vars qw ( $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased %input $query $barequery $sortby $bydate $byrev $byauthor $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot - $mimetype $defaultTextPlain $defaultViewable $allow_compress - $GZIPBIN $backicon $diricon $fileicon $fullname $newname - $cvstreedefault $body_tag $body_tag_for_src - $logo $defaulttitle $address + $mimetype $charset $defaultTextPlain $defaultViewable + $allow_compress $GZIPBIN $backicon $diricon $fileicon + $fullname $newname $cvstreedefault + $body_tag $body_tag_for_src $logo $defaulttitle $address $long_intro $short_instruction $shortLogLen $show_author $dirtable $tablepadding $columnHeaderColorDefault $columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite @@ -1489,6 +1489,11 @@ sub doCheckout($$) { open(STDERR, ">&STDOUT"); # Redirect stderr to stdout exec("cvs", "-Rld", $cvsroot, "co", "-p", $revopt, $where); } + + if (eof($fh)) { + &fatal("404 Not Found", + "$where is not (any longer) pertinent"); + } #=================================================================== #Checking out squid/src/ftp.c #RCS: /usr/src/CVS/squid/src/ftp.c,v @@ -1508,12 +1513,7 @@ sub doCheckout($$) { } if ($filename ne $where) { &fatal("500 Internal Error", - "Unexpected output from cvs co: $cvsheader" - . "
Check whether the directory $cvsroot/CVSROOT exists "
- . "and the script has write-access to the CVSROOT/history "
- . "file if it exists."
- . "
The script needs to place lock files in the "
- . "directory the file is in as well.");
+ "Unexpected output from cvs co: $cvsheader");
}
$| = 1;
@@ -1780,55 +1780,59 @@ sub getDirLogs($$@) {
again:
if ($state eq "head") {
#$rcsfile = $1 if (/^RCS file: (.+)$/); #not used (yet)
- $filename = $1 if (/^Working file: (.+)$/);
- $head = $1 if (/^head: (.+)$/);
- $branch = $1 if (/^branch: (.+)$/);
- }
- if ($state eq "head" && /^symbolic names/) {
- $state = "tags";
- ($branch = $head) =~ s/\.\d+$// if (!defined($branch));
- $branch =~ s/(\.?)(\d+)$/${1}0.$2/;
- $symrev{MAIN} = $branch;
- $symrev{HEAD} = $branch;
- $alltags{MAIN} = 1;
- $alltags{HEAD} = 1;
- push (@filetags, "MAIN", "HEAD");
+
+ if (/^Working file: (.+)$/) {
+ $filename = $1;
+ } elsif (/^head: (.+)$/) {
+ $head = $1;
+ } elsif (/^branch: (.+)$/) {
+ $branch = $1
+ } elsif (/^symbolic names:/) {
+ $state = "tags";
+ ($branch = $head) =~ s/\.\d+$// if (!defined($branch));
+ $branch =~ s/(\.?)(\d+)$/${1}0.$2/;
+ $symrev{MAIN} = $branch;
+ $symrev{HEAD} = $branch;
+ $alltags{MAIN} = 1;
+ $alltags{HEAD} = 1;
+ push (@filetags, "MAIN", "HEAD");
+ } elsif (/$LOG_REVSEPARATOR/o) {
+ $state = "log";
+ $rev = undef;
+ $date = undef;
+ $log = "";
+ # Try to reconstruct the relative filename if RCS spits out a full path
+ $filename =~ s%^\Q$DirName\E/%%;
+ }
next;
}
- if ($state eq "tags" &&
- /^\s+(.+):\s+([\d\.]+)\s+$/) {
- push (@filetags, $1);
- $symrev{$1} = $2;
- $alltags{$1} = 1;
- next;
- }
- if ($state eq "tags" && /^\S/) {
- if (defined($tag) && (defined($symrev{$tag}) || $tag eq "HEAD")) {
- $revwanted = $tag eq "HEAD" ? $symrev{"MAIN"} : $symrev{$tag};
- ($branch = $revwanted) =~ s/\.0\././;
- ($branchpoint = $branch) =~ s/\.?\d+$//;
- $revwanted = undef if ($revwanted ne $branch);
- }
- elsif (defined($tag) && $tag ne "HEAD") {
- print "Tag not found, skip this file" if ($verbose);
- $state = "skip";
+ if ($state eq "tags") {
+ if (/^\s+(.+):\s+([\d\.]+)\s+$/) {
+ push (@filetags, $1);
+ $symrev{$1} = $2;
+ $alltags{$1} = 1;
next;
+ } elsif (/^\S/) {
+ if (defined($tag)) {
+ if(defined($symrev{$tag}) || $tag eq "HEAD") {
+ $revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag};
+ ($branch = $revwanted) =~ s/\.0\././;
+ ($branchpoint = $branch) =~ s/\.?\d+$//;
+ $revwanted = undef if ($revwanted ne $branch);
+#print "\n[revwanted=$revwanted]";
+ } elsif ($tag ne "HEAD") {
+ print "Tag not found, skip this file" if ($verbose);
+ $state = "skip";
+ next;
+ }
+ }
+ foreach my $tagfound (@filetags) {
+ $tags{$tagfound} = 1;
+ }
+ $state = "head";
+ goto again;
}
- foreach my $tagfound (@filetags) {
- $tags{$tagfound} = 1;
- }
- $state = "head";
- goto again;
}
- if ($state eq "head" && /$LOG_REVSEPARATOR/o) {
- $state = "log";
- $rev = undef;
- $date = undef;
- $log = "";
- # Try to reconstruct the relative filename if RCS spits out a full path
- $filename =~ s%^\Q$DirName\E/%%;
- next;
- }
if ($state eq "log") {
if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) {
# End of a log entry.
@@ -2012,11 +2016,10 @@ sub readLog($;$) {
# This is not neccesary the same revision as marked as head in the RCS file.
my $headrev = $curbranch || "1";
($symrev{"MAIN"} = $headrev) =~ s/(\.?)(\d+)$/${1}0.$2/;
- revision:
foreach $rev (@revorder) {
if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {
$symrev{"HEAD"} = $rev;
- last revision;
+ last;
}
}
($symrev{"HEAD"} = $headrev) =~ s/\.\d+$//
@@ -2056,14 +2059,13 @@ sub readLog($;$) {
$branch = $3;
$branchrev = $head . ($head ne "" ? "." : "") . $branch;
my $regex;
- ($regex = $branchrev) =~ s/\./\\./g;
+ $regex = quotemeta $branchrev;
$rev = $head;
- revision:
foreach my $r (@revorder) {
if ($r =~ /^${regex}\b/) {
$rev = $branchrev;
- last revision;
+ last;
}
}
next if ($rev eq "");
@@ -2640,7 +2642,7 @@ sub navigateHeader($$$$$) {
$swhere = urlencode($filename) if ($swhere eq "");
print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
print "\n