X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=cgi-bin%2Fcvslog.cgi;h=0f86725d0380cbdd2846b99b4aa928726758ef2f;hb=f1ec58880971dd6a2f830bbd3d9b698a7610d12a;hp=80e22a80ed8da0344ad68b174b15175202b20e9a;hpb=ddccfb58d6052c48d0e68827c2b4bbb29eea5665;p=www.i-scream.org.git
diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index 80e22a8..0f86725 100755
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -44,7 +44,7 @@ $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($cvs2clargs) = "--stdout --no-wrap --no-common-dir -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";
@@ -104,7 +104,7 @@ foreach my $module (@modules) {
print "\n\n";
print HTML_encode($1);
print "\n";
- print " commited by ";
+ print " committed by ";
print HTML_encode("$2");
print "\n\n"
}
@@ -112,17 +112,17 @@ foreach my $module (@modules) {
print "\n\n";
print HTML_encode($1);
print "\n";
- print " commited by ";
+ 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);
+ elsif($line =~ /([^\s]+) (\([^,^\)]+(,[^\)]+)?\))([,:])/) {
+ my ($file, $rev, $tags, $ext) = ($1, $2, $3, $4);
print "";
print "";
print HTML_encode($file);
print " ";
- if($rest =~ /\((\S+)\.(\d+)(.*)\)/) {
+ if($rev =~ /\(([^\s]+)\.(\d+)(.*)\)/) {
my $start = $1;
my $end = $2;
my $other = $3;
@@ -145,17 +145,17 @@ foreach my $module (@modules) {
print HTML_encode("$other)");
}
else {
- print HTML_encode($rest);
+ print HTML_encode($rev);
}
}
else {
- print HTML_encode($rest);
+ print HTML_encode($rev);
}
print HTML_encode($ext);
print "
\n"
}
else {
- chop $line;
+ chomp $line;
print "";
print HTML_encode($line);
print "
\n"