[Cvs-cvs] ccvs/contrib ChangeLog log_accum.pl

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/05/15 02:00:08

Modified files:
        contrib        : ChangeLog log_accum.pl 

Log message:
        * log_accum.pl: Simplify and fix ViewCVS URLs.
        (Patch from Sylvain Beucler <address@hidden>.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/contrib/ChangeLog.diff?tr1=1.194&tr2=1.195&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/contrib/log_accum.pl.diff?tr1=1.30&tr2=1.31&r1=text&r2=text

Patches:
Index: ccvs/contrib/ChangeLog
diff -u ccvs/contrib/ChangeLog:1.194 ccvs/contrib/ChangeLog:1.195
--- ccvs/contrib/ChangeLog:1.194        Sun May 14 04:03:47 2006
+++ ccvs/contrib/ChangeLog      Mon May 15 02:00:08 2006
@@ -1,5 +1,8 @@
 2006-05-14  Derek Price  <address@hidden>
 
+       * log_accum.pl: Simplify and fix ViewCVS URLs.
+       (Patch from Sylvain Beucler <address@hidden>.)
+
        * log_accum.pl (parse_config): Add header comment block.
        (process_argv): Remove TODO asterisks in header comment block.
        (build_message_body): Don't require $config.
Index: ccvs/contrib/log_accum.pl
diff -u ccvs/contrib/log_accum.pl:1.30 ccvs/contrib/log_accum.pl:1.31
--- ccvs/contrib/log_accum.pl:1.30      Sun May 14 04:03:47 2006
+++ ccvs/contrib/log_accum.pl   Mon May 15 02:00:08 2006
@@ -990,16 +990,17 @@
     my ($url, $cvsroot, $branch, $oldrev, $newrev, $module, @list) = @_;
     my @urls;
 
-    my $args = "?cvsroot=" . urlencode $cvsroot;
-    $args .= "&only_with_tag=$branch" if $branch;
+    my $baseurl = urlencode "$url/$module";
+    my $baseargs = "?cvsroot=" . urlencode $cvsroot;
+       $baseargs .= "&only_with_tag=$branch" if $branch;
 
     # Import and new directories only send a single dir.  Special case it.
-    return urlencode ("$url/$module") . "/$args" unless @list;
+    return "$baseurl/$baseargs" unless @list;
 
-    my $baseurl = urlencode "$url/$module";
     foreach (@list)
     {
        my $out = "$baseurl/" . urlencode ($_);
+       my $args = $baseargs;
 
        # FIXME: if file is -kb, consider binary
         if ($_ =~ /\.(?:pdf|gif|jpg|mpg)$/i or -B $_ || !$oldrev->{$_})
@@ -1010,9 +1011,8 @@
        else
        {
            # otherwise link to the diff
-           $args .= "&tr1=" . $oldrev->{$_};
-           $args .= "&tr2=" . $newrev->{$_};
-           $args .= "&r1=text&r2=text";
+           $args .= "&r1=" . $oldrev->{$_};
+           $args .= "&r2=" . $newrev->{$_};
        }
 
        $out .= $args;