undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ml/cvsserver' into next

Browse Source 
* ml/cvsserver:
  cvsserver: Eclipse compat -- now "compare with latest from HEAD" works
This commit is contained in:
Junio C Hamano 2006-03-01 22:27:06 -08:00
commit 0c1fc940ee
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
git-cvsserver.perl
View File

@ -714,8 +714,27 @@ sub req_update
#$log->debug("Target revision is $meta->{revision}, current working revision is $wrev"); #$log->debug("Target revision is $meta->{revision}, current working revision is $wrev");
# Files are up to date if the working copy and repo copy have the same revision, and the working copy is unmodified _and_ the user hasn't specified -C # Files are up to date if the working copy and repo copy have the same revision,
next if ( defined ( $wrev ) and defined($meta->{revision}) and $wrev == $meta->{revision} and $state->{entries}{$filename}{unchanged} and not exists ( $state->{opt}{C} ) ); # and the working copy is unmodified _and_ the user hasn't specified -C
next if ( defined ( $wrev )
and defined($meta->{revision})
and $wrev == $meta->{revision}
and $state->{entries}{$filename}{unchanged}
and not exists ( $state->{opt}{C} ) );
# If the working copy and repo copy have the same revision,
# but the working copy is modified, tell the client it's modified
if ( defined ( $wrev )
and defined($meta->{revision})
and $wrev == $meta->{revision}
and not exists ( $state->{opt}{C} ) )
{
$log->info("Tell the client the file is modified");
print "MT text U\n";
print "MT fname $filename\n";
print "MT newline\n";
next;
}
if ( $meta->{filehash} eq "deleted" ) if ( $meta->{filehash} eq "deleted" )
{ {
@ -727,7 +746,8 @@ sub req_update
print "Removed $dirpart\n"; print "Removed $dirpart\n";
print "$filepart\n"; print "$filepart\n";
} }
elsif ( not defined ( $state->{entries}{$filename}{modified_hash} ) or $state->{entries}{$filename}{modified_hash} eq $oldmeta->{filehash} ) elsif ( not defined ( $state->{entries}{$filename}{modified_hash} )
or $state->{entries}{$filename}{modified_hash} eq $oldmeta->{filehash} )
{ {
$log->info("Updating '$filename'"); $log->info("Updating '$filename'");
# normal update, just send the new revision (either U=Update, or A=Add, or R=Remove) # normal update, just send the new revision (either U=Update, or A=Add, or R=Remove)
@ -763,6 +783,7 @@ sub req_update
# transmit file # transmit file
transmitfile($meta->{filehash}); transmitfile($meta->{filehash});
} else { } else {
$log->info("Updating '$filename'");
my ( $filepart, $dirpart ) = filenamesplit($meta->{name}); my ( $filepart, $dirpart ) = filenamesplit($meta->{name});
my $dir = tempdir( DIR => $TEMP_DIR, CLEANUP => 1 ) . "/"; my $dir = tempdir( DIR => $TEMP_DIR, CLEANUP => 1 ) . "/";