--- web/cgi-bin/cvslog.cgi 2001/12/09 01:04:12 1.19 +++ web/cgi-bin/cvslog.cgi 2003/03/03 15:30:59 1.23 @@ -44,7 +44,8 @@ $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"; @@ -83,7 +84,7 @@ print <<"END";

$heading

END -print `$updatecmd`; +print `$updatecmd >/dev/null 2>&1`; my(@modules) = split (/\s+/, $modulelist); @@ -108,6 +109,14 @@ foreach my $module (@modules) { print HTML_encode("$2"); print "\n\n" } + 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); @@ -115,11 +124,11 @@ foreach my $module (@modules) { print ""; print HTML_encode($file); print " "; - if($rest =~ /\((\d+).(\d+)(.*)\)/) { + if($rest =~ /\((\S+)\.(\d+)(.*)\)/) { my $newrev = "$1.$2"; my $oldminver = $2-1; my $oldrev = "$1.$oldminver"; - if(!($1==1 && $2==1)) { + if($2 != 1) { my $diff = ".diff?r1=$oldrev&r2=$newrev"; print "("; print HTML_encode("$1.$2");