mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvsserver: further improve messages on commit and status

Browse Source 
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>
This commit is contained in:
Frank Lichtenheld
2007-03-13 18:25:23 +01:00
committed by Junio C Hamano
parent 459bad77e7
commit 392e28170b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
git-cvsserver.perl
View File

@ -1069,6 +1069,7 @@ sub req_ci
$log->info("Created index '$file_index' with for head $state->{module} - exit status $?"); $log->info("Created index '$file_index' with for head $state->{module} - exit status $?");
my @committedfiles = (); my @committedfiles = ();
my %oldmeta;
# foreach file specified on the command line ... # foreach file specified on the command line ...
foreach my $filename ( @{$state->{args}} ) 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} ); next unless ( exists $state->{entries}{$filename}{modified_filename} or not $state->{entries}{$filename}{unchanged} );
my $meta = $updater->getmeta($filename); 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 "Remove-entry $dirpart\n";
print "$filename\n"; print "$filename\n";
} else { } else {
if ($meta->{revision} == 1) { if ($meta->{revision} == 1) {
print "M initial revision: 1.1\n"; print "M initial revision: 1.1\n";
} else { } 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 "Checked-in $dirpart\n";
print "$filename\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 Tag:\t\t(none)\n";
print "M Sticky Date:\t\t(none)\n"; print "M Sticky Date:\t\t(none)\n";
print "M Sticky Options:\t\t(none)\n"; print "M Sticky Options:\t\t(none)\n";