From: Tim Bishop <tim@bishnet.net>
Date: Sun, 9 Dec 2001 01:04:12 +0000 (+0000)
Subject: Fixed the link to diffs when there was a tag associated with the commit.
X-Git-Tag: PRE_WWW_REDESIGN~90
X-Git-Url: http://git.i-scream.org/?a=commitdiff_plain;ds=sidebyside;h=3f530c717b353dd37416c5cf8d6dd19ffaf34478;hp=bbcc7379f05c35c7f302c0f9b191100e9a40fa03;p=www.i-scream.org.git

Fixed the link to diffs when there was a tag associated with the commit.
---

diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index c234d8f..da87f36 100755
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -108,22 +108,23 @@ foreach my $module (@modules) {
                 print HTML_encode("$2");
                 print "</a></i>\n</font>\n"
             }
-            elsif($line =~ /(\S+) (\(\S+\))([,:])/) {
+            elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) {
                 #chop $line;
                 my ($file, $rest, $ext) = ($1, $2, $3);
                 print "<code>";
                 print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file\" style=\"text-decoration: none;\">";
                 print HTML_encode($file);
                 print "</a> ";
-                if($rest =~ /\((\S).(\S+)\)/) {
+                if($rest =~ /\((\d+).(\d+)(.*)\)/) {
                     my $newrev = "$1.$2";
                     my $oldminver = $2-1;
                     my $oldrev = "$1.$oldminver";
                     if(!($1==1 && $2==1)) {
                         my $diff = ".diff?r1=$oldrev&r2=$newrev";
-                        print "<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">";
-                        print HTML_encode($rest);
+                        print "(<a href=\"/cgi-bin/cvs/viewcvs.cgi/$file$diff\" style=\"text-decoration: none;\">";
+                        print HTML_encode("$1.$2");
                         print "</a>";
+                        print HTML_encode("$3)");
                     }
                     else {
                         print HTML_encode($rest);