ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/web/cgi-bin/cvslog.cgi
(Generate patch)

Comparing web/cgi-bin/cvslog.cgi (file contents):
Revision 1.21 by tdb, Mon Feb 4 00:42:43 2002 UTC vs.
Revision 1.25 by tdb, Thu May 15 20:48:01 2003 UTC

# Line 14 | Line 14 | if($period eq "days") {
14      if ($days < 1) {$days = 1};
15      $heading = "i-scream CVS$moduleext commits in the past $days day(s)";
16      $days--;
17 <    $firstdate = ">" . `date --date \"$days days ago\" \"+%Y/%m/%d\"`;
17 >    $days .= "d"; # because we can't write "$daysd" below :-)
18 >    $firstdate = ">" . `/bin/date -v-$days +%Y/%m/%d`;
19   }
20   elsif($period eq "date") {
21      my($date)=$query->param('date');
22 <    $date = `/bin/date \"+%Y/%m/%d\"` unless defined $date;
22 >    $date = `/bin/date +%Y/%m/%d` unless defined $date;
23      $heading = "i-scream CVS$moduleext commits on $date";
24      $firstdate = "$date 00:00<$date 23:59"
25   }
26   elsif($period eq "since") {
27      my($date)=$query->param('date');
28 <    $date = `/bin/date \"+%Y/%m/%d\"` unless defined $date;
28 >    $date = `/bin/date +%Y/%m/%d` unless defined $date;
29      $heading = "i-scream CVS$moduleext commits since $date";
30      $firstdate = ">$date";
31   }
# Line 34 | Line 35 | elsif($period eq "thisweek") {
35   }
36   else {
37      # default to "today only"
38 <    $firstdate = ">" . `/bin/date \"+%Y/%m/%d\"`;
38 >    $firstdate = ">" . `/bin/date +%Y/%m/%d`;
39      $heading = "Today's i-scream CVS$moduleext commits";
40   }
41  
# Line 43 | Line 44 | my($cvsroot) = "/cvs/i-scream";
44   $modulelist = `ls $cvsroot` unless defined $modulelist;
45   $modulelist =~ s/[\r\n]/ /gm;
46  
47 < my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl2.pl";
47 < #my($cvs2clargs) = "--stdout --no-wrap -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
47 > my($cvs2clpath) = "/usr/local/bin/cvs2cl";
48   my($cvs2clargs) = "--stdout --no-wrap -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
49 < my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist";
50 < my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs";
49 > my($updatecmd) = "/home/iscream/bin/fullcvsupdate.sh $modulelist";
50 > my($logcmd) = "cd /tmp/i-scream/cvstmp && $cvs2clpath $cvs2clargs";
51  
52 < my ($left) = "../left.inc" ;
53 < my ($title) = "../title.inc";
54 < my ($bottom) = "../bottom.inc";
52 > my ($left) = "../htdocs/left.inc" ;
53 > my ($title) = "../htdocs/title.inc";
54 > my ($bottom) = "../htdocs/bottom.inc";
55  
56   print "Content-type: text/html\n\n";
57  
# Line 84 | Line 84 | print <<"END";
84   <h2>$heading</h2>
85   END
86  
87 < print `$updatecmd`;
87 > print `$updatecmd >/dev/null 2>&1`;
88  
89   my(@modules) = split (/\s+/, $modulelist);
90  
91   foreach my $module (@modules) {
92  
93      print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n";
94 <    print "<tr><td>\n<font size=\"4\"><b><a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\" style=\"color: white\">$module module</a></b></font>\n</td></tr>\n\n";
94 >    print "<tr><td>\n<font size=\"4\"><b><a href=\"http://cvs.i-scream.org/$module\" style=\"color: white\">$module module</a></b></font>\n</td></tr>\n\n";
95      print "<tr><td bgcolor=\"white\">\n";
96  
97      my(@lines) = `$logcmd $module 2>&1`;
# Line 118 | Line 118 | foreach my $module (@modules) {
118                  print "</i>\n</font>\n"
119              }
120              elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) {
121                #chop $line;
121                  my ($file, $rest, $ext) = ($1, $2, $3);
122                  print "<code>";
123 <                print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">";
123 >                print "<a href=\"http://cvs.i-scream.org/$file\" style=\"text-decoration: none;\">";
124                  print HTML_encode($file);
125                  print "</a> ";
126 <                if($rest =~ /\((\d+).(\d+)(.*)\)/) {
127 <                    my $newrev = "$1.$2";
128 <                    my $oldminver = $2-1;
129 <                    my $oldrev = "$1.$oldminver";
130 <                    if(!($1==1 && $2==1)) {
126 >                if($rest =~ /\((\S+)\.(\d+)(.*)\)/) {
127 >                    my $start = $1;
128 >                    my $end = $2;
129 >                    my $other = $3;
130 >                    my $newrev = "$start.$end";
131 >                    my $oldrev;
132 >                    if($end != 1) {
133 >                        my $oldminver = $end-1;
134 >                        $oldrev = "$start.$oldminver";
135 >                    }
136 >                    elsif($start =~ /^((\d+\.)+)(\d+)$/) {
137 >                        $oldrev = $1;
138 >                        # take trailing . off old revision
139 >                        chop $oldrev;
140 >                    }
141 >                    if(defined $oldrev) {
142                          my $diff = ".diff?r1=$oldrev&r2=$newrev";
143 <                        print "(<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">";
144 <                        print HTML_encode("$1.$2");
143 >                        print "(<a href=\"http://cvs.i-scream.org/$file$diff\" style=\"text-decoration: none;\">";
144 >                        print HTML_encode("$start.$end");
145                          print "</a>";
146 <                        print HTML_encode("$3)");
146 >                        print HTML_encode("$other)");
147                      }
148                      else {
149                          print HTML_encode($rest);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines