22 |
|
$heading = "i-scream CVS$moduleext commits on $date"; |
23 |
|
$firstdate = "$date 00:00<$date 23:59" |
24 |
|
} |
25 |
+ |
elsif($period eq "since") { |
26 |
+ |
my($date)=$query->param('date'); |
27 |
+ |
$date = `/bin/date \"+%Y/%m/%d\"` unless defined $date; |
28 |
+ |
$heading = "i-scream CVS$moduleext commits since $date"; |
29 |
+ |
$firstdate = ">$date"; |
30 |
+ |
} |
31 |
|
elsif($period eq "thisweek") { |
32 |
|
$firstdate = ">last Sunday"; |
33 |
|
$heading = "i-scream CVS$moduleext commits this week"; |
41 |
|
my($cvsroot) = "/cvs/i-scream"; |
42 |
|
|
43 |
|
$modulelist = `ls $cvsroot` unless defined $modulelist; |
44 |
+ |
$modulelist =~ s/[\r\n]/ /gm; |
45 |
|
|
46 |
|
my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl2.pl"; |
47 |
< |
my($cvs2clargs) = "--stdout --no-wrap -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; |
47 |
> |
#my($cvs2clargs) = "--stdout --no-wrap -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; |
48 |
> |
my($cvs2clargs) = "--stdout --no-wrap -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; |
49 |
|
my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist"; |
50 |
|
my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs"; |
51 |
|
|
84 |
|
<h2>$heading</h2> |
85 |
|
END |
86 |
|
|
87 |
< |
print `$updatecmd`; |
87 |
> |
print `$updatecmd >/dev/null 2>&1`; |
88 |
|
|
89 |
|
my(@modules) = split (/\s+/, $modulelist); |
90 |
|
|
109 |
|
print HTML_encode("$2"); |
110 |
|
print "</a></i>\n</font>\n" |
111 |
|
} |
112 |
< |
elsif($line =~ /(\S+) (\(\S+\))([,:])/) { |
112 |
> |
elsif ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)$/) { |
113 |
> |
print "\n<font color=\"blue\">\n<b>"; |
114 |
> |
print HTML_encode($1); |
115 |
> |
print "</b>\n<i>"; |
116 |
> |
print " commited by "; |
117 |
> |
print HTML_encode("$2"); |
118 |
> |
print "</i>\n</font>\n" |
119 |
> |
} |
120 |
> |
elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) { |
121 |
|
#chop $line; |
122 |
|
my ($file, $rest, $ext) = ($1, $2, $3); |
123 |
|
print "<code>"; |
124 |
|
print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">"; |
125 |
|
print HTML_encode($file); |
126 |
|
print "</a> "; |
127 |
< |
if($rest =~ /\((\S).(\S+)\)/) { |
127 |
> |
if($rest =~ /\((\S+)\.(\d+)(.*)\)/) { |
128 |
|
my $newrev = "$1.$2"; |
129 |
|
my $oldminver = $2-1; |
130 |
|
my $oldrev = "$1.$oldminver"; |
131 |
< |
if(!($1==1 && $2==1)) { |
131 |
> |
if($2 != 1) { |
132 |
|
my $diff = ".diff?r1=$oldrev&r2=$newrev"; |
133 |
< |
print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">"; |
134 |
< |
print HTML_encode($rest); |
133 |
> |
print "(<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">"; |
134 |
> |
print HTML_encode("$1.$2"); |
135 |
|
print "</a>"; |
136 |
+ |
print HTML_encode("$3)"); |
137 |
|
} |
138 |
|
else { |
139 |
|
print HTML_encode($rest); |