[BACK]Return to cvsweb.cgi CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / cvsweb

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

version 1.1.1.14, 2000/12/07 15:16:31 version 1.1.1.15, 2000/12/18 04:35:54
Line 43 
Line 43 
 # SUCH DAMAGE.  # SUCH DAMAGE.
 #  #
 # $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $  # $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $
 # $kId: cvsweb.cgi,v 1.42 2000/12/07 15:11:24 knu Exp $  # $kId: cvsweb.cgi,v 1.45 2000/12/18 04:25:30 knu Exp $
 #  #
 ###  ###
   
Line 244  $is_mod_perl = defined($ENV{MOD_PERL});
Line 244  $is_mod_perl = defined($ENV{MOD_PERL});
 # in lynx, it it very annoying to have two links  # in lynx, it it very annoying to have two links
 # per file, so disable the link at the icon  # per file, so disable the link at the icon
 # in this case:  # in this case:
 $Browser = $ENV{HTTP_USER_AGENT};  $Browser = $ENV{HTTP_USER_AGENT} || '';
 $is_links = ($Browser =~ m`^Links `);  $is_links = ($Browser =~ m`^Links `);
 $is_lynx = ($Browser =~ m`^Lynx/`i);  $is_lynx = ($Browser =~ m`^Lynx/`i);
 $is_w3m = ($Browser =~ m`^w3m/`i);  $is_w3m = ($Browser =~ m`^w3m/`i);
