aboutsummaryrefslogtreecommitdiff
path: root/git-cvsserver.perl
diff options
context:
space:
mode:
authorFrank Lichtenheld <frank@lichtenheld.de>2007-03-13 18:25:22 +0100
committerJunio C Hamano <junkio@cox.net>2007-03-14 02:09:32 -0700
commit459bad77e72122f200314a4b0a059a845e0072b3 (patch)
treeddff7d7e30623c382f38ed4f6a7749c417b9b20e /git-cvsserver.perl
parentc49b260e99d3e0fdd5d84615091ebb969adef5b2 (diff)
downloadgit-459bad77e72122f200314a4b0a059a845e0072b3.tar.gz
git-459bad77e72122f200314a4b0a059a845e0072b3.tar.xz
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>
Diffstat (limited to 'git-cvsserver.perl')
-rwxr-xr-xgit-cvsserver.perl8
1 files changed, 8 insertions, 0 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 65fcc8404..f21f2f121 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -947,6 +947,7 @@ sub req_update
# we need to merge with the local changes ( M=successful merge, C=conflict merge )
$log->info("Merging $file_local, $file_old, $file_new");
+ print "M Merging differences between 1.$oldmeta->{revision} and 1.$meta->{revision} into $filename\n";
$log->debug("Temporary directory for merge is $dir");
@@ -973,6 +974,7 @@ sub req_update
elsif ( $return == 1 )
{
$log->info("Merged with conflicts");
+ print "E cvs update: conflicts found in $filename\n";
print "M C $filename\n";
# Don't want to actually _DO_ the update if -n specified
@@ -1207,9 +1209,15 @@ sub req_ci
if ( defined $meta->{filehash} && $meta->{filehash} eq "deleted" )
{
+ print "M new revision: delete\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 "Checked-in $dirpart\n";
print "$filename\n";
my $kopts = kopts_from_path($filepart);