cvsserver: Add version awareness to argsfromdir
Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthew Ogilvie
Junio C Hamano
parent
bfdafa099e
commit
d66e8f8cf3
@ -2226,55 +2226,222 @@ sub argsplit
|
||||
}
|
||||
}
|
||||
|
||||
# This method uses $state->{directory} to populate $state->{args} with a list of filenames
|
||||
sub argsfromdir
|
||||
# Used by argsfromdir
|
||||
sub expandArg
|
||||
{
|
||||
my $updater = shift;
|
||||
my ($updater,$outNameMap,$outDirMap,$path,$isDir) = @_;
|
||||
|
||||
$state->{args} = [] if ( scalar(@{$state->{args}}) == 1 and $state->{args}[0] eq "." );
|
||||
my $fullPath = filecleanup($path);
|
||||
|
||||
return if ( scalar ( @{$state->{args}} ) > 1 );
|
||||
|
||||
my @gethead = @{$updater->gethead};
|
||||
|
||||
# push added files
|
||||
foreach my $file (keys %{$state->{entries}}) {
|
||||
if ( exists $state->{entries}{$file}{revision} &&
|
||||
$state->{entries}{$file}{revision} eq '0' )
|
||||
{
|
||||
push @gethead, { name => $file, filehash => 'added' };
|
||||
}
|
||||
}
|
||||
|
||||
if ( scalar(@{$state->{args}}) == 1 )
|
||||
# Is it a directory?
|
||||
if( defined($state->{dirMap}{$fullPath}) ||
|
||||
defined($state->{dirMap}{"$fullPath/"}) )
|
||||
{
|
||||
my $arg = $state->{args}[0];
|
||||
$arg .= $state->{prependdir} if ( defined ( $state->{prependdir} ) );
|
||||
# It is a directory in the user's sandbox.
|
||||
$isDir=1;
|
||||
|
||||
$log->info("Only one arg specified, checking for directory expansion on '$arg'");
|
||||
|
||||
foreach my $file ( @gethead )
|
||||
if(defined($state->{entries}{$fullPath}))
|
||||
{
|
||||
next if ( $file->{filehash} eq "deleted" and not defined ( $state->{entries}{$file->{name}} ) );
|
||||
next unless ( $file->{name} =~ /^$arg\// or $file->{name} eq $arg );
|
||||
push @{$state->{args}}, $file->{name};
|
||||
$log->fatal("Inconsistent file/dir type");
|
||||
die "Inconsistent file/dir type";
|
||||
}
|
||||
}
|
||||
elsif(defined($state->{entries}{$fullPath}))
|
||||
{
|
||||
# It is a file in the user's sandbox.
|
||||
$isDir=0;
|
||||
}
|
||||
my($revDirMap,$otherRevDirMap);
|
||||
if(!defined($isDir) || $isDir)
|
||||
{
|
||||
# Resolve version tree for sticky tag:
|
||||
# (for now we only want list of files for the version, not
|
||||
# particular versions of those files: assume it is a directory
|
||||
# for the moment; ignore Entry's stick tag)
|
||||
|
||||
# Order of precedence of sticky tags:
|
||||
# -A [head]
|
||||
# -r /tag/
|
||||
# [file entry sticky tag, but that is only relevant to files]
|
||||
# [the tag specified in dir req_Sticky]
|
||||
# [the tag specified in a parent dir req_Sticky]
|
||||
# [head]
|
||||
# Also, -r may appear twice (for diff).
|
||||
#
|
||||
# FUTURE: When/if -j (merges) are supported, we also
|
||||
# need to add relevant files from one or two
|
||||
# versions specified with -j.
|
||||
|
||||
if(exists($state->{opt}{A}))
|
||||
{
|
||||
$revDirMap=$updater->getRevisionDirMap();
|
||||
}
|
||||
elsif( defined($state->{opt}{r}) and
|
||||
ref $state->{opt}{r} eq "ARRAY" )
|
||||
{
|
||||
$revDirMap=$updater->getRevisionDirMap($state->{opt}{r}[0]);
|
||||
$otherRevDirMap=$updater->getRevisionDirMap($state->{opt}{r}[1]);
|
||||
}
|
||||
elsif(defined($state->{opt}{r}))
|
||||
{
|
||||
$revDirMap=$updater->getRevisionDirMap($state->{opt}{r});
|
||||
}
|
||||
else
|
||||
{
|
||||
my($sticky)=getDirStickyInfo($fullPath);
|
||||
$revDirMap=$updater->getRevisionDirMap($sticky->{tag});
|
||||
}
|
||||
|
||||
shift @{$state->{args}} if ( scalar(@{$state->{args}}) > 1 );
|
||||
} else {
|
||||
$log->info("Only one arg specified, populating file list automatically");
|
||||
|
||||
$state->{args} = [];
|
||||
|
||||
foreach my $file ( @gethead )
|
||||
# Is it a directory?
|
||||
if( defined($revDirMap->{$fullPath}) ||
|
||||
defined($otherRevDirMap->{$fullPath}) )
|
||||
{
|
||||
next if ( $file->{filehash} eq "deleted" and not defined ( $state->{entries}{$file->{name}} ) );
|
||||
next unless ( $file->{name} =~ s/^$state->{prependdir}// );
|
||||
push @{$state->{args}}, $file->{name};
|
||||
$isDir=1;
|
||||
}
|
||||
}
|
||||
|
||||
# What to do with it?
|
||||
if(!$isDir)
|
||||
{
|
||||
$outNameMap->{$fullPath}=1;
|
||||
}
|
||||
else
|
||||
{
|
||||
$outDirMap->{$fullPath}=1;
|
||||
|
||||
if(defined($revDirMap->{$fullPath}))
|
||||
{
|
||||
addDirMapFiles($updater,$outNameMap,$outDirMap,
|
||||
$revDirMap->{$fullPath});
|
||||
}
|
||||
if( defined($otherRevDirMap) &&
|
||||
defined($otherRevDirMap->{$fullPath}) )
|
||||
{
|
||||
addDirMapFiles($updater,$outNameMap,$outDirMap,
|
||||
$otherRevDirMap->{$fullPath});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Used by argsfromdir
|
||||
# Add entries from dirMap to outNameMap. Also recurse into entries
|
||||
# that are subdirectories.
|
||||
sub addDirMapFiles
|
||||
{
|
||||
my($updater,$outNameMap,$outDirMap,$dirMap)=@_;
|
||||
|
||||
my($fullName);
|
||||
foreach $fullName (keys(%$dirMap))
|
||||
{
|
||||
my $cleanName=$fullName;
|
||||
if(defined($state->{prependdir}))
|
||||
{
|
||||
if(!($cleanName=~s/^\Q$state->{prependdir}\E//))
|
||||
{
|
||||
$log->fatal("internal error stripping prependdir");
|
||||
die "internal error stripping prependdir";
|
||||
}
|
||||
}
|
||||
|
||||
if($dirMap->{$fullName} eq "F")
|
||||
{
|
||||
$outNameMap->{$cleanName}=1;
|
||||
}
|
||||
elsif($dirMap->{$fullName} eq "D")
|
||||
{
|
||||
if(!$state->{opt}{l})
|
||||
{
|
||||
expandArg($updater,$outNameMap,$outDirMap,$cleanName,1);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$log->fatal("internal error in addDirMapFiles");
|
||||
die "internal error in addDirMapFiles";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# This method replaces $state->{args} with a directory-expanded
|
||||
# list of all relevant filenames (recursively unless -d), based
|
||||
# on $state->{entries}, and the "current" list of files in
|
||||
# each directory. "Current" files as determined by
|
||||
# either the requested (-r/-A) or "req_Sticky" version of
|
||||
# that directory.
|
||||
# Both the input args and the new output args are relative
|
||||
# to the cvs-client's CWD, although some of the internal
|
||||
# computations are relative to the top of the project.
|
||||
sub argsfromdir
|
||||
{
|
||||
my $updater = shift;
|
||||
|
||||
# Notes about requirements for specific callers:
|
||||
# update # "standard" case (entries; a single -r/-A/default; -l)
|
||||
# # Special case: -d for create missing directories.
|
||||
# diff # 0 or 1 -r's: "standard" case.
|
||||
# # 2 -r's: We could ignore entries (just use the two -r's),
|
||||
# # but it doesn't really matter.
|
||||
# annotate # "standard" case
|
||||
# log # Punting: log -r has a more complex non-"standard"
|
||||
# # meaning, and we don't currently try to support log'ing
|
||||
# # branches at all (need a lot of work to
|
||||
# # support CVS-consistent branch relative version
|
||||
# # numbering).
|
||||
#HERE: But we still want to expand directories. Maybe we should
|
||||
# essentially force "-A".
|
||||
# status # "standard", except that -r/-A/default are not possible.
|
||||
# # Mostly only used to expand entries only)
|
||||
#
|
||||
# Don't use argsfromdir at all:
|
||||
# add # Explicit arguments required. Directory args imply add
|
||||
# # the directory itself, not the files in it.
|
||||
# co # Obtain list directly.
|
||||
# remove # HERE: TEST: MAYBE client does the recursion for us,
|
||||
# # since it only makes sense to remove stuff already in
|
||||
# # the sandobx?
|
||||
# ci # HERE: Similar to remove...
|
||||
# # Don't try to implement the confusing/weird
|
||||
# # ci -r bug er.."feature".
|
||||
|
||||
if(scalar(@{$state->{args}})==0)
|
||||
{
|
||||
$state->{args} = [ "." ];
|
||||
}
|
||||
my %allArgs;
|
||||
my %allDirs;
|
||||
for my $file (@{$state->{args}})
|
||||
{
|
||||
expandArg($updater,\%allArgs,\%allDirs,$file);
|
||||
}
|
||||
|
||||
# Include any entries from sandbox. Generally client won't
|
||||
# send entries that shouldn't be used.
|
||||
foreach my $file (keys %{$state->{entries}})
|
||||
{
|
||||
$allArgs{remove_prependdir($file)} = 1;
|
||||
}
|
||||
|
||||
$state->{dirArgs} = \%allDirs;
|
||||
$state->{args} = [
|
||||
sort {
|
||||
# Sort priority: by directory depth, then actual file name:
|
||||
my @piecesA=split('/',$a);
|
||||
my @piecesB=split('/',$b);
|
||||
|
||||
my $count=scalar(@piecesA);
|
||||
my $tmp=scalar(@piecesB);
|
||||
return $count<=>$tmp if($count!=$tmp);
|
||||
|
||||
for($tmp=0;$tmp<$count;$tmp++)
|
||||
{
|
||||
if($piecesA[$tmp] ne $piecesB[$tmp])
|
||||
{
|
||||
return $piecesA[$tmp] cmp $piecesB[$tmp]
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
} keys(%allArgs) ];
|
||||
}
|
||||
|
||||
## look up directory sticky tag, of either fullPath or a parent:
|
||||
sub getDirStickyInfo
|
||||
@ -2383,6 +2550,7 @@ sub getStickyTagOrDate
|
||||
sub statecleanup
|
||||
{
|
||||
$state->{files} = [];
|
||||
$state->{dirArgs} = {};
|
||||
$state->{args} = [];
|
||||
$state->{arguments} = [];
|
||||
$state->{entries} = {};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user