cvsserver: Be more chatty
Submit some additional messages to the client on commit and update. Inspired by the standard CVS server though a little more terse. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Frank Lichtenheld committed
Mar 13, 2007 at 18:25 UTC
459bad77e72122f200314a4b0a059a845e0072b3
1 file changed
+8
git-cvsserver.perl
+8
@@ -947,6 +947,7 @@ sub req_update
947
948
# we need to merge with the local changes ( M=successful merge, C=conflict merge )
949
$log->info("Merging $file_local, $file_old, $file_new");
950
+ print "M Merging differences between 1.$oldmeta->{revision} and 1.$meta->{revision} into $filename\n";
951
952
$log->debug("Temporary directory for merge is $dir");
953
@@ -973,6 +974,7 @@ sub req_update
974
elsif ( $return == 1 )
975
{
976
$log->info("Merged with conflicts");
977
+ print "E cvs update: conflicts found in $filename\n";
978
print "M C $filename\n";
979
980
# Don't want to actually _DO_ the update if -n specified
@@ -1207,9 +1209,15 @@ sub req_ci
1209
1210
if ( defined $meta->{filehash} && $meta->{filehash} eq "deleted" )
1211
{
1212
+ print "M new revision: delete\n";
1213
print "Remove-entry $dirpart\n";
1214
print "$filename\n";
1215
} else {
1216
+ if ($meta->{revision} == 1) {
1217
+ print "M initial revision: 1.1\n";
1218
+ } else {
1219
+ print "M new revision: 1.$meta->{revision}\n";
1220
+ }
1221
print "Checked-in $dirpart\n";
1222
print "$filename\n";
1223
my $kopts = kopts_from_path($filepart);