===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.8
retrieving revision 1.1.1.9
diff -u -p -r1.1.1.8 -r1.1.1.9
--- cvsweb/cvsweb.cgi 2000/09/30 18:55:43 1.1.1.8
+++ cvsweb/cvsweb.cgi 2000/09/30 20:17:23 1.1.1.9
@@ -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.29 2000/09/30 18:48:16 knu Exp $
+# $kId: cvsweb.cgi,v 1.30 2000/09/30 20:10:01 knu Exp $
#
###
@@ -1141,11 +1141,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
@@ -1207,6 +1202,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
@@ -1239,33 +1239,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
@@ -2478,7 +2486,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 "";
@@ -2833,7 +2841,7 @@ sub http_header(;$) {
sub html_header($) {
my ($title) = @_;
- my $version = '$zRevision: 1.103 $ $kRevision: 1.29 $'; #'
+ my $version = '$zRevision: 1.103 $ $kRevision: 1.30 $'; #'
http_header();
print <