]> i-scream Git - www.i-scream.org.git/blobdiff - cgi-bin/cvslog.cgi
New code to handle diff's of initial versions on branches.
[www.i-scream.org.git] / cgi-bin / cvslog.cgi
index bb2dc3f7388ee882d955e28221baac44d388046e..645f64107a220c6fbea3af9290629a7aa546a457 100755 (executable)
@@ -1,15 +1,58 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
+
+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$moduleext commits in the past $days day(s)";
+    $days--;
+    $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 "since") {
+    my($date)=$query->param('date');
+    $date = `/bin/date \"+%Y/%m/%d\"` unless defined $date;
+    $heading = "i-scream CVS$moduleext commits since $date";
+    $firstdate = ">$date";
+}
+elsif($period eq "thisweek") {
+    $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$moduleext commits";
+}
 
-print "Content-type: text/html\n\n";
+my($cvsroot) = "/cvs/i-scream";
+
+$modulelist = `ls $cvsroot` unless defined $modulelist;
+$modulelist =~ s/[\r\n]/ /gm;
 
-my($today) = `date \"+%Y/%m/%d\"`;
-my($cvs) = "/home/cut/tdb1/bin/cvs";
-my($cvs2clpath) = "/home/cut/tdb1/bin/cvs2cl";
-my($cvsroot) = "/usr/local/proj/co600_10/cvs";
-my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$today'\" -g \"-d$cvsroot\" -g \"-Q\"";
-my($cmd) = "cd /home/cut/tdb1/cvsscripttemp && $cvs -d $cvsroot -Q update -d && $cvs2clpath $cvs2clargs *";
+my($cvs2clpath) = "/usr/local/bin/cvs2cl";
+my($cvs2clargs) = "--stdout --no-wrap -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
+my($updatecmd) = "/home/iscream/bin/fullcvsupdate.sh $modulelist";
+my($logcmd) = "cd /tmp/i-scream/cvstmp && $cvs2clpath $cvs2clargs";
 
-my(@lines) = `$cmd 2>&1`;
+my ($left) = "../htdocs/left.inc" ;
+my ($title) = "../htdocs/title.inc";
+my ($bottom) = "../htdocs/bottom.inc";
+
+print "Content-type: text/html\n\n";
 
 print <<"END";
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -17,32 +60,121 @@ print <<"END";
 <html>
 
 <head>
- <title>The i-scream Project Daily Commit Log</title>
- <meta name="description" content="The i-scream Project is a central 
-monitoring system for Unix, Linux and NT servers.">
- <meta name="keywords" content="i-scream, project, central monitoring 
-system, unix, linux, nt, server, alert">
- <meta name="generator" content="notepad on acid, aye.">
+ <title>The i-scream Project Commit Log</title>
 </head>
 
-<body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" 
-text="#000066">
+<body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066">
 
-<a href="http://www.i-scream.org.uk"><img border="0" src="../i-scream.gif"></a>
+<table border="0" cellpadding="2" cellspacing="2">
+ <tr>
+  <td valign="top">
+END
 
-<h3>Today's i-scream CVS commits</h3>
+&print_html($left);
 
-<a href="viewcvs.cgi">Browse i-scream CVS repository</a>
+print <<"END";
+  </td>
+  <td valign="top">
+END
 
-<pre>
+&print_html($title);
+
+print <<"END";
+<h2>$heading</h2>
 END
 
-foreach my $line (@lines) {
-    print HTML_encode($line);
+print `$updatecmd >/dev/null 2>&1`;
+
+my(@modules) = split (/\s+/, $modulelist);
+
+foreach my $module (@modules) {
+
+    print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n";
+    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";
+    print "<tr><td bgcolor=\"white\">\n";
+
+    my(@lines) = `$logcmd $module 2>&1`;
+    if(@lines == 0) {
+        print "There have been no commits in this module during this period.\n";
+    }
+    else {
+        foreach my $line (@lines) {
+
+            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>\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 =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)$/) {
+                print "\n<font color=\"blue\">\n<b>";
+                print HTML_encode($1);
+                print "</b>\n<i>";
+                print " commited by ";
+                print HTML_encode("$2");
+                print "</i>\n</font>\n"
+            }
+            elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) {
+                my ($file, $rest, $ext) = ($1, $2, $3);
+                print "<code>";
+                print "<a href=\"http://cvs.i-scream.org/$file\" style=\"text-decoration: none;\">";
+                print HTML_encode($file);
+                print "</a> ";
+                if($rest =~ /\((\S+)\.(\d+)(.*)\)/) {
+                    my $start = $1;
+                    my $end = $2;
+                    my $other = $3;
+                    my $newrev = "$start.$end";
+                    my $oldrev;
+                    if($end != 1) {
+                        my $oldminver = $end-1;
+                        $oldrev = "$start.$oldminver";
+                    }
+                    elsif($start =~ /^((\d+\.)+)(\d+)$/) {
+                        $oldrev = $1;
+                        # take trailing . off old revision
+                        chop $oldrev;
+                    }
+                    if(defined $oldrev) {
+                        my $diff = ".diff?r1=$oldrev&r2=$newrev";
+                        print "(<a href=\"http://cvs.i-scream.org/$file$diff\" style=\"text-decoration: none;\">";
+                        print HTML_encode("$start.$end");
+                        print "</a>";
+                        print HTML_encode("$other)");
+                    }
+                    else {
+                        print HTML_encode($rest);
+                    }
+                }
+                else {
+                    print HTML_encode($rest);
+                }
+                print HTML_encode($ext);
+                print "</code><br>\n"
+            }
+            else {
+                chop $line;
+                print "<code>";
+                print HTML_encode($line);
+                print "</code><br>\n"
+            }
+        }
+    }
+    print "</td></tr>\n";
+
+    print "</table><p>\n\n";
 }
 
+&print_html($bottom);
+
 print <<"END";
-</pre>
+
+  </td>
+ </tr>
+</table>
+
 </body>
 
 </html>
@@ -65,3 +197,8 @@ sub HTML_encode ($){
     return $encoded;
 }
 
+# Print a file without escaping HTML: -
+sub print_html ($) {
+    my ($filename) = @_;
+    print `cat $filename 2>&1`;
+}