summaryrefslogtreecommitdiff
path: root/git-cvsserver.perl
diff options
context:
space:
mode:
authorFrank Lichtenheld <frank@lichtenheld.de>2007-03-13 17:25:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-14 09:09:33 (GMT)
commit392e28170bcd2dec93ed629e7f8b2c22c560bf34 (patch)
tree4f3a955b75452aa5a89a00817e16747344225854 /git-cvsserver.perl
parent459bad77e72122f200314a4b0a059a845e0072b3 (diff)
downloadgit-392e28170bcd2dec93ed629e7f8b2c22c560bf34.zip
git-392e28170bcd2dec93ed629e7f8b2c22c560bf34.tar.gz
git-392e28170bcd2dec93ed629e7f8b2c22c560bf34.tar.bz2
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>
Diffstat (limited to 'git-cvsserver.perl')
-rwxr-xr-xgit-cvsserver.perl9
1 files changed, 6 insertions, 3 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index f21f2f1..68aa752 100755
--- 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 = ();
+ my %oldmeta;
# 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);
+ $oldmeta{$filename} = $meta;
my $wrev = revparse($filename);
@@ -1207,16 +1209,17 @@ sub req_ci
$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" )
{
- 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 "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";
@@ -1303,7 +1306,7 @@ sub req_status
}
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";