# | Line 4 | Line 4 | use CGI; | |
---|---|---|
4 | $query=new CGI; | |
5 | my($period)=$query->param('period'); | |
6 | $period = "today" unless defined $period; | |
7 | + | my($modulelist)=$query->param('module'); |
8 | + | my $moduleext=""; $moduleext=":$modulelist" if defined $modulelist; |
9 | ||
10 | my($firstdate); | |
11 | if($period eq "days") { | |
12 | my($days)=$query->param('days'); | |
13 | $days = 1 unless defined $days; | |
14 | if ($days < 1) {$days = 1}; | |
15 | < | $heading = "i-scream CVS commits in the past $days day(s)"; |
15 | > | $heading = "i-scream CVS$moduleext commits in the past $days day(s)"; |
16 | $days--; | |
17 | < | $firstdate = `date --date \"$days days ago\" \"+%Y/%m/%d\"`; |
17 | > | $firstdate = ">" . `/bin/date -v-${days}d +%Y/%m/%d`; |
18 | } | |
19 | + | elsif($period eq "date") { |
20 | + | my($date)=$query->param('date'); |
21 | + | $date = `/bin/date +%Y/%m/%d` unless defined $date; |
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 commits this week"; |
32 | > | $firstdate = ">last Sunday"; |
33 | > | $heading = "i-scream CVS$moduleext commits this week"; |
34 | } | |
35 | else { | |
36 | < | # default to "today only" |
37 | < | $firstdate = `/bin/date \"+%Y/%m/%d\"`; |
38 | < | $heading = "Today's i-scream CVS commits"; |
36 | > | # default to "today only" |
37 | > | $firstdate = ">" . `/bin/date +%Y/%m/%d`; |
38 | > | $heading = "Today's i-scream CVS$moduleext commits"; |
39 | } | |
40 | ||
41 | my($cvsroot) = "/cvs/i-scream"; | |
42 | ||
29 | – | my($modulelist)=$query->param('module'); |
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/cvs2cl.pl"; |
47 | < | my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; |
48 | < | my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist"; |
49 | < | my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs"; |
46 | > | my($cvs2clpath) = "/usr/local/bin/cvs2cl"; |
47 | > | my($cvs2clargs) = "--stdout --no-wrap --no-common-dir -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; |
48 | > | my($updatecmd) = "/home/iscream/bin/fullcvsupdate.sh $modulelist"; |
49 | > | my($logcmd) = "cd /tmp/i-scream/cvstmp && $cvs2clpath $cvs2clargs"; |
50 | ||
51 | < | my ($left) = "../left.inc" ; |
52 | < | my ($title) = "../title.inc"; |
53 | < | my ($bottom) = "../bottom.inc"; |
51 | > | my ($left) = "../htdocs/left.inc" ; |
52 | > | my ($title) = "../htdocs/title.inc"; |
53 | > | my ($bottom) = "../htdocs/bottom.inc"; |
54 | ||
55 | print "Content-type: text/html\n\n"; | |
56 | ||
# | Line 69 | Line 83 | print <<"END"; | |
83 | <h2>$heading</h2> | |
84 | END | |
85 | ||
86 | < | print `$updatecmd`; |
86 | > | print `$updatecmd >/dev/null 2>&1`; |
87 | ||
88 | my(@modules) = split (/\s+/, $modulelist); | |
89 | ||
90 | foreach my $module (@modules) { | |
91 | ||
92 | print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n"; | |
93 | < | print "<tr><td>\n<font size=\"4\"><b><a href=\"/cgi-bin/cvs/viewcvs.cgi/$module\" style=\"color: white\">$module module</a></b></font>\n</td></tr>\n\n"; |
93 | > | print "<tr><td>\n<font size=\"4\"><b><a href=\"http://cvs.i-scream.org/$module\" style=\"color: white\">$module module</a></b></font>\n</td></tr>\n\n"; |
94 | print "<tr><td bgcolor=\"white\">\n"; | |
95 | ||
96 | my(@lines) = `$logcmd $module 2>&1`; | |
# | Line 86 | Line 100 | foreach my $module (@modules) { | |
100 | else { | |
101 | foreach my $line (@lines) { | |
102 | ||
103 | < | if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)([^\s]+)$/) { |
104 | < | print "\n<font color=\"blue\"><b>"; |
103 | > | if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) { |
104 | > | print "\n<font color=\"blue\">\n<b>"; |
105 | print HTML_encode($1); | |
106 | < | print "</b><i>"; |
107 | < | print HTML_encode("by $2"); |
108 | < | print "</i></font>\n" |
106 | > | print "</b>\n<i>"; |
107 | > | print " committed by <a href=\"mailto:$3\" style=\"text-decoration: none;\">"; |
108 | > | print HTML_encode("$2"); |
109 | > | print "</a></i>\n</font>\n" |
110 | } | |
111 | + | elsif ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)$/) { |
112 | + | print "\n<font color=\"blue\">\n<b>"; |
113 | + | print HTML_encode($1); |
114 | + | print "</b>\n<i>"; |
115 | + | print " committed by "; |
116 | + | print HTML_encode("$2"); |
117 | + | print "</i>\n</font>\n" |
118 | + | } |
119 | + | elsif($line =~ /([^\s]+) (\([^,^\)]+(,[^\)]+)?\))([,:])/) { |
120 | + | my ($file, $rev, $tags, $ext) = ($1, $2, $3, $4); |
121 | + | print "<code>"; |
122 | + | print "<a href=\"http://cvs.i-scream.org/$file\" style=\"text-decoration: none;\">"; |
123 | + | print HTML_encode($file); |
124 | + | print "</a> "; |
125 | + | if($rev =~ /\(([^\s]+)\.(\d+)(.*)\)/) { |
126 | + | my $start = $1; |
127 | + | my $end = $2; |
128 | + | my $other = $3; |
129 | + | my $newrev = "$start.$end"; |
130 | + | my $oldrev; |
131 | + | if($end != 1) { |
132 | + | my $oldminver = $end-1; |
133 | + | $oldrev = "$start.$oldminver"; |
134 | + | } |
135 | + | elsif($start =~ /^((\d+\.)+)(\d+)$/) { |
136 | + | $oldrev = $1; |
137 | + | # take trailing . off old revision |
138 | + | chop $oldrev; |
139 | + | } |
140 | + | if(defined $oldrev) { |
141 | + | my $diff = ".diff?r1=$oldrev&r2=$newrev"; |
142 | + | print "(<a href=\"http://cvs.i-scream.org/$file$diff\" style=\"text-decoration: none;\">"; |
143 | + | print HTML_encode("$start.$end"); |
144 | + | print "</a>"; |
145 | + | print HTML_encode("$other)"); |
146 | + | } |
147 | + | else { |
148 | + | print HTML_encode($rev); |
149 | + | } |
150 | + | } |
151 | + | else { |
152 | + | print HTML_encode($rev); |
153 | + | } |
154 | + | print HTML_encode($ext); |
155 | + | print "</code><br>\n" |
156 | + | } |
157 | else { | |
158 | < | chop $line; |
158 | > | chomp $line; |
159 | print "<code>"; | |
160 | print HTML_encode($line); | |
161 | print "</code><br>\n" |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |