X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;ds=sidebyside;f=cgi-bin%2Fcvslog.cgi;h=68f8170aca83fad1cd047b1c089d3aa89475dce2;hb=c5247ffd12bbb233b14ff41012b40d45c12e50d1;hp=c234d8f28a3efd3f075cdc9e9e3d17fb49b78ec1;hpb=bbcc7379f05c35c7f302c0f9b191100e9a40fa03;p=www.i-scream.org.git diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi index c234d8f..68f8170 100755 --- a/cgi-bin/cvslog.cgi +++ b/cgi-bin/cvslog.cgi @@ -44,13 +44,14 @@ $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"; -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"; @@ -83,14 +84,14 @@ print <<"END";
\n$module module\n |
\n$module module\n |
\n";
my(@lines) = `$logcmd $module 2>&1`;
@@ -108,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 "";
print HTML_encode($file);
print " ";
- if($rest =~ /\((\S).(\S+)\)/) {
+ 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($rest);
+ print "(";
+ print HTML_encode("$1.$2");
print "";
+ print HTML_encode("$3)");
}
else {
print HTML_encode($rest);
|