The i-scream Project Commit Log

--- web/cgi-bin/cvslog.cgi 2001/06/13 15:24:40 1.8 +++ web/cgi-bin/cvslog.cgi 2003/08/21 22:22:12 1.27 @@ -4,34 +4,56 @@ 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 commits in the past $days day(s)"; + $heading = "i-scream CVS$moduleext commits in the past $days day(s)"; $days--; - $firstdate = `date --date \"$days days ago\" \"+%Y/%m/%d\"`; + $firstdate = ">" . `/bin/date -v-${days}d +%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 commits this week"; + $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 commits"; + # 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($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl"; my($cvsroot) = "/cvs/i-scream"; -my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; -my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh"; -my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs"; +$modulelist = `ls $cvsroot` unless defined $modulelist; +$modulelist =~ s/[\r\n]/ /gm; + +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) = "../htdocs/left.inc" ; +my ($title) = "../htdocs/title.inc"; +my ($bottom) = "../htdocs/bottom.inc"; + +print "Content-type: text/html\n\n"; + print <<"END"; @@ -41,24 +63,34 @@ print <<"END"; The i-scream Project Commit Log - + -

+ + + + + +

+END -

$heading

+&print_html($left); +print <<"END"; +

END -print `$updatecmd`; +&print_html($title); -my $modulelist = `ls $cvsroot`; +print <<"END"; +

$heading

+END + +print `$updatecmd >/dev/null 2>&1`; + my(@modules) = split (/\s+/, $modulelist); foreach my $module (@modules) { - print ""; - print ""; + print "

$module module

\n\n"; + print "\n\n"; print "

\n$module module\n

\n"; my(@lines) = `$logcmd $module 2>&1`; @@ -68,18 +100,65 @@ foreach my $module (@modules) { else { foreach my $line (@lines) { - if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)([^\s]+)$/) { - print ""; + if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) { + print "\n\n"; print HTML_encode($1); - print ""; - print HTML_encode("by $2"); - print "" + print "\n"; + print " committed by "; + 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 " committed by "; + print HTML_encode("$2"); + print "\n\n" + } + elsif($line =~ /(\S+) ($\S+$)([,:])/ || $line =~ /(\S+) ($\S+,\s+\S+$)([,:])/) { + my ($file, $rest, $ext) = ($1, $2, $3); + print "

";
+                print "";
+                print HTML_encode($file);
+                print " ";
+                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 "(";
+                        print HTML_encode("$start.$end");
+                        print "";
+                        print HTML_encode("$other)");
+                    }
+                    else {
+                        print HTML_encode($rest);
+                    }
+                }
+                else {
+                    print HTML_encode($rest);
+                }
+                print HTML_encode($ext);
+                print "

\n" + } else { chop $line; print "

";
                 print HTML_encode($line);
-                print "

" + print "
\n" } } } @@ -88,8 +167,14 @@ foreach my $module (@modules) { print "

\n\n"; } +&print_html($bottom); + print <<"END"; +

+ @@ -110,4 +195,10 @@ sub HTML_encode ($){ $encoded =~ s//>/g; return $encoded; +} + +# Print a file without escaping HTML: - +sub print_html ($) { + my ($filename) = @_; + print `cat $filename 2>&1`; }