===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.12
retrieving revision 3.36
diff -u -p -r1.1.1.12 -r3.36
--- cvsweb/cvsweb.cgi	2000/11/04 19:19:48	1.1.1.12
+++ cvsweb/cvsweb.cgi	2000/10/20 12:28:45	3.36
@@ -42,8 +42,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # 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 $
+# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $
+# $Id: cvsweb.cgi,v 3.36 2000/10/20 12:28:45 knu Exp $
 #
 ###
 
@@ -52,7 +52,6 @@ use strict;
 use vars qw (
     $config $allow_version_select $verbose
     %CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES
-    @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS
     %alltags @tabcolors %fileinfo %tags @branchnames %nameprinted
     %symrev %revsym @allrevisions %date %author @revdisplayorder
     @revisions %state %difflines %log %branchpoint @revorder
@@ -62,7 +61,7 @@ use vars qw (
     %funcline_regexp $is_mod_perl
     $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
+    $bylog $byfile $hr_default $logsort $cvstree $cvsroot
     $mimetype $defaultTextPlain $defaultViewable $allow_compress
     $GZIPBIN $backicon $diricon $fileicon $fullname $newname
     $cvstreedefault $body_tag $body_tag_for_src
@@ -84,8 +83,6 @@ use vars qw (
 );
 
 sub printDiffSelect($);
-sub printDiffLinks($$);
-sub printLogSortSelect($);
 sub findLastModifiedSubdirs(@);
 sub htmlify_sub(&$);
 sub htmlify($;$);
@@ -169,49 +166,6 @@ $tabstop = $use_moddate = $moddate = $gzip_open = unde
 $LOG_FILESEPARATOR = q/^={77}$/;
 $LOG_REVSEPARATOR = q/^-{28}$/;
 
-@DIFFTYPES = qw(h H u c s);
-@DIFFTYPES{@DIFFTYPES} = (
-			  {
-			   'descr'   => 'colored',
-			   'opts'    => [ '-u' ],
-			   'colored' => 1,
-			  },
-			  {
-			   'descr'   => 'long colored',
-			   'opts'    => [ '--unified=15' ],
-			   'colored' => 1,
-			  },
-			  {
-			   'descr'   => 'unified',
-			   'opts'    => [ '-u' ],
-			   'colored' => 0,
-			  },
-			  {
-			   'descr'   => 'context',
-			   'opts'    => [ '-c' ],
-			   'colored' => 0,
-			  },
-			  {
-			   'descr'   => 'side by side',
-			   'opts'    => [ '--side-by-side', '--width=164' ],
-			   'colored' => 0,
-			  },
-			 );
-
-@LOGSORTKEYS = qw(cvs date rev);
-@LOGSORTKEYS{@LOGSORTKEYS} = (
-			      {
-			       'descr' => 'Not sorted',
-			      },
-			      {
-			       'descr' => 'Commit date',
-			      },
-			      {
-			       'descr' => 'Revision',
-			      },
-			     );
-
-
 ##### End of configuration variables #####
 
 use Time::Local;
@@ -375,7 +329,7 @@ else {
     $byfile = 1;
 }
 
-$defaultDiffType = $input{'f'};
+$hr_default = ($input{'f'} eq 'h' || $input{'f'} eq 'H');
 
 $logsort = $input{'logsort'};
 
@@ -831,9 +785,12 @@ elsif (-d $fullname) {
 	    print "<OPTION",$byrev ? " SELECTED" : ""," VALUE=rev>Revision";
 	    print "<OPTION",$bylog ? " SELECTED" : ""," VALUE=log>Log message";
 	    print "</SELECT></td>";
-	    print "<td>Sort log by: ";
-	    printLogSortSelect(0);
-	    print "</td></tr>";
+	    print "<td>revisions by: \n";
+	    print "<SELECT NAME=logsort>\n";
+	    print "<OPTION VALUE=cvs",$logsort eq "cvs" ? " SELECTED" : "", ">Not sorted";
+	    print "<OPTION VALUE=date",$logsort eq "date" ? " SELECTED" : "", ">Commit date";
+	    print "<OPTION VALUE=rev",$logsort eq "rev" ? " SELECTED" : "", ">Revision";
+	    print "</SELECT></td></tr>";
 	    print "<tr><td>Diff format: ";
 	    printDiffSelect(0);
 	    print "</td>";
@@ -927,43 +884,18 @@ gzipclose();
 
 sub printDiffSelect($) {
     my ($use_java_script) = @_;
-    my $f = $input{'f'};
-
-    print '<SELECT NAME="f"';
-    print ' onchange="submit()"' if $use_java_script;
-    print '>';
-
-    local $_;
-    for (@DIFFTYPES) {
-	printf('<OPTION VALUE="%s"%s>%s',
-	       $_,
-	       $f eq $_ ? ' SELECTED' : '',
-	       "\u$DIFFTYPES{$_}{'descr'}"
-	      );
-    }
-
+    my ($f) = $input{'f'};
+    print "<SELECT NAME=\"f\"";
+    print " onchange=\"submit()\"" if ($use_java_script);
+    print ">\n";
+    print "<OPTION VALUE=h",$f eq "h" ? " SELECTED" : "", ">Colored Diff";
+    print "<OPTION VALUE=H",$f eq "H" ? " SELECTED" : "", ">Long Colored Diff";
+    print "<OPTION VALUE=u",$f eq "u" ? " SELECTED" : "", ">Unidiff";
+    print "<OPTION VALUE=c",$f eq "c" ? " SELECTED" : "", ">Context Diff";
+    print "<OPTION VALUE=s",$f eq "s" ? " SELECTED" : "", ">Side by Side";
     print "</SELECT>";
 }
 
-sub printLogSortSelect($) {
-    my ($use_java_script) = @_;
-
-    print '<SELECT NAME="logsort"';
-    print ' onchange="submit()"' if $use_java_script;
-    print '>';
-
-    local $_;
-    for (@LOGSORTKEYS) {
-	printf('<OPTION VALUE="%s"%s>%s',
-	       $_,
-	       $logsort eq $_ ? ' SELECTED' : '',
-	       "\u$LOGSORTKEYS{$_}{'descr'}"
-	      );
-    }
-
-    print "</SELECT>";
-}
-
 sub findLastModifiedSubdirs(@) {
     my (@dirs) = @_;
     my ($dirname, @files);
@@ -1001,13 +933,12 @@ sub findLastModifiedSubdirs(@) {
 sub htmlify_sub(&$) {
     (my $proc, local $_) = @_;
     local @_ = split(m`(<a [^>]+>[^<]*</a>)`i);
-    my $linked;
-    my $result = '';
+    my ($linked, $result);
 
     while (($_, $linked) = splice(@_, 0, 2)) {
 	&$proc();
-	$result .= $_ if defined($_);
-	$result .= $linked if defined($linked);
+	$result .= $_;
+	$result .= $linked;
     }
 
     $result;
@@ -1598,7 +1529,7 @@ sub viewable($) {
 sub doDiff($$$$$$) {
 	my($fullname, $r1, $tr1, $r2, $tr2, $f) = @_;
         my $fh = do {local(*FH);};
-	my ($rev1, $rev2, $sym1, $sym2, $f1, $f2);
+	my ($rev1, $rev2, $sym1, $sym2, @difftype, $diffname, $f1, $f2);
 
 	if ($r1 =~ /([^:]+)(:(.+))?/) {
 	    $rev1 = $1;
@@ -1632,18 +1563,36 @@ sub doDiff($$$$$$) {
 	    ($rev1, $sym1) = ($rev2, $sym2);
 	    ($rev2, $sym2) = ($tmp1, $tmp2);
 	}
-	my $difftype = $DIFFTYPES{$f};
-
-	if (!$difftype) {
+	my $human_readable = 0;
+	if ($f eq 'c') {
+	    @difftype = qw{-c};
+	    $diffname = "Context diff";
+	}
+	elsif ($f eq 's') {
+	    @difftype = qw{--side-by-side --width=164};
+	    $diffname = "Side by Side";
+	}
+	elsif ($f eq 'H') {
+	    $human_readable = 1;
+	    @difftype = qw{--unified=15};
+	    $diffname = "Long Human readable";
+	}
+	elsif ($f eq 'h') {
+	    @difftype =qw{-u};
+	    $human_readable = 1;
+	    $diffname = "Human readable";
+	}
+	elsif ($f eq 'u') {
+	    @difftype = qw{-u};
+	    $diffname = "Unidiff";
+	}
+	else {
 	    fatal ("400 Bad arguments", "Diff format $f not understood");
 	}
 
-	my @difftype       = @{$difftype->{'opts'}};
-	my $human_readable = $difftype->{'colored'};
-
 	# apply special options
 	if ($showfunc) {
-	    push @difftype, '-p' if $f ne 's';
+	    push @difftype, '-p' if $f =~ /^[cHhu]$/;
 
 	    my($re1, $re2);
 
@@ -1805,7 +1754,7 @@ again:
 	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\././;
+		($branch = $revwanted) =~ s/\b0\.//;
 		($branchpoint = $branch) =~ s/\.?\d+$//;
 		$revwanted = undef if ($revwanted ne $branch);
 	    }
@@ -2034,7 +1983,7 @@ 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
@@ -2047,11 +1996,9 @@ sub readLog($;$) {
 		# with the branch number 0.A, with the exception that
 		# it has no head to translate to if there is nothing on
 		# the branch, but I guess this can never happen?
+		# (the code below gracefully forgets about the branch
+		# if it should happen)
 		#
-		# Since some stupid people actually import/check in
-		# files with version 0.X we assume that the above cannot
-		# happen, and regard 0.X(.*) as a revision and not a branch.
-		#
 		$head = defined($2) ? $2 : "";
 		$branch = $3;
 		$branchrev = $head . ($head ne "" ? "." : "") . $branch;
@@ -2081,7 +2028,7 @@ 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 {
@@ -2119,20 +2066,6 @@ sub readLog($;$) {
 
 }
 
-sub printDiffLinks($$) {
-    my($text, $url) = @_;
-    my @extra;
-
-    local $_;
-    for ($DIFFTYPES{$defaultDiffType}{'colored'} ? qw(u) : qw(h)) {
-	my $f = $_ eq $defaultDiffType ? '' : $_;
-
-	push @extra, &link(lc $DIFFTYPES{$_}{'descr'}, "$url&f=$f");
-    }
-
-    print &link($text, $url), ' (', join(', ', @extra), ')';
-}
-
 sub printLog($;$) {
 	my ($link, $br, $brp);
 	($_,$link) = @_;
@@ -2257,7 +2190,10 @@ sub printLog($;$) {
 				  $barequery);
 
 		print " to previous ";
-		printDiffLinks($prev, $url);
+		print &link($prev, $url);
+		if (!$hr_default) { # offer a human readable version if not default
+		    print ' (', &link('colored', "$url&f=h"), ')';
+		}
 	    }
 	    #
 	    # Plus, if it's on a branch, and it's not a vendor branch,
@@ -2270,7 +2206,10 @@ sub printLog($;$) {
 				  $barequery);
 
 		print " to branchpoint ";
-		printDiffLinks($brp, $url);
+		print &link($brp, $url);
+		if (!$hr_default) { # offer a human readable version if not default
+		    print ' (', &link('colored', "$url&f=h"), ')';
+		}
 	    }
 	    #
 	    # Plus, if it's on a branch, and it's not a vendor branch,
@@ -2303,7 +2242,10 @@ sub printLog($;$) {
 				      $barequery);
 
 		    print " next main ";
-		    printDiffLinks($nextmain, $url);
+		    print &link($nextmain, $url);
+		    if (!$hr_default) { # offer a human readable version if not default
+			print ' (', &link('colored', "$url&f=h"), ')';
+		    }
 		}
 	    }
 	    # Plus if user has selected only r1, then present a link
@@ -2318,7 +2260,10 @@ sub printLog($;$) {
 				  $barequery);
 
 		print " to selected ";
-		printDiffLinks($input{'r1'}, $url);
+		print &link($input{'r1'}, $url);
+		if (!$hr_default) { # offer a human readable version if not default
+		    print ' (', &link('colored', "$url&f=h"), ')';
+		}
 	    }
 	}
 	print "<PRE>\n";
@@ -2398,8 +2343,8 @@ sub doLog($) {
 	print "<HR noshade>\n";
 	print "<TABLE>";
 	print "<FORM METHOD=\"GET\" ACTION=\"$scriptwhere\">\n";
-	print "<TR><TD align=right>Preferred Diff type:</TD>";
-	print "<TD>";
+        print "<TR><TD align=right>Preferred Diff type:</TD>";
+        print "<TD>";
 	printDiffSelect($use_java_script);
 	print "</TD><TD></TD></TR>\n";
         if (@branchnames) {
@@ -2434,9 +2379,13 @@ sub doLog($) {
 	print "<TR><TD align=right>";
 	print "<A name=logsort></A>\n";
 	print "Sort log by:</TD>";
-	print "<TD>";
-	printLogSortSelect($use_java_script);
-	print "</TD>";
+	print "<TD><SELECT NAME=\"logsort\"";
+	print " onchange=\"submit()\"" if ($use_java_script);
+	print ">\n";
+	print "<OPTION VALUE=cvs",$logsort eq "cvs" ? " SELECTED" : "", ">Not sorted";
+	print "<OPTION VALUE=date",$logsort eq "date" ? " SELECTED" : "", ">Commit date";
+	print "<OPTION VALUE=rev",$logsort eq "rev" ? " SELECTED" : "", ">Revision";
+	print "</SELECT></TD>";
 	print "<TD><INPUT TYPE=SUBMIT VALUE=\"  Set  \"></TD>";
 	print "</FORM>\n";
 	print "</TR></TABLE>";
@@ -2640,7 +2589,7 @@ sub navigateHeader($$$$$) {
     $swhere = urlencode($filename) if ($swhere eq "");
     print "<\!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">";
     print "<HTML>\n<HEAD>\n";
-    print '<!-- CVSweb $zRevision: 1.104 $  $kRevision: 1.39 $ -->';
+    print '<!-- CVSweb $zRevision: 1.103 $  $Revision: 3.36 $ -->';
     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\">";
@@ -2843,7 +2792,7 @@ 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")) {
@@ -3023,7 +2972,7 @@ sub http_header(;$) {
 
 sub html_header($) {
     my ($title) = @_;
-    my $version = '$zRevision: 1.104 $  $kRevision: 1.39 $'; #'
+    my $version = '$zRevision: 1.103 $  $Revision: 3.36 $'; #'
     http_header();
     print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"