Line 909  elsif (-d $fullname) {
Line 909  elsif (-d $fullname) {
         my $fh = do {local(*FH);};          my $fh = do {local(*FH);};
         my ($xtra, $module);          my ($xtra, $module);
         # Assume it's a module name with a potential path following it.          # 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?          # Is there an indexed version of modules?
         if (open($fh, "$cvsroot/CVSROOT/modules")) {          if (open($fh, "$cvsroot/CVSROOT/modules")) {
             while (<$fh>) {              while (<$fh>) {
                 if (/^(\S+)\s+(\S+)/o && $module eq $1                  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 1790  again:
Line 1790  again:
             } elsif (/^symbolic names:/) {              } elsif (/^symbolic names:/) {
                 $state = "tags";                  $state = "tags";
                 ($branch = $head) =~ s/\.\d+$// if (!defined($branch));                  ($branch = $head) =~ s/\.\d+$// if (!defined($branch));
                 $branch =~ s/(\.?)(\d+)$/${1}0.$2/;                  $branch =~ s/(\d+)$/0.$1/;
                 $symrev{MAIN} = $branch;                  $symrev{MAIN} = $branch;
                 $symrev{HEAD} = $branch;                  $symrev{HEAD} = $branch;
                 $alltags{MAIN} = 1;                  $alltags{MAIN} = 1;
Line 1816  again:
Line 1816  again:
                 if (defined($tag)) {                  if (defined($tag)) {
                     if(defined($symrev{$tag}) || $tag eq "HEAD") {                      if(defined($symrev{$tag}) || $tag eq "HEAD") {
                         $revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag};                          $revwanted = $symrev{$tag eq "HEAD" ? "MAIN" : $tag};
                         ($branch = $revwanted) =~ s/\.0\././;                          ($branch = $revwanted) =~ s/\b0\.//;
                         ($branchpoint = $branch) =~ s/\.?\d+$//;                          ($branchpoint = $branch) =~ s/\.?\d+$//;
                         $revwanted = undef if ($revwanted ne $branch);                          $revwanted = undef if ($revwanted ne $branch);
                     } elsif ($tag ne "HEAD") {                      } elsif ($tag ne "HEAD") {
Line 2014  sub readLog($;$) {
Line 2014  sub readLog($;$) {
 # is the first commit listed on the appropriate branch.  # is the first commit listed on the appropriate branch.
 # This is not neccesary the same revision as marked as head in the RCS file.  # This is not neccesary the same revision as marked as head in the RCS file.
         my $headrev = $curbranch || "1";          my $headrev = $curbranch || "1";
         ($symrev{"MAIN"} = $headrev) =~ s/(\.?)(\d+)$/${1}0.$2/;          ($symrev{"MAIN"} = $headrev) =~ s/(\d+)$/0.$1/;
         foreach $rev (@revorder) {          foreach $rev (@revorder) {
             if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {              if ($rev =~ /^(\S*)\.\d+$/ && $headrev eq $1) {
                 $symrev{"HEAD"} = $rev;                  $symrev{"HEAD"} = $rev;
Line 2036  sub readLog($;$) {
Line 2036  sub readLog($;$) {
   
         foreach (reverse sort keys %symrev) {          foreach (reverse sort keys %symrev) {
             $rev = $symrev{$_};              $rev = $symrev{$_};
             if ($rev =~ /^((.*)\.)0\.(\d+)$/) {              if ($rev =~ /^((.*)\.)?\b0\.(\d+)$/) {
                 push(@branchnames, $_);                  push(@branchnames, $_);
                 #                  #
                 # A revision number of A.B.0.D really translates into                  # A revision number of A.B.0.D really translates into
Line 2050  sub readLog($;$) {
Line 2050  sub readLog($;$) {
                 # it has no head to translate to if there is nothing on                  # it has no head to translate to if there is nothing on
                 # the branch, but I guess this can never happen?                  # 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 : "";                  $head = defined($2) ? $2 : "";
                 $branch = $3;                  $branch = $3;
Line 2082  sub readLog($;$) {
Line 2081  sub readLog($;$) {
         my ($onlyonbranch, $onlybranchpoint);          my ($onlyonbranch, $onlybranchpoint);
         if ($onlyonbranch = $input{'only_with_tag'}) {          if ($onlyonbranch = $input{'only_with_tag'}) {
             $onlyonbranch = $symrev{$onlyonbranch};              $onlyonbranch = $symrev{$onlyonbranch};
             if ($onlyonbranch =~ s/\.0\././) {              if ($onlyonbranch =~ s/\b0\.//) {
                 ($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;                  ($onlybranchpoint = $onlyonbranch) =~ s/\.\d+$//;
             }              }
             else {              else {
Line 2639  sub navigateHeader($$$$$) {
Line 2638  sub navigateHeader($$$$$) {
     my ($swhere,$path,$filename,$rev,$title) = @_;      my ($swhere,$path,$filename,$rev,$title) = @_;
     $swhere = "" if ($swhere eq $scriptwhere);      $swhere = "" if ($swhere eq $scriptwhere);
     $swhere = urlencode($filename) if ($swhere eq "");      $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 "<HTML>\n<HEAD>\n";
     print '<!-- CVSweb $zRevision: 1.104 $  $kRevision: 1.42 $ -->';      print qq`<META name="robots" content="nofollow">\n`;
       print '<!-- CVSweb $zRevision: 1.104 $  $kRevision: 1.45 $ -->';
     print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";      print "\n<TITLE>$path$filename - $title - $rev</TITLE></HEAD>\n";
     print  "$body_tag_for_src\n";      print  "$body_tag_for_src\n";
     print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";      print "<table width=\"100%\" border=0 cellspacing=0 cellpadding=1 bgcolor=\"$navigationHeaderColor\">";
Line 2844  sub fileSortCmp() {
Line 2844  sub fileSortCmp() {
 sub download_url($$;$) {  sub download_url($$;$) {
     my ($url,$revision,$mimetype) = @_;      my ($url,$revision,$mimetype) = @_;
   
     $revision =~ s/\.0\././;      $revision =~ s/\b0\.//;
   
     if (defined($checkoutMagic)      if (defined($checkoutMagic)
         && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {          && (!defined($mimetype) || $mimetype ne "text/x-cvsweb-markup")) {
Line 3024  sub http_header(;$) {
Line 3024  sub http_header(;$) {
   
 sub html_header($) {  sub html_header($) {
     my ($title) = @_;      my ($title) = @_;
     my $version = '$zRevision: 1.104 $  $kRevision: 1.42 $'; #'      my $version = '$zRevision: 1.104 $  $kRevision: 1.45 $'; #'
     http_header(defined($charset) ? "text/html; charset=$charset" : "text/html");      http_header(defined($charset) ? "text/html; charset=$charset" : "text/html");
     print <<EOH;      print <<EOH;
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"  <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"
  "http://www.w3.org/TR/REC-html40/loose.dtd">   "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>  <html>
 <head>  <head>
   <meta name="robots" content="nofollow">
 <title>$title</title>  <title>$title</title>
 <!-- CVSweb $version -->  <!-- CVSweb $version -->
 </head>  </head>
Legend:
Removed from v.1.1.1.14  
changed lines
  Added in v.1.1.1.15
CVSweb