--- web/cgi-bin/cvslog.cgi 2001/06/18 15:19:37 1.16
+++ web/cgi-bin/cvslog.cgi 2002/02/04 00:42:43 1.21
@@ -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";
@@ -35,9 +41,11 @@ else {
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($cvs2clargs) = "--stdout --no-wrap -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
+my($cvs2clargs) = "--stdout --no-wrap -r -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";
@@ -101,22 +109,31 @@ foreach my $module (@modules) {
print HTML_encode("$2");
print "\n\n"
}
- elsif($line =~ /(\S+) (\(\S+\))([,:])/) {
+ elsif ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)$/) {
+ print "\n\n";
+ print HTML_encode($1);
+ print "\n";
+ print " commited by ";
+ print HTML_encode("$2");
+ print "\n\n"
+ }
+ elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) {
#chop $line;
my ($file, $rest, $ext) = ($1, $2, $3);
print "";
print "";
print HTML_encode($file);
print " ";
- if($rest =~ /\((\S).(\S+)\)/) {
+ if($rest =~ /\((\d+).(\d+)(.*)\)/) {
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 "";
- print HTML_encode($rest);
+ print "(";
+ print HTML_encode("$1.$2");
print "";
+ print HTML_encode("$3)");
}
else {
print HTML_encode($rest);