From: Tim Bishop <tim@bishnet.net>
Date: Mon, 12 May 2003 07:49:58 +0000 (+0000)
Subject: New code to handle diff's of initial versions on branches.
X-Git-Url: http://git.i-scream.org/?a=commitdiff_plain;h=91ef9103955ee48630591eb448c2772b4c595148;p=www.i-scream.org.git

New code to handle diff's of initial versions on branches.
---

diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index cb1671d..645f641 100755
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -44,7 +44,6 @@ $modulelist = `ls $cvsroot` unless defined $modulelist;
 $modulelist =~ s/[\r\n]/ /gm;
 
 my($cvs2clpath) = "/usr/local/bin/cvs2cl";
-#my($cvs2clargs) = "--stdout --no-wrap -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
 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";
@@ -118,22 +117,32 @@ foreach my $module (@modules) {
                 print "</i>\n</font>\n"
             }
             elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) {
-                #chop $line;
                 my ($file, $rest, $ext) = ($1, $2, $3);
                 print "<code>";
                 print "<a href=\"http://cvs.i-scream.org/$file\" style=\"text-decoration: none;\">";
                 print HTML_encode($file);
                 print "</a> ";
                 if($rest =~ /\((\S+)\.(\d+)(.*)\)/) {
-                    my $newrev = "$1.$2";
-                    my $oldminver = $2-1;
-                    my $oldrev = "$1.$oldminver";
-                    if($2 != 1) {
+                    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 "(<a href=\"http://cvs.i-scream.org/$file$diff\" style=\"text-decoration: none;\">";
-                        print HTML_encode("$1.$2");
+                        print HTML_encode("$start.$end");
                         print "</a>";
-                        print HTML_encode("$3)");
+                        print HTML_encode("$other)");
                     }
                     else {
                         print HTML_encode($rest);