cvsserver: further improve messages on commit and status

commit: Also print the old revision similar to how cvs does it and
prepend a line stating the filename so that one can actually
understand what happened when commiting more than one file.

status: Fix the RCS filename displayed. The directory was
printed twice.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index f21f2f121fdafe0b657187e9881020644c338867..68aa75255e21ff8231fe2f54e5772f8cbb026fce 100755 (executable)
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -1069,6 +1069,7 @@ sub req_ci
     $log->info("Created index '$file_index' with for head $state->{module} - exit status $?");
 
     my @committedfiles = ();
     $log->info("Created index '$file_index' with for head $state->{module} - exit status $?");
 
     my @committedfiles = ();

+    my %oldmeta;

 
     # foreach file specified on the command line ...
     foreach my $filename ( @{$state->{args}} )
 
     # foreach file specified on the command line ...
     foreach my $filename ( @{$state->{args}} )


@@ -1079,6 +1080,7 @@ sub req_ci
         next unless ( exists $state->{entries}{$filename}{modified_filename} or not $state->{entries}{$filename}{unchanged} );
 
         my $meta = $updater->getmeta($filename);
         next unless ( exists $state->{entries}{$filename}{modified_filename} or not $state->{entries}{$filename}{unchanged} );
 
         my $meta = $updater->getmeta($filename);

+       $oldmeta{$filename} = $meta;

 
         my $wrev = revparse($filename);
 
 
         my $wrev = revparse($filename);
 


@@ -1207,16 +1209,17 @@ sub req_ci
 
         $log->debug("Checked-in $dirpart : $filename");
 
 
         $log->debug("Checked-in $dirpart : $filename");
 

+       print "M $state->{CVSROOT}/$state->{module}/$filename,v  <--  $dirpart$filepart\n";

         if ( defined $meta->{filehash} && $meta->{filehash} eq "deleted" )
         {
         if ( defined $meta->{filehash} && $meta->{filehash} eq "deleted" )
         {

-            print "M new revision: delete\n";
+            print "M new revision: delete; previous revision: 1.$oldmeta{$filename}{revision}\n";

             print "Remove-entry $dirpart\n";
             print "$filename\n";
         } else {
             if ($meta->{revision} == 1) {
                print "M initial revision: 1.1\n";
             } else {
             print "Remove-entry $dirpart\n";
             print "$filename\n";
         } else {
             if ($meta->{revision} == 1) {
                print "M initial revision: 1.1\n";
             } else {

-               print "M new revision: 1.$meta->{revision}\n";
+               print "M new revision: 1.$meta->{revision}; previous revision: 1.$oldmeta{$filename}{revision}\n";

             }
             print "Checked-in $dirpart\n";
             print "$filename\n";
             }
             print "Checked-in $dirpart\n";
             print "$filename\n";


@@ -1303,7 +1306,7 @@ sub req_status
         }
         if ( defined($meta->{revision}) )
         {
         }
         if ( defined($meta->{revision}) )
         {

-            print "M Repository revision:\t1." . $meta->{revision} . "\t$state->{repository}/$filename,v\n";
+            print "M Repository revision:\t1." . $meta->{revision} . "\t$state->{CVSROOT}/$state->{module}/$filename,v\n";

             print "M Sticky Tag:\t\t(none)\n";
             print "M Sticky Date:\t\t(none)\n";
             print "M Sticky Options:\t\t(none)\n";
             print "M Sticky Tag:\t\t(none)\n";
             print "M Sticky Date:\t\t(none)\n";
             print "M Sticky Options:\t\t(none)\n";