Skip to content

Commit

Permalink
cvsserver: Be more chatty
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Frank Lichtenheld authored and Junio C Hamano committed Mar 14, 2007
1 parent c49b260 commit 459bad7
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions git-cvsserver.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 459bad7

Please sign in to comment.