cvsweb/cvsweb.cgi - diff

Return to cvsweb.cgi CVS log

Up to [cvsweb.bsd.lv] / cvsweb

Diff for /cvsweb/cvsweb.cgi between version 1.1.1.12 and 1.1.1.15

version 1.1.1.12, 2000/11/04 19:19:48

version 1.1.1.15, 2000/12/18 04:35:54

Line 43

# 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.45 2000/12/18 04:25:30 knu Exp $

###

Line 63 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

$mimetype $charset $defaultTextPlain $defaultViewable

$GZIPBIN $backicon $diricon $fileicon $fullname $newname

$allow_compress $GZIPBIN $backicon $diricon $fileicon

$cvstreedefault $body_tag $body_tag_for_src

$fullname $newname $cvstreedefault

$logo $defaulttitle $address

$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

Line 244 $is_mod_perl = defined($ENV{MOD_PERL});

# in lynx, it it very annoying to have two links

# per file, so disable the link at the icon

# in this case:

$Browser = $ENV{HTTP_USER_AGENT};

$Browser = $ENV{HTTP_USER_AGENT} || '';

$is_links = ($Browser =~ m`^Links `);

$is_lynx = ($Browser =~ m`^Lynx/`i);

$is_w3m = ($Browser =~ m`^w3m/`i);

Line 909 elsif (-d $fullname) {

my $fh = do {local(*FH);};

my ($xtra, $module);

# Assume it's a module name with a potential path following it.

$xtra = $& if (($module = $where) =~ s|/.*||);

$xtra = (($module = $where) =~ s|/.*||) ? $& : '';

# Is there an indexed version of modules?

if (open($fh, "$cvsroot/CVSROOT/modules")) {

while (<$fh>) {

if (/^(\S+)\s+(\S+)/o && $module eq $1

&& -d "${cvsroot}/$2" && $module ne $2) {

&& -d "$cvsroot/$2" && $module ne $2) {

&redirect($scriptname . '/' . $2 . $xtra);

&redirect("$scriptname/$2$xtra");

}

Line 1052 sub htmlify($;$) {

\#?)

(\d+)\b

}{

$1 . &link($2, sprintf($prcgi, $2)) . $3

$1 . &link($2, sprintf($prcgi, $2))

}egix;

} $_;

} while ($_ ne $prev);

Line 1061 sub htmlify($;$) {

(\b$prcategories/(\d+)\b)

}{

&link($1, sprintf($prcgi, $2)) . $3

&link($1, sprintf($prcgi, $2))

}egox;

} $_;

}

Line 1078 sub htmlify($;$) {

)

}{

&link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2)) . $5

&link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2))

}egx;

} $_;

}

Line 1489 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

Line 1508 sub doCheckout($$) {

Line 1513 sub doCheckout($$) {

}

if ($filename ne $where) {

&fatal("500 Internal Error",

"Unexpected output from cvs co: $cvsheader"

"Unexpected output from cvs co: $cvsheader");

. "<p><b>Check whether the directory $cvsroot/CVSROOT exists "

. "and the script has write-access to the CVSROOT/history "

. "file if it exists."

. "<br>The script needs to place lock files in the "

. "directory the file is in as well.</b>");

}

$| = 1;

