From: Tim Bishop <tim@bishnet.net>
Date: Mon, 18 Jun 2001 15:19:37 +0000 (+0000)
Subject: Major changes:
X-Git-Tag: PRE_WWW_REDESIGN~103
X-Git-Url: http://git.i-scream.org/?a=commitdiff_plain;ds=inline;h=2765d8ad6819f8c6ec8886a9da33fea60a76c166;p=www.i-scream.org.git

Major changes:
- Now supports period=date&date=yyyy/mm/dd query strings.
- The files/logs section of each commit has been broken into two seperate bits.
- The filenames are linked to their relevant viewcvs page.
- The revisions are linked to their diffs, allowing one to see the changes a
  certain commit has introduced.
- The log message itself has been unwrapped, for neatness.

Bugs:
- fails to know about "deleted" files. They simply show up as a new revision.
  This is a fault in the underlying cvs2cl script.

Notes:
- This uses a modified version of cvs2cl. The diff is given here to avoid any
  confusion as to what this script expects in the future.

777c777,778
<             $files = wrap ("\t", "    ", "$files");
---
> # tdb1: no-wrap shouldn't wrap ANYTHING!
>             #$files = wrap ("\t", "   ", "$files");
934c935,936
<     if ((scalar (@qunkrefs)) > 1)
---
> # tdb1: hacked to turn off the commondir feature
>     if ((scalar (@qunkrefs)) < 0)
1126c1128,1129
<       $beauty .= ", ";
---
> # tdb1: hacked to put a newline after each one
>       $beauty .= ",\n";
1175c1178,1179
<   $beauty = "* $beauty:";
---
> # tdb1: hacked to remove the prefixed *
>   $beauty = "$beauty:";
---

diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index d873e10..5167700 100755
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -4,33 +4,40 @@ use CGI;
 $query=new CGI;
 my($period)=$query->param('period');
 $period = "today" unless defined $period;
+my($modulelist)=$query->param('module');
+my $moduleext=""; $moduleext=":$modulelist" if defined $modulelist;
 
 my($firstdate);
 if($period eq "days") {
     my($days)=$query->param('days');
     $days = 1 unless defined $days;
     if ($days < 1) {$days = 1};
-    $heading = "i-scream CVS commits in the past $days day(s)";
+    $heading = "i-scream CVS$moduleext commits in the past $days day(s)";
     $days--;
-    $firstdate = `date --date \"$days days ago\" \"+%Y/%m/%d\"`;
+    $firstdate = ">" . `date --date \"$days days ago\" \"+%Y/%m/%d\"`;
+}
+elsif($period eq "date") {
+    my($date)=$query->param('date');
+    $date = `/bin/date \"+%Y/%m/%d\"` unless defined $date;
+    $heading = "i-scream CVS$moduleext commits on $date";
+    $firstdate = "$date 00:00<$date 23:59"
 }
 elsif($period eq "thisweek") {
-   $firstdate = "last Sunday";
-   $heading = "i-scream CVS commits this week";
+    $firstdate = ">last Sunday";
+    $heading = "i-scream CVS$moduleext commits this week";
 }
 else {
-   # default to "today only"
-   $firstdate = `/bin/date \"+%Y/%m/%d\"`;
-   $heading = "Today's i-scream CVS commits";
+    # default to "today only"
+    $firstdate = ">" . `/bin/date \"+%Y/%m/%d\"`;
+    $heading = "Today's i-scream CVS$moduleext commits";
 }
 
 my($cvsroot) = "/cvs/i-scream";
 
-my($modulelist)=$query->param('module');
 $modulelist = `ls $cvsroot` unless defined $modulelist;
 
-my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl";
-my($cvs2clargs) = "--stdout -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
+my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl2.pl";
+my($cvs2clargs) = "--stdout --no-wrap -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
 my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist";
 my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs";
 
@@ -86,12 +93,40 @@ foreach my $module (@modules) {
     else {
         foreach my $line (@lines) {
 
-            if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)([^\s]+)$/) {
-                print "\n<font color=\"blue\"><b>";
+            if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) {
+                print "\n<font color=\"blue\">\n<b>";
                 print HTML_encode($1);
-                print "</b><i>";
-                print HTML_encode("by $2");
-                print "</i></font>\n"
+                print "</b>\n<i>";
+                print " commited by <a href=\"mailto:$3\" style=\"text-decoration: none;\">";
+                print HTML_encode("$2");
+                print "</a></i>\n</font>\n"
+            }
+            elsif($line =~ /(\S+) (\(\S+\))([,:])/) {
+                #chop $line;
+                my ($file, $rest, $ext) = ($1, $2, $3);
+                print "<code>";
+                print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">";
+                print HTML_encode($file);
+                print "</a> ";
+                if($rest =~ /\((\S).(\S+)\)/) {
+                    my $newrev = "$1.$2";
+                    my $oldminver = $2-1;
+                    my $oldrev = "$1.$oldminver";
+                    if(!($1==1 && $2==1)) {
+                        my $diff = ".diff?r1=$oldrev&r2=$newrev";
+                        print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">";
+                        print HTML_encode($rest);
+                        print "</a>";
+                    }
+                    else {
+                        print HTML_encode($rest);
+                    }
+                }
+                else {
+                    print HTML_encode($rest);
+                }
+                print HTML_encode($ext);
+                print "</code><br>\n"
             }
             else {
                 chop $line;