Platon Technologies
not logged in Login Registration
EnglishSlovak
open source software development celebrating 10 years of open source development! Thursday, October 15, 2026
[BACK] [TXT][DIR] Up to [Platon] / scripts / cgi / cvsweb

Diff for scripts/cgi/cvsweb/cvsweb.cgi between version 1.23 and 1.24

version 1.23, 2003/02/20 13:55:46 version 1.24, 2003/04/25 03:44:14
Line 51 
Line 51 
 # $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.84 2001/10/07 20:50:10 knu Exp $  # $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.84 2001/10/07 20:50:10 knu Exp $
 #  #
 # DONT'T delete lines between '$''Idaemons' and '$''Platon' -- patches from FreeBSD failed then  # DONT'T delete lines between '$''Idaemons' and '$''Platon' -- patches from FreeBSD failed then
 # $Platon: scripts/cgi/cvsweb/cvsweb.cgi,v 1.22 2003/02/01 01:09:14 rajo Exp $  # $Platon: scripts/cgi/cvsweb/cvsweb.cgi,v 1.23 2003/02/20 13:55:46 rajo Exp $
 #  #
 ###  ###
   
Line 2506  sub printLog($;$)
Line 2506  sub printLog($;$)
   ($br  = $_)  =~ s/\.\d+$//;    ($br  = $_)  =~ s/\.\d+$//;
   ($brp = $br) =~ s/\.?\d+$//;    ($brp = $br) =~ s/\.?\d+$//;
   my $prev;    my $prev;
     my $curr_rev;
   
   $link = 1 if (!defined($link));    $link = 1 if (!defined($link));
   my $isDead = ($state{$_} eq 'dead');    my $isDead = ($state{$_} eq 'dead');
Line 2535  sub printLog($;$)
Line 2536  sub printLog($;$)
       }        }
       $nameprinted{$br} = 1;        $nameprinted{$br} = 1;
     }      }
     print "\n Revision ";  
     &download_link($fileurl, $_, $_,          $curr_rev = $_;
       print "\n ". _("Revision") . " ";
       &download_link($fileurl, $curr_rev, $curr_rev,
       $defaultViewable ? "text/x-cvsweb-markup" : undef);        $defaultViewable ? "text/x-cvsweb-markup" : undef);
   
     if ($defaultViewable) {      if ($defaultViewable) {
       print " / (";        print " / (";
       &download_link($fileurl, $_, _("download"), $mimetype);        &download_link($fileurl, $curr_rev, _("download"), $mimetype);
       print ")";        print ")";
     }      }
   
     if (not $defaultTextPlain) {      if (not $defaultTextPlain) {
       print " / (";        print " / (";
       &download_link($fileurl, $_, _("as text"), "text/plain");        &download_link($fileurl, $curr_rev, _("as text"), "text/plain");
       print ")";        print ")";
     }      }
   
     if (!$defaultViewable) {      if (!$defaultViewable) {
       print " / (";        print " / (";
       &download_link($fileurl, $_, _("view"), "text/x-cvsweb-markup");        &download_link($fileurl, $curr_rev, _("view"), "text/x-cvsweb-markup");
       print ")";        print ")";
     }      }
   
Line 2561  sub printLog($;$)
Line 2564  sub printLog($;$)
       print " - ";        print " - ";
       print &link(_('annotate'),        print &link(_('annotate'),
                   sprintf('%s/%s?annotate=%s%s',                    sprintf('%s/%s?annotate=%s%s',
                           $scriptname, urlencode($where), $_, $barequery));                            $scriptname, urlencode($where), $curr_rev, $barequery));
     }      }
   
     # Plus a select link if enabled, and this version isn't selected      # Plus a select link if enabled, and this version isn't selected
Line 2572  sub printLog($;$)
Line 2575  sub printLog($;$)
       } else {        } else {
         print &link('[' . _('select for diffs') . ']',          print &link('[' . _('select for diffs') . ']',
                     sprintf('%s?r1=%s%s#rev%s',                      sprintf('%s?r1=%s%s#rev%s',
                             $scriptwhere, $_, $barequery, $_));                              $scriptwhere, $curr_rev, $barequery, $curr_rev));
       }        }
     }      }
   } else {    } else {
     print _("Revision"), " <b>$_</b>";      print _("Revision"), " <b>$curr_rev</b>";
   }    }
   
   if (/^1\.1\.1\.\d+$/) {    if (/^1\.1\.1\.\d+$/) {
     print " <i>(", _("vendor branch"), ")</i>";      print " <i>(", _("vendor branch"), ")</i>";
   }    }
   if (defined @mytz) {    if (defined @mytz) {
     my ($est) = $mytz[(localtime($date{$_}))[8]];      my ($est) = $mytz[(localtime($date{$curr_rev}))[8]];
     print ", <i>", scalar localtime($date{$_}), " $est</i> (";      print ", <i>", scalar localtime($date{$curr_rev}), " $est</i> (";
   } else {    } else {
     print ", <i>", scalar gmtime($date{$_}), " UTC</i> (";      print ", <i>", scalar gmtime($date{$curr_rev}), " UTC</i> (";
   }    }
   print readableTime(time() - $date{$_}, 1), ' ', _('ago'), ')';    print readableTime(time() - $date{$curr_rev}, 1), ' ', _('ago'), ')';
   print ' by <i>', htmlquote($author{$_}), "</i>\n";    print ' by <i>', htmlquote($author{$curr_rev}), "</i>\n";
   
   if ($revsym{$br}) {    if ($revsym{$br}) {
     printf "<br>", _("Branch"), ": <b>%s</b>\n",      printf "<br>", _("Branch"), ": <b>%s</b>\n",
       $link ? link_tags($revsym{$br}) : htmlquote($revsym{$br});        $link ? link_tags($revsym{$br}) : htmlquote($revsym{$br});
   }    }
   if ($revsym{$_}) {    if ($revsym{$curr_rev}) {
     printf "<br>", _("CVS Tags"), ": <b>%s</b>\n",      printf "<br>", _("CVS Tags"), ": <b>%s</b>\n",
       $link ? link_tags($revsym{$_}) : htmlquote($revsym{$_});        $link ? link_tags($revsym{$curr_rev}) : htmlquote($revsym{$curr_rev});
   }    }
   if ($branchpoint{$_}) {    if ($branchpoint{$curr_rev}) {
     printf "<br>", _("Branch point for"), ": <b>%s</b>\n",      printf "<br>", _("Branch point for"), ": <b>%s</b>\n",
       $link ? link_tags($branchpoint{$_}) : htmlquote($branchpoint{$_});        $link ? link_tags($branchpoint{$curr_rev}) : htmlquote($branchpoint{$curr_rev});
   }    }
   
   # Find the previous revision    # Find the previous revision
   my @prevrev = split (/\./, $_);    my @prevrev = split (/\./, $curr_rev);
   do {    do {
     if (--$prevrev[$#prevrev] <= 0) {      if (--$prevrev[$#prevrev] <= 0) {
   
Line 2617  sub printLog($;$)
Line 2620  sub printLog($;$)
   } until (defined($date{$prev}) || $prev eq "");    } until (defined($date{$prev}) || $prev eq "");
   
   if ($prev ne "") {    if ($prev ne "") {
     if ($difflines{$_}) {      if ($difflines{$curr_rev}) {
       print "<br>", _("Changes since"), " <b>$prev: $difflines{$_} ", _("lines"), "</b>";        print "<br>", _("Changes since"), " <b>$prev: $difflines{$curr_rev} ", _("lines"), "</b>";
     }      }
   }    }
   
Line 2626  sub printLog($;$)
Line 2629  sub printLog($;$)
     print "<br><b><i>", _("FILE REMOVED"), "</i></b>\n";      print "<br><b><i>", _("FILE REMOVED"), "</i></b>\n";
   } elsif ($link) {    } elsif ($link) {
     my %diffrev = ();      my %diffrev = ();
     $diffrev{$_} = 1;      $diffrev{$curr_rev} = 1;
     $diffrev{""} = 1;      $diffrev{""} = 1;
     print '<br>';      print '<br>';
     my $diff = 'Diff';      my $diff = 'Diff';
Line 2637  sub printLog($;$)
Line 2640  sub printLog($;$)
       $diffrev{$prev} = 1;        $diffrev{$prev} = 1;
   
       my $url =        my $url =
         sprintf('%s.diff?r1=%s&r2=%s%s', $scriptwhere, $prev, $_, $barequery);          sprintf('%s.diff?r1=%s&r2=%s%s', $scriptwhere, $prev, $curr_rev, $barequery);
   
       print $diff, " to previous ";        print $diff, " to previous ";
       $diff = '';        $diff = '';
Line 2652  sub printLog($;$)
Line 2655  sub printLog($;$)
       && !defined($diffrev{$brp}))        && !defined($diffrev{$brp}))
     {      {
       my $url =        my $url =
         sprintf('%s.diff?r1=%s&r2=%s%s', $scriptwhere, $brp, $_, $barequery);          sprintf('%s.diff?r1=%s&r2=%s%s', $scriptwhere, $brp, $curr_rev, $barequery);
   
       print $diff, " to branchpoint ";        print $diff, " to branchpoint ";
       $diff = '';        $diff = '';
Line 2667  sub printLog($;$)
Line 2670  sub printLog($;$)
     if (/^\d+\.\d+\.\d+/ && !/^1\.1\.1\.\d+$/) {      if (/^\d+\.\d+\.\d+/ && !/^1\.1\.1\.\d+$/) {
       my ($i, $nextmain);        my ($i, $nextmain);
   
       for ($i = 0; $i < $#revorder && $revorder[$i] ne $_; $i++) {        for ($i = 0; $i < $#revorder && $revorder[$i] ne $curr_rev; $i++) {
       }        }
       my @tmp2 = split (/\./, $_);        my @tmp2 = split (/\./, $curr_rev);
       for ($nextmain = ""; $i > 0; $i--) {        for ($nextmain = ""; $i > 0; $i--) {
         my $next = $revorder[$i - 1];          my $next = $revorder[$i - 1];
         my @tmp1 = split (/\./, $next);          my @tmp1 = split (/\./, $next);
Line 2691  sub printLog($;$)
Line 2694  sub printLog($;$)
         $diffrev{$nextmain} = 1;          $diffrev{$nextmain} = 1;
   
         my $url = sprintf('%s.diff?r1=%s&r2=%s%s',          my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
           $scriptwhere, $nextmain, $_, $barequery);            $scriptwhere, $nextmain, $curr_rev, $barequery);
   
         print $diff, " next main ";          print $diff, " next main ";
         $diff = '';          $diff = '';
Line 2705  sub printLog($;$)
Line 2708  sub printLog($;$)
       $diffrev{$input{"r1"}} = 1;        $diffrev{$input{"r1"}} = 1;
   
       my $url = sprintf('%s.diff?r1=%s&r2=%s%s',        my $url = sprintf('%s.diff?r1=%s&r2=%s%s',
         $scriptwhere, $input{'r1'}, $_, $barequery);          $scriptwhere, $input{'r1'}, $curr_rev, $barequery);
   
       print $diff, " to selected ";        print $diff, " to selected ";
       $diff = '';        $diff = '';
Line 2714  sub printLog($;$)
Line 2717  sub printLog($;$)
   
   }    }
   print "\n</p>\n<pre>\n";    print "\n</p>\n<pre>\n";
   print &htmlify($log{$_}, $allow_log_extra);    print &htmlify($log{$curr_rev}, $allow_log_extra);
   print "</pre>\n";    print "</pre>\n";
   print "</div>\n" if $isSelected;    print "</div>\n" if $isSelected;
 }  }
Legend:
Removed from v.1.23  
changed lines
  Added in v.1.24
Platon Group <platon@platon.org> http://platon.org/
Copyright © 2002-2006 Platon Group
Site powered by Metafox CMS 		Go to Top