Index: ossp-pkg/shiela/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/shiela/ChangeLog,v
rcsdiff -q -kk '-r1.37' '-r1.38' -u '/v/ossp/cvs/ossp-pkg/shiela/ChangeLog,v' 2>/dev/null
--- ChangeLog	2004/01/16 12:09:03	1.37
+++ ChangeLog	2004/05/05 13:07:21	1.38
@@ -9,7 +9,13 @@
 
   ChangeLog
 
-  Changes between 1.0.4 and 1.0.5 (23-Dec-2002 to xx-Oct-2003):
+  Changes between 1.0.4 and 1.0.5 (23-Dec-2002 to xx-May-2004):
+
+   *) Provide "cvs rdiff" support in diff outputs.
+      [Ralf S. Engelschall]
+
+   *) Support CVS 1.12.x (option -l no longer existing).
+      [Ralf S. Engelschall]
 
    *) Fix a nasty syntax error in shiela-install.sh occurring
       if variables are passes as command line parameters.
Index: ossp-pkg/shiela/shiela.pl
RCS File: /v/ossp/cvs/ossp-pkg/shiela/shiela.pl,v
rcsdiff -q -kk '-r1.50' '-r1.51' -u '/v/ossp/cvs/ossp-pkg/shiela/shiela.pl,v' 2>/dev/null
--- shiela.pl	2002/12/23 14:45:16	1.50
+++ shiela.pl	2004/05/05 13:07:21	1.51
@@ -580,7 +580,7 @@
     STDERR->flush; # because of fork() behind open2()!
     $cvs->{rfd} = new IO::Handle;
     $cvs->{wfd} = new IO::Handle;
-    $cvs->{pid} = IPC::Open2::open2($cvs->{rfd}, $cvs->{wfd}, "$program -Q -l -n server")
+    $cvs->{pid} = IPC::Open2::open2($cvs->{rfd}, $cvs->{wfd}, "$program -f -Q -n server")
         || die "cannot spawn CVS server process `$program server'";
     print STDERR "cvs server: spawned (pid $cvs->{pid})\n" if ($trace);
     bless ($cvs, $class);
