===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.7
retrieving revision 3.32
diff -u -p -r1.1.1.7 -r3.32
--- cvsweb/cvsweb.cgi 2000/09/23 20:23:34 1.1.1.7
+++ cvsweb/cvsweb.cgi 2000/10/07 07:35:08 3.32
@@ -43,7 +43,7 @@
# SUCH DAMAGE.
#
# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $
-# $kId: cvsweb.cgi,v 1.26 2000/09/22 11:13:17 knu Exp $
+# $Id: cvsweb.cgi,v 3.32 2000/10/07 07:35:08 knu Exp $
#
###
@@ -79,6 +79,7 @@ use vars qw (
$tabstop $state $annTable $sel $curbranch @HideModules
$module $use_descriptions %descriptions @mytz $dwhere $moddate
$use_moddate $has_zlib $gzip_open
+ $LOG_FILESEPARATOR $LOG_REVSEPARATOR
);
sub printDiffSelect($);
@@ -125,14 +126,13 @@ sub forbidden_module($);
use Cwd;
# == EDIT this ==
-# User configuration is stored in
-$config = undef;
-
-for ($ENV{CVSWEB_CONFIG},
-# '/home/knu/etc/cvsweb.conf',
+# Locations to search for user configuration, in order:
+for (
+ $ENV{CVSWEB_CONFIG},
'/usr/local/etc/cvsweb.conf',
- getcwd . '/cvsweb.conf') {
- $config = $_ if defined($_) && -r $_;
+ getcwd() . '/cvsweb.conf'
+ ) {
+ $config = $_ if defined($_) && -r $_;
}
# == Configuration defaults ==
@@ -146,7 +146,7 @@ $allow_version_select = 1;
# These are defined to allow checking with perl -cw
%CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES =
%tags = %alltags = @tabcolors = ();
-$cvstreedefault = $body_tag = $body_tag_for_src =
+$cvstreedefault = $body_tag = $body_tag_for_src =
$logo = $defaulttitle = $address =
$long_intro = $short_instruction = $shortLogLen =
$show_author = $dirtable = $tablepadding = $columnHeaderColorDefault =
@@ -160,6 +160,9 @@ $checkout_magic = $show_subdir_lastmod = $show_log_in_
$navigationHeaderColor = $tableBorderColor = $markupLogColor =
$tabstop = $use_moddate = $moddate = $gzip_open = undef;
+$LOG_FILESEPARATOR = q/^={77}$/;
+$LOG_REVSEPARATOR = q/^-{28}$/;
+
##### End of configuration variables #####
use Time::Local;
@@ -224,9 +227,11 @@ $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})
@stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);
if (-f $config) {
- do $config;
-}
-else {
+ do $config
+ || &fatal("500 Internal Error",
+ sprintf('Error in loading configuration file: %s
%s
',
+ $config, &htmlify($@)));
+} else {
&fatal("500 Internal Error",
'Configuration not found. Set the variable $config '
. 'in cvsweb.cgi, or the environment variable '
@@ -278,25 +283,24 @@ foreach (keys %DEFAULTVALUE)
}
$barequery = "";
+my @barequery;
foreach (@stickyvars) {
# construct a query string with the sticky non default parameters set
if (defined($input{$_}) && $input{$_} ne '' &&
!(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) {
- if ($barequery) {
- $barequery = $barequery . "&";
- }
- my $thisval = urlencode($_) . "=" . urlencode($input{$_});
- $barequery .= $thisval;
+ push @barequery, join('=', urlencode($_), urlencode($input{$_}));
}
}
# is there any query ?
-if ($barequery) {
+if (@barequery) {
+ $barequery = join('&', @barequery);
$query = "?$barequery";
- $barequery = "&" . $barequery;
+ $barequery = "&$barequery";
}
else {
$query = "";
}
+undef @barequery;
# get actual parameters
$sortby = $input{"sortby"};
@@ -344,7 +348,8 @@ if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}})
$cvsroot = $CVSROOT{$cvstree};
# create icons out of description
-foreach my $k (keys %ICONS) {
+my $k;
+foreach $k (keys %ICONS) {
no strict 'refs';
my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}};
if ($ipath) {
@@ -354,9 +359,18 @@ foreach my $k (keys %ICONS) {
${"${k}icon"} = $itxt;
}
}
+undef $k;
+my $config_cvstree = "$config-$cvstree";
+
# Do some special configuration for cvstrees
-do "$config-$cvstree" if (-f "$config-$cvstree");
+if (-f $config_cvstree) {
+ do $config_cvstree
+ || &fatal("500 Internal Error",
+ sprintf('Error in loading configuration file: %s
%s
',
+ $config_cvstree, &htmlify($@)));
+}
+undef $config_cvstree;
$prcategories = '(?:' . join('|', @prcategories) . ')';
$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
@@ -1133,11 +1147,6 @@ sub doAnnotate($$) {
($pathname = $where) =~ s/(Attic\/)?[^\/]*$//;
($filename = $where) =~ s/^.*\///;
- http_header();
-
- navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");
- print "Annotation of $pathname$filename, Revision $rev
\n";
-
# this seems to be necessary
$| = 1; $| = 0; # Flush
@@ -1147,7 +1156,7 @@ sub doAnnotate($$) {
# the public domain.
# we could abandon the use of rlog, rcsdiff and co using
# the cvsserver in a similiar way one day (..after rewrite)
- $pid = open2($reader, $writer, "cvs server") || fatal ("500 Internal Error",
+ $pid = open2($reader, $writer, "cvs -Rl server") || fatal ("500 Internal Error",
"Fatal Error - unable to open cvs for annotation");
# OK, first send the request to the server. A simplified example is:
@@ -1199,6 +1208,11 @@ sub doAnnotate($$) {
# were nicer about buffering, then we could just leave it open, I think.
close ($writer) || die "cannot close: $!";
+ http_header();
+
+ navigateHeader($scriptwhere,$pathname,$filename,$rev, "annotate");
+ print "Annotation of $pathname$filename, Revision $rev
\n";
+
# Ready to get the responses from the server.
# For example:
# E Annotations for foo/xx
@@ -1231,33 +1245,41 @@ sub doAnnotate($$) {
}
elsif ($words[0] eq "M") {
$lineNr++;
- my $lrev = substr ($_, 2, 13);
- my $lusr = substr ($_, 16, 9);
- my $line = substr ($_, 36);
+ (my $lrev = substr($_, 2, 13)) =~ y/ //d;
+ (my $lusr = substr($_, 16, 9)) =~ y/ //d;
+ my $line = substr($_, 36);
+ my $isCurrentRev = ($rev eq $lrev);
# we should parse the date here ..
if ($lrev eq $oldLrev) {
- $revprint = " ";
+ $revprint = sprintf('%-8s', '');
}
else {
- $revprint = $lrev; $oldLusr = "";
- $revprint =~ s`^(\S+)`$1`; # `
+ $revprint = sprintf('%-8s', $lrev);
+ $revprint =~ s`\S+`$&`; # `
+ $oldLusr = '';
}
if ($lusr eq $oldLusr) {
- $usrprint = " ";
+ $usrprint = '';
}
else {
$usrprint = $lusr;
}
$oldLrev = $lrev;
$oldLusr = $lusr;
- # is there a less timeconsuming way to strip spaces ?
- ($lrev = $lrev) =~ s/\s+//g;
- my $isCurrentRev = ($rev eq $lrev);
- print "" if ($isCurrentRev);
- printf ("%8s%s%8s %4d:", $revprint, ($isCurrentRev ? "|" : " "), $usrprint, $lineNr);
+ # Set bold for text-based browsers only - graphical
+ # browsers show bold fonts a bit wider than regular fonts,
+ # so it looks irregular.
+ print "" if ($isCurrentRev && $is_textbased);
+
+ printf "%s%s %-8s %4d:",
+ $revprint,
+ $isCurrentRev ? '!' : ' ',
+ $usrprint,
+ $lineNr;
print spacedHtmlText($line, $d{'tabstop'});
- print "" if ($isCurrentRev);
+
+ print "" if ($isCurrentRev && $is_textbased);
}
elsif ($words[0] eq "ok") {
# We could complain about any text received after this, like the
@@ -1676,7 +1698,7 @@ again:
$state = "head";
goto again;
}
- if ($state eq "head" && /^----------------------------$/) {
+ if ($state eq "head" && /$LOG_REVSEPARATOR/o) {
$state = "log";
$rev = undef;
$date = undef;
@@ -1686,8 +1708,7 @@ again:
next;
}
if ($state eq "log") {
- if (/^----------------------------$/
- || /^=============================/) {
+ if (/$LOG_REVSEPARATOR/o || /$LOG_FILESEPARATOR/o) {
# End of a log entry.
my $revbranch;
($revbranch = $rev) =~ s/\.\d+$//;
@@ -1734,7 +1755,7 @@ again:
$log = $log . $_;
}
}
- if (/^===============/) {
+ if (/$LOG_FILESEPARATOR/o) {
$state = "start";
next;
}
@@ -1808,7 +1829,7 @@ sub readLog($;$) {
# log info
# ----------------------------
logentry:
- while (!/^=========/) {
+ while (!/$LOG_FILESEPARATOR/o) {
$_ = <$fh>;
last logentry if (!defined($_)); # EOF
print "R:", $_ if ($verbose);
@@ -1816,7 +1837,7 @@ sub readLog($;$) {
$rev = $1;
unshift(@allrevisions,$rev);
}
- elsif (/^========/ || /^----------------------------$/) {
+ elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) {
next logentry;
}
else {
@@ -1850,7 +1871,7 @@ sub readLog($;$) {
while (<$fh>) {
print "L:", $_ if ($verbose);
next line if (/^branches:\s/);
- last line if (/^----------------------------$/ || /^=========/);
+ last line if (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o);
$log{$rev} .= $_;
}
print "E:", $_ if ($verbose);
@@ -2470,7 +2491,7 @@ sub navigateHeader($$$$$) {
$swhere = urlencode($filename) if ($swhere eq "");
print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
print "\n\n";
- print '';
+ print '';
print "\n$path$filename - $title - $rev\n";
print "$body_tag_for_src\n";
print "";
@@ -2825,7 +2846,7 @@ sub http_header(;$) {
sub html_header($) {
my ($title) = @_;
- my $version = '$zRevision: 1.103 $ $kRevision: 1.26 $'; #'
+ my $version = '$zRevision: 1.103 $ $Revision: 3.32 $'; #'
http_header();
print <