=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 1.8 retrieving revision 1.10 diff -u -p -r1.8 -r1.10 --- cvsweb/cvsweb.cgi 1997/07/01 22:19:57 1.8 +++ cvsweb/cvsweb.cgi 1997/11/14 17:36:47 1.10 @@ -31,7 +31,17 @@ require 'ctime.pl'; $hsty_base = ""; require 'cgi-style.pl'; -$cvsroot = '/home/ncvs'; +%CVSROOT = ( + 'freebsd', '/home/ncvs', + 'openbsd', '/home/OpenBSD/cvs', + 'learn', '/c/learncvs', + ); + +$cvstreedefault = 'freebsd'; +$cvstree = $cvstreedefault; +$cvsroot = $CVSROOT{"$cvstree"} || "/home/ncvs"; + + $intro = " This is a WWW interface to the FreeBSD CVS tree. You can browse the file hierarchy by picking directories @@ -49,7 +59,7 @@ CVS tree, see .

Please send any suggestions, comments, etc. to -Bill Fenner <fenner@freebsd.org> +Bill Fenner <fenner\@freebsd.org> "; $shortinstr = " Click on a directory to enter that directory. Click on a file to display @@ -60,18 +70,14 @@ chance to display diffs between revisions. $verbose = $v; ($where = $ENV{'PATH_INFO'}) =~ s|^/||; $where =~ s|/$||; -$fullname = $cvsroot . '/' . $where; ($scriptname = $ENV{'SCRIPT_NAME'}) =~ s|^/?|/|; $scriptname =~ s|/$||; $scriptwhere = $scriptname . '/' . $where; $scriptwhere =~ s|/$||; -if (!-d $cvsroot) { - &fatal("500 Internal Error",'$CVSROOT not found!'); -} -if ($q = $ENV{'QUERY_STRING'}) { - foreach (split(/&/, $q)) { +if ($query = $ENV{'QUERY_STRING'}) { + foreach (split(/&/, $query)) { s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted if (/(\S+)=(.*)/) { $input{$1} = $2; @@ -79,7 +85,24 @@ if ($q = $ENV{'QUERY_STRING'}) { $input{$_}++; } } + $query = "?" . $query; } + + + +if ($input{'cvsroot'}) { + if ($CVSROOT{$input{'cvsroot'}}) { + $cvstree = $input{'cvsroot'}; + $cvsroot = $CVSROOT{"$cvstree"}; + } +} + +$fullname = $cvsroot . '/' . $where; +if (!-d $cvsroot) { + &fatal("500 Internal Error",'$CVSROOT not found!'); +} + + if (-d $fullname) { opendir(DIR, $fullname) || &fatal("404 Not Found","$where: $!"); @dir = readdir(DIR); @@ -97,27 +120,68 @@ if (-d $fullname) { # provides the results that I want in most browsers. Another # case of layout spooging up HTML. print "

\n"; - foreach (sort @dir) { + lookingforattic: + for ($i = 0; $i <= $#dir; $i++) { + if ($dir[$i] eq "Attic") { + last lookingforattic; + } + } + if (!$input{"showattic"} && ($i <= $#dir) && + opendir(DIR, $fullname . "/Attic")) { + splice(@dir, $i, 1, + grep((s|^|Attic/|,!m|/\.|), readdir(DIR))); + closedir(DIR); + } + # Sort without the Attic/ pathname. + foreach (sort {($c=$a)=~s|.*/||;($d=$b)=~s|.*/||;($c cmp $d)} @dir) { if ($_ eq '.') { next; } + if (s|^Attic/||) { + $attic = " (in the Attic)"; + } else { + $attic = ""; + } if ($_ eq '..') { next if ($where eq ''); ($updir = $scriptwhere) =~ s|[^/]+$||; print " ", - &link("Previous Directory",$updir), "
"; + &link("Previous Directory",$updir . $query), "
"; # print " ", # &link("Directory-wide diffs", $scriptwhere . '/*'), "
"; } elsif (-d $fullname . "/" . $_) { print " ", - &link($_ . "/", $scriptwhere . '/' . $_ . '/'), "
"; + &link($_ . "/", $scriptwhere . '/' . $_ . '/' . $query), $attic, "
"; } elsif (s/,v$//) { # TODO: add date/time? How about sorting? print " ", - &link($_, $scriptwhere . '/' . $_), "
"; + &link($_, $scriptwhere . '/' . + ($attic ? "Attic/" : "") . $_ . $query), + $attic, "
"; } } print "\n"; + if ($input{"only_on_branch"}) { + print "
\n"; + print "Currently showing only branch $input{'only_on_branch'}.\n"; + $input{"only_on_branch"}=""; + foreach $k (keys %input) { + print "\n" if $input{$k}; + } + print "\n"; + print "
\n"; + } + $formwhere = $scriptwhere; + $formwhere =~ s|Attic/?$|| if ($input{"showattic"}); + print "
\n"; + $input{"showattic"}=!$input{"showattic"}; + foreach $k (keys %input) { + print "\n" if $input{$k}; + } + print "\n"; + print "
\n"; print &html_footer; print "\n"; } elsif (-f $fullname . ',v') { @@ -178,7 +242,7 @@ if (-d $fullname) { } $_ = ; print "D:", $_ if ($verbose); - if (m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+author:\s+(\S+);|) { + if (m|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+author:\s+(\S+);\s+state:\s+(\S+);|) { $yr = $1; # damn 2-digit year routines if ($yr > 100) { @@ -186,6 +250,7 @@ if (-d $fullname) { } $date{$rev} = &timelocal($6,$5,$4,$3,$2 - 1,$yr); $author{$rev} = $7; + $state{$rev} = $8; } else { &fatal("500 Internal Error", "Error parsing RCS output: $_"); } @@ -266,8 +331,8 @@ if (-d $fullname) { } print "Done associating revisions with branches\n" if ($verbose); print &html_header("CVS log for $where"); - ($upwhere = $where) =~ s|[^/]+$||; - print "Up to ", &link($upwhere,$scriptname . "/" . $upwhere); + ($upwhere = $where) =~ s|(Attic/)?[^/]+$||; + print "Up to ", &link($upwhere,$scriptname . "/" . $upwhere . $query); print "
\n"; print "Request diff between arbitrary revisions\n"; print "
\n"; @@ -301,7 +366,8 @@ if (-d $fullname) { $nameprinted{$br}++; } print "\n"; - print "$_"; + print "$_}; if (/^1\.1\.1\.\d+$/) { print " (vendor branch)"; } @@ -344,7 +410,7 @@ if (-d $fullname) { if ($prevrev[$#prevrev] != 0) { $prev = join(".", @prevrev); print "
Diffs to $prev\n"; + print "&r2=$_" . &cvsroot . qq{">Diffs to $prev\n}; # # Plus, if it's on a branch, and it's not a vendor branch, # offer to diff with the immediately-preceding commit if it @@ -358,10 +424,14 @@ if (-d $fullname) { @tmp2 = split(/\./, $_); if ($#tmp1 < $#tmp2) { print "; Diffs to $revorder[$i+1]\n"; + print "&r2=$_" . &cvsroot . + qq{">Diffs to $revorder[$i+1]\n}; } } } + if ($state{$_} eq "dead") { + print "
FILE REMOVED\n"; + } print "
\n";
 	    print &htmlify($log{$_}, 1);
 	    print "
\n"; @@ -373,6 +443,8 @@ if (-d $fullname) { print "name using the type-in text box.\n"; print "

\n"; print "

\n"; + print qq{\n} + if &cvsroot; print "Diffs between \n"; print "\n} + if &cvsroot; print "Branch: \n"; print "\n"; print "\n"; @@ -408,9 +487,20 @@ if (-d $fullname) { print "\n"; } elsif ($fullname =~ s/\.diff$// && -f $fullname . ",v" && $input{'r1'} && $input{'r2'}) { + # Allow diffs using the ".diff" extension + # so that browsers that default to the URL + # for a save filename don't save diff's as + # e.g. foo.c &dodiff($fullname, $input{'r1'}, $input{'tr1'}, $input{'r2'}, $input{'tr2'}, $input{'f'}); exit; +} elsif (($newname = $fullname) =~ s|/([^/]+)$|/Attic/$1| && + -f $newname . ",v") { + # The file has been removed and is in the Attic. + # Send a redirect pointing to the file in the Attic. + ($newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|; + &redirect($newplace); + exit; } elsif (0 && (@files = &safeglob($fullname . ",v"))) { print "Content-type: text/plain\n\n"; print "You matched the following files:\n"; @@ -641,4 +731,9 @@ sub dodiff { print $_; } close(RCSDIFF); +} + +sub cvsroot { + return '' if $cvstree eq $cvstreedefault; + return "&cvsroot=" . $cvstree; }