Line 1780 sub getDirLogs($$@) {

again:

if ($state eq "head") {

#$rcsfile = $1 if (/^RCS file: (.+)$/); #not used (yet)

$filename = $1 if (/^Working file: (.+)$/);

$head = $1 if (/^head: (.+)$/);

if (/^Working file: (.+)$/) {

$branch = $1 if (/^branch: (.+)$/);

$filename = $1;

}

} elsif (/^head: (.+)$/) {

if ($state eq "head" && /^symbolic names/) {

$head = $1;

$state = "tags";

} elsif (/^branch: (.+)$/) {

($branch = $head) =~ s/\.\d+$// if (!defined($branch));

$branch = $1

$branch =~ s/(\.?)(\d+)$/${1}0.$2/;

} elsif (/^symbolic names:/) {

$symrev{MAIN} = $branch;

$state = "tags";

$symrev{HEAD} = $branch;

($branch = $head) =~ s/\.\d+$// if (!defined($branch));

$alltags{MAIN} = 1;

$branch =~ s/(\d+)$/0.$1/;

$alltags{HEAD} = 1;

$symrev{MAIN} = $branch;

push (@filetags, "MAIN", "HEAD");

$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" &&

if ($state eq "tags") {

/^\s+(.+):\s+([\d\.]+)\s+$/) {

if (/^\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";

next;

} elsif (/^\S/) {

if (defined($tag)) {

if(defined($symrev{$tag}) || $tag eq "HEAD") {

$revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag};

($branch = $revwanted) =~ s/\b0\.//;

($branchpoint = $branch) =~ s/\.?\d+$//;

$revwanted = undef if ($revwanted ne $branch);

} 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.

Line 2011 sub readLog($;$) {

Line 2014 sub readLog($;$) {

# is the first commit listed on the appropriate branch.

# 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/;

($symrev{"MAIN"} = $headrev) =~ s/(\d+)$/0.$1/;

revision:

foreach $rev (@revorder) {

if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {

$symrev{"HEAD"} = $rev;

last revision;

last;

}

($symrev{"HEAD"} = $headrev) =~ s/\.\d+$//

Line 2034 sub readLog($;$) {

Line 2036 sub readLog($;$) {

foreach (reverse sort keys %symrev) {

$rev = $symrev{$_};

if ($rev =~ /^((.*)\.)0\.(\d+)$/) {

if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) {

push(@branchnames, $_);

# A revision number of A.B.0.D really translates into

Line 2048 sub readLog($;$) {

Line 2050 sub readLog($;$) {

# it has no head to translate to if there is nothing on

# the branch, but I guess this can never happen?

# Since some stupid people actually import/check in

# (the code below gracefully forgets about the branch

# files with version 0.X we assume that the above cannot

# if it should happen)

# happen, and regard 0.X(.*) as a revision and not a branch.

$head = defined($2) ? $2 : "";

$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 "");

Line 2081 sub readLog($;$) {

my ($onlyonbranch, $onlybranchpoint);

if ($onlyonbranch = $input{'only_with_tag'}) {

$onlyonbranch = $symrev{$onlyonbranch};

if ($onlyonbranch =~ s/\.0\././) {

if ($onlyonbranch =~ s/\b0\.//) {

($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;

}

else {

Line 2638 sub navigateHeader($$$$$) {

my ($swhere,$path,$filename,$rev,$title) = @_;

$swhere = "" if ($swhere eq $scriptwhere);

$swhere = urlencode($filename) if ($swhere eq "");

print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";

print qq`<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">`;

print "<HTML>\n<HEAD>\n";

print '';

print qq`<META name="robots" content="nofollow">\n`;

print '';

print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";

print "$body_tag_for_src\n";

print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";

Line 2843 sub fileSortCmp() {

Line 2844 sub fileSortCmp() {

sub download_url($$;$) {

my ($url,$revision,$mimetype) = @_;

$revision =~ s/\.0\././;

$revision =~ s/\b0\.//;

if (defined($checkoutMagic)

&& (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {

Line 2999 sub http_header(;$) {

Line 3000 sub http_header(;$) {

}

select(GZIP);

$gzip_open = 1;

# print "" if ($content_type eq "text/html");

# print "" if ($content_type =~ m|^text/html\b|);

}

else {

if ($is_mod_perl) {

Line 3023 sub http_header(;$) {

Line 3024 sub http_header(;$) {

sub html_header($) {

my ($title) = @_;

my $version = '$zRevision: 1.104 $ $kRevision: 1.39 $'; #'

my $version = '$zRevision: 1.104 $ $kRevision: 1.45 $'; #'

http_header();

http_header(defined($charset) ? "text/html; charset=$charset" : "text/html");

print <<EOH;

<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"

"http://www.w3.org/TR/REC-html40/loose.dtd">

<html>

<head>

<title>$title</title>

</head>

CVSweb