===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 3.31
retrieving revision 3.32
diff -u -p -r3.31 -r3.32
--- cvsweb/cvsweb.cgi 2000/10/02 19:07:08 3.31
+++ 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 $
-# $Id: cvsweb.cgi,v 3.31 2000/10/02 19:07:08 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($);
@@ -159,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;
@@ -284,7 +288,7 @@ foreach (@stickyvars) {
# construct a query string with the sticky non default parameters set
if (defined($input{$_}) && $input{$_} ne '' &&
!(defined($DEFAULTVALUE{$_}) && $input{$_} eq $DEFAULTVALUE{$_})) {
- push @barequery, join('=', urlencode($_), urlencode($input{$_});
+ push @barequery, join('=', urlencode($_), urlencode($input{$_}));
}
}
# is there any query ?
@@ -344,7 +348,7 @@ if ($input{'cvsroot'} && $CVSROOT{$input{'cvsroot'}})
$cvsroot = $CVSROOT{$cvstree};
# create icons out of description
-my $k
+my $k;
foreach $k (keys %ICONS) {
no strict 'refs';
my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}};
@@ -1268,11 +1272,11 @@ sub doAnnotate($$) {
# so it looks irregular.
print "" if ($isCurrentRev && $is_textbased);
- printf ("%s%s %-8s %4d:",
+ printf "%s%s %-8s %4d:",
$revprint,
$isCurrentRev ? '!' : ' ',
$usrprint,
- $lineNr);
+ $lineNr;
print spacedHtmlText($line, $d{'tabstop'});
print "" if ($isCurrentRev && $is_textbased);
@@ -1694,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;
@@ -1704,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+$//;
@@ -1752,7 +1755,7 @@ again:
$log = $log . $_;
}
}
- if (/^===============/) {
+ if (/$LOG_FILESEPARATOR/o) {
$state = "start";
next;
}
@@ -1826,7 +1829,7 @@ sub readLog($;$) {
# log info
# ----------------------------
logentry:
- while (!/^=========/) {
+ while (!/$LOG_FILESEPARATOR/o) {
$_ = <$fh>;
last logentry if (!defined($_)); # EOF
print "R:", $_ if ($verbose);
@@ -1834,7 +1837,7 @@ sub readLog($;$) {
$rev = $1;
unshift(@allrevisions,$rev);
}
- elsif (/^========/ || /^----------------------------$/) {
+ elsif (/$LOG_FILESEPARATOR/o || /$LOG_REVSEPARATOR/o) {
next logentry;
}
else {
@@ -1868,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);
@@ -2488,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 "";
@@ -2843,7 +2846,7 @@ sub http_header(;$) {
sub html_header($) {
my ($title) = @_;
- my $version = '$zRevision: 1.103 $ $Revision: 3.31 $'; #'
+ my $version = '$zRevision: 1.103 $ $Revision: 3.32 $'; #'
http_header();
print <