New code to handle diff's of initial versions on branches.

[www.i-scream.org.git] / cgi-bin / cvslog.cgi

diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index 565323444b6aa244a191250b80ed9ce1fc727961..645f64107a220c6fbea3af9290629a7aa546a457 100755 (executable)
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -22,6 +22,12 @@ elsif($period eq "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";
@@ -37,14 +43,14 @@ my($cvsroot) = "/cvs/i-scream";
 $modulelist = `ls $cvsroot` unless defined $modulelist;
 $modulelist =~ s/[\r\n]/ /gm;
 
-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";
+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 ($left) = "../left.inc" ;
-my ($title) = "../title.inc";
-my ($bottom) = "../bottom.inc";
+my ($left) = "../htdocs/left.inc" ;
+my ($title) = "../htdocs/title.inc";
+my ($bottom) = "../htdocs/bottom.inc";
 
 print "Content-type: text/html\n\n";
 
@@ -77,14 +83,14 @@ print <<"END";
 <h2>$heading</h2>
 END
 
-print `$updatecmd`;
+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=\"/cgi-bin/cvs/viewcvs.cgi/$module\" style=\"color: white\">$module module</a></b></font>\n</td></tr>\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`;
@@ -102,22 +108,41 @@ foreach my $module (@modules) {
                 print HTML_encode("$2");
                 print "</a></i>\n</font>\n"
             }
-            elsif($line =~ /(\S+) (\(\S+\))([,:])/) {
-                #chop $line;
+            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=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">";
+                print "<a href=\"http://cvs.i-scream.org/$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)) {
+                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=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">";
-                        print HTML_encode($rest);
+                        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);