ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/web/cgi-bin/cvslog.cgi
Revision: 1.28
Committed: Sat Sep 27 17:21:32 2003 UTC (20 years, 9 months ago) by tdb
Branch: MAIN
Changes since 1.27: +1 -1 lines
Log Message:
Update scripts that use cvs2cl. Now using cvs2cl 2.49, still with some
custom patches (but less than before). Diff included here.

--- cvs2cl.bak	Sat Sep 27 16:57:59 2003
+++ cvs2cl	Sat Sep 27 17:10:55 2003
@@ -1036,7 +1036,8 @@
           elsif ($No_Wrap && !$Summary)
           {
             $msg = &preprocess_msg_text ($msg);
-            $files = wrap ("\t", "\t", "* $files");
+# tdb: no-wrap shouldn't wrap ANYTHING!
+            #$files = wrap ("\t", "\t", "* $files");
             $msg =~ s/\n(.+)/\n\t$1/g;
             unless ($After_Header eq " ") {
               $msg =~ s/^(.+)/\t$1/g;
@@ -1328,7 +1329,8 @@
   # there are multiple qunks in the first place!
   if ((scalar (@qunkrefs)) > 1) {
     foreach my $tag (keys (%non_unanimous_tags)) {
-      my $everyone_has_this_tag = 1;
+# tdb: we don't want to have unanimous tags
+      my $everyone_has_this_tag = 0;
       foreach my $qunkref (@qunkrefs) {
         if ((! (defined ($$qunkref{'tags'})))
             or (! (grep ($_ eq $tag, @{$$qunkref{'tags'}})))) {
@@ -1521,7 +1523,8 @@

     unless ( exists $fileinfo_printed{$b} ) {
       if ($fbegun) {
-        $beauty .= ", ";
+# tdb: hacked to put a newline after each one
+        $beauty .= ",\n";
       } else {
         $fbegun = 1;
       }

File Contents

# User Rev Content
1 tdb 1.5 #!/usr/bin/perl -w
2    
3     use CGI;
4     $query=new CGI;
5     my($period)=$query->param('period');
6     $period = "today" unless defined $period;
7 tdb 1.16 my($modulelist)=$query->param('module');
8     my $moduleext=""; $moduleext=":$modulelist" if defined $modulelist;
9 tdb 1.5
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 tdb 1.16 $heading = "i-scream CVS$moduleext commits in the past $days day(s)";
16 tdb 1.5 $days--;
17 tdb 1.26 $firstdate = ">" . `/bin/date -v-${days}d +%Y/%m/%d`;
18 tdb 1.16 }
19     elsif($period eq "date") {
20     my($date)=$query->param('date');
21 tdb 1.25 $date = `/bin/date +%Y/%m/%d` unless defined $date;
22 tdb 1.16 $heading = "i-scream CVS$moduleext commits on $date";
23     $firstdate = "$date 00:00<$date 23:59"
24 tdb 1.5 }
25 tdb 1.18 elsif($period eq "since") {
26     my($date)=$query->param('date');
27 tdb 1.25 $date = `/bin/date +%Y/%m/%d` unless defined $date;
28 tdb 1.18 $heading = "i-scream CVS$moduleext commits since $date";
29     $firstdate = ">$date";
30     }
31 tdb 1.5 elsif($period eq "thisweek") {
32 tdb 1.16 $firstdate = ">last Sunday";
33     $heading = "i-scream CVS$moduleext commits this week";
34 tdb 1.5 }
35     else {
36 tdb 1.16 # default to "today only"
37 tdb 1.25 $firstdate = ">" . `/bin/date +%Y/%m/%d`;
38 tdb 1.16 $heading = "Today's i-scream CVS$moduleext commits";
39 tdb 1.5 }
40 tdb 1.1
41 tdb 1.10 my($cvsroot) = "/cvs/i-scream";
42    
43     $modulelist = `ls $cvsroot` unless defined $modulelist;
44 tdb 1.17 $modulelist =~ s/[\r\n]/ /gm;
45 tdb 1.1
46 tdb 1.25 my($cvs2clpath) = "/usr/local/bin/cvs2cl";
47 tdb 1.28 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 tdb 1.25 my($updatecmd) = "/home/iscream/bin/fullcvsupdate.sh $modulelist";
49     my($logcmd) = "cd /tmp/i-scream/cvstmp && $cvs2clpath $cvs2clargs";
50 tdb 1.13
51 tdb 1.25 my ($left) = "../htdocs/left.inc" ;
52     my ($title) = "../htdocs/title.inc";
53     my ($bottom) = "../htdocs/bottom.inc";
54 tdb 1.1
55 tdb 1.10 print "Content-type: text/html\n\n";
56    
57 tdb 1.1 print <<"END";
58     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
59    
60     <html>
61    
62     <head>
63 tdb 1.7 <title>The i-scream Project Commit Log</title>
64 tdb 1.1 </head>
65    
66 tdb 1.14 <body bgcolor="#ffffff" link="#0000ff" alink="#3333cc" vlink="#3333cc" text="#000066">
67 tdb 1.1
68 tdb 1.12 <table border="0" cellpadding="2" cellspacing="2">
69     <tr>
70     <td valign="top">
71 tdb 1.13 END
72    
73     &print_html($left);
74 tdb 1.12
75     print <<"END";
76     </td>
77     <td valign="top">
78 tdb 1.13 END
79 tdb 1.12
80 tdb 1.13 &print_html($title);
81 tdb 1.12
82 tdb 1.13 print <<"END";
83 tdb 1.8 <h2>$heading</h2>
84 tdb 1.5 END
85 tdb 1.1
86 tdb 1.22 print `$updatecmd >/dev/null 2>&1`;
87 tdb 1.9
88 tdb 1.5 my(@modules) = split (/\s+/, $modulelist);
89    
90     foreach my $module (@modules) {
91    
92 tdb 1.11 print "<table border=\"0\" bgcolor=\"#000066\" cellpadding=\"5\" width=\"100%\">\n\n";
93 tdb 1.25 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 tdb 1.8 print "<tr><td bgcolor=\"white\">\n";
95 tdb 1.5
96     my(@lines) = `$logcmd $module 2>&1`;
97     if(@lines == 0) {
98 tdb 1.8 print "There have been no commits in this module during this period.\n";
99 tdb 1.5 }
100     else {
101     foreach my $line (@lines) {
102 tdb 1.7
103 tdb 1.16 if ($line =~ /^([0-9]{4}-[0-9]{2}-[0-9]{2}.*?)\s+([^\s]+)\s+<([^\s]+)>$/) {
104     print "\n<font color=\"blue\">\n<b>";
105 tdb 1.7 print HTML_encode($1);
106 tdb 1.16 print "</b>\n<i>";
107 tdb 1.27 print " committed by <a href=\"mailto:$3\" style=\"text-decoration: none;\">";
108 tdb 1.16 print HTML_encode("$2");
109     print "</a></i>\n</font>\n"
110     }
111 tdb 1.20 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 tdb 1.27 print " committed by ";
116 tdb 1.20 print HTML_encode("$2");
117     print "</i>\n</font>\n"
118     }
119 tdb 1.19 elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) {
120 tdb 1.16 my ($file, $rest, $ext) = ($1, $2, $3);
121     print "<code>";
122 tdb 1.25 print "<a href=\"http://cvs.i-scream.org/$file\" style=\"text-decoration: none;\">";
123 tdb 1.16 print HTML_encode($file);
124     print "</a> ";
125 tdb 1.22 if($rest =~ /\((\S+)\.(\d+)(.*)\)/) {
126 tdb 1.25 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 tdb 1.16 my $diff = ".diff?r1=$oldrev&r2=$newrev";
142 tdb 1.25 print "(<a href=\"http://cvs.i-scream.org/$file$diff\" style=\"text-decoration: none;\">";
143     print HTML_encode("$start.$end");
144 tdb 1.16 print "</a>";
145 tdb 1.25 print HTML_encode("$other)");
146 tdb 1.16 }
147     else {
148     print HTML_encode($rest);
149     }
150     }
151     else {
152     print HTML_encode($rest);
153     }
154     print HTML_encode($ext);
155     print "</code><br>\n"
156 tdb 1.7 }
157     else {
158     chop $line;
159     print "<code>";
160     print HTML_encode($line);
161 tdb 1.11 print "</code><br>\n"
162 tdb 1.7 }
163 tdb 1.5 }
164     }
165 tdb 1.8 print "</td></tr>\n";
166 tdb 1.1
167 tdb 1.7 print "</table><p>\n\n";
168 tdb 1.1 }
169    
170 tdb 1.13 &print_html($bottom);
171    
172 tdb 1.1 print <<"END";
173 tdb 1.12
174     </td>
175     </tr>
176     </table>
177 tdb 1.7
178 tdb 1.1 </body>
179    
180     </html>
181     END
182    
183     exit 0;
184    
185     #------------------------------------------------------
186     # sub HTML_encode
187     #
188     # escape HTML characters that may cause problems when
189     # shown either in the <body> or within text fields.
190     #------------------------------------------------------
191     sub HTML_encode ($){
192     my ($encoded) = @_;
193     $encoded =~ s/&/&amp;/g;
194     $encoded =~ s/"/&quot;/g;
195     $encoded =~ s/</&lt;/g;
196     $encoded =~ s/>/&gt;/g;
197     return $encoded;
198 tdb 1.13 }
199    
200     # Print a file without escaping HTML: -
201     sub print_html ($) {
202     my ($filename) = @_;
203     print `cat $filename 2>&1`;
204 tdb 1.1 }