@@ -1248,14 +1248,14 @@
     #   annotate the files with the branch they stay on
     my $cvsstat = '';
     if (not $RT->{useserver}) {
-        my $io = new IO::File "$RT->{cvs} -f -l -Q -n status ".join(' ', @cvsfiles)."|"
+        my $io = new IO::File "$RT->{cvs} -f -Q -n status ".join(' ', @cvsfiles)."|"
             || die "unable to open CVS command pipe for reading";
         $cvsstat .= $_ while (<$io>);
         $io->close;
     }
     else {
         my $cvs = new CVS ($RT->{cvs}, $RT->{cvsroot});
-        $cvs->global_options("-l", "-Q", "-n");
+        $cvs->global_options("-Q", "-n");
         $cvs->directory($cvsdir);
         foreach my $cvsfile (@cvsfiles) {
             $cvs->entry($cvsfile);
@@ -1488,7 +1488,7 @@
                     print STDERR "cvs import: Ignoring this operation - don't expect log messages!\n";
                     exit(0);
                 }
-                my $io = new IO::File "$RT->{cvs} -f -l -Q -n log -r$It '$Is'|"
+                my $io = new IO::File "$RT->{cvs} -f -Q -n log -r$It '$Is'|"
                     || die "unable to open CVS command pipe for reading";
                 $rcslog = $_ while (<$io>);
                 $io->close;
@@ -1610,7 +1610,7 @@
         if ($Io eq 'R' and $Iv eq 'NONE') {
             my $rcslog ='';
             if (not $RT->{useserver}) {
-                my $io = new IO::File "$RT->{cvs} -f -l -Q -n log '$Is'|"
+                my $io = new IO::File "$RT->{cvs} -f -Q -n log '$Is'|"
                     || die "unable to open CVS command pipe for reading";
                 $rcslog .= $_ while (<$io>);
                 $io->close;
@@ -1633,7 +1633,7 @@
         my $rcslog = '';
         if ($Io eq 'A' or $Io eq 'M' or $Io eq 'R') {
             if (not $RT->{useserver}) {
-                my $io = new IO::File "$RT->{cvs} -f -l -Q -n log -r$Iv '$Is'|"
+                my $io = new IO::File "$RT->{cvs} -f -Q -n log -r$Iv '$Is'|"
                     || die "unable to open CVS command pipe for reading";
                 $rcslog .= $_ while (<$io>);
                 $io->close;
@@ -1669,7 +1669,7 @@
         }
         else {
             if ($Io eq 'A') {
-                my $io = new IO::File "<$Is" || die "unable open $Is for reading";
+                my $io = new IO::File "<$Is" || die "unable to open $Is for reading";
                 my $l = 0;
                 $l++ while (<$io>);
                 $io->close;
@@ -1706,7 +1706,7 @@
             my $io = new IO::File ">$RT->{tmpfile}.all"
                 || die "unable to open temporary file $RT->{tmpfile}.all for writing";
             if (not $RT->{useserver}) {
-                my $cvs = new IO::File "$RT->{cvs} -f -l -Q -n update -p -r$Iv '$Is'|"
+                my $cvs = new IO::File "$RT->{cvs} -f -Q -n update -p -r$Iv '$Is'|"
                     || die "unable to open CVS command pipe for reading";
                 $io->print($_) while (<$cvs>);
                 $cvs->close;
@@ -1789,7 +1789,7 @@
                     my $io = new IO::File ">$RT->{tmpfile}.old"
                         || die "unable to open temporary file $RT->{tmpfile}.old for writing";
                     if (not $RT->{useserver}) {
-                        my $cvs = new IO::File "$RT->{cvs} -f -l -Q -n update -p -r$IV '$Is'|"
+                        my $cvs = new IO::File "$RT->{cvs} -f -Q -n update -p -r$IV '$Is'|"
                             || die "unable to open CVS command pipe for reading";
                         $io->print($_) while (<$cvs>);
                         $cvs->close;
@@ -1810,7 +1810,7 @@
                     $io = new IO::File ">$RT->{tmpfile}.new"
                         || die "unable to open temporary file $RT->{tmpfile}.new for writing";
                     if (not $RT->{useserver}) {
-                        my $cvs = new IO::File "$RT->{cvs} -f -l -Q -n update -p -r$Iv '$Is'|"
+                        my $cvs = new IO::File "$RT->{cvs} -f -Q -n update -p -r$Iv '$Is'|"
                             || die "unable to open CVS command pipe for reading";
                         $io->print($_) while (<$cvs>);
                         $cvs->close;
@@ -1856,7 +1856,7 @@
                 #   generate textual change patch script
                 my $d = '';
                 if (not $RT->{useserver}) {
-                    my $io = new IO::File "$RT->{cvs} -f -l -Q -n diff -u -r$IV -r$Iv '$Is'|"
+                    my $io = new IO::File "$RT->{cvs} -f -Q -n diff -u -r$IV -r$Iv '$Is'|"
                         || die "unable to open CVS command pipe for reading";
                     $d .= $_ while (<$io>);
                     $io->close;
@@ -2257,6 +2257,16 @@
                     $O .= "$prefix$url\n";
                 }
             }
+            elsif ($style eq 'rdiff') {
+                $O .= "To re-generate the difference summary of this commit, execute:\n";
+                foreach $file (sort(keys(%{$IN->{file}}))) {
+                    $O .= "cvs rdiff -uN " .
+                          " -r" . $IN->{file}->{$file}->{oldrev} .
+                          " -r" . $IN->{file}->{$file}->{newrev} .
+                          " " . $file .
+                          "\n";
+                }
+            }
             elsif ($style eq 'patch:plain') {
                 foreach $file (sort(keys(%{$IN->{file}}))) {
                     next if ($IN->{file}->{$file}->{op} eq 'T');