mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'km/svn-1.8-serf-only' into maint

Browse Source 
* km/svn-1.8-serf-only:
  Git.pm: revert _temp_cache use of temp_is_locked
  git-svn: allow git-svn fetching to work using serf
  Git.pm: add new temp_is_locked function
This commit is contained in:
Jonathan Nieder
2013-09-26 12:34:23 -07:00
parent be5e85016f 9c0810732c
commit 76deaab4e8
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
perl/Git.pm
View File

@ -61,7 +61,7 @@ require Exporter;
remote_refs prompt remote_refs prompt
get_tz_offset get_tz_offset
credential credential_read credential_write credential credential_read credential_write
temp_acquire temp_release temp_reset temp_path); temp_acquire temp_is_locked temp_release temp_reset temp_path);
=head1 DESCRIPTION =head1 DESCRIPTION
@ -1206,6 +1206,35 @@ sub temp_acquire {
$temp_fd; $temp_fd;
} }
=item temp_is_locked ( NAME )
Returns true if the internal lock created by a previous C<temp_acquire()>
call with C<NAME> is still in effect.
When temp_acquire is called on a C<NAME>, it internally locks the temporary
file mapped to C<NAME>. That lock will not be released until C<temp_release()>
is called with either the original C<NAME> or the L<File::Handle> that was
returned from the original call to temp_acquire.
Subsequent attempts to call C<temp_acquire()> with the same C<NAME> will fail
unless there has been an intervening C<temp_release()> call for that C<NAME>
(or its corresponding L<File::Handle> that was returned by the original
C<temp_acquire()> call).
If true is returned by C<temp_is_locked()> for a C<NAME>, an attempt to
C<temp_acquire()> the same C<NAME> will cause an error unless
C<temp_release> is first called on that C<NAME> (or its corresponding
L<File::Handle> that was returned by the original C<temp_acquire()> call).
=cut
sub temp_is_locked {
my ($self, $name) = _maybe_self(@_);
my $temp_fd = \$TEMP_FILEMAP{$name};
defined $$temp_fd && $$temp_fd->opened && $TEMP_FILES{$$temp_fd}{locked};
}
=item temp_release ( NAME ) =item temp_release ( NAME )
=item temp_release ( FILEHANDLE ) =item temp_release ( FILEHANDLE )

6
perl/Git/SVN/Fetcher.pm
View File

@ -315,11 +315,13 @@ sub change_file_prop {
sub apply_textdelta { sub apply_textdelta {
my ($self, $fb, $exp) = @_; my ($self, $fb, $exp) = @_;
return undef if $self->is_path_ignored($fb->{path}); return undef if $self->is_path_ignored($fb->{path});
my $fh = $::_repository->temp_acquire('svn_delta'); my $suffix = 0;
++$suffix while $::_repository->temp_is_locked("svn_delta_${$}_$suffix");
my $fh = $::_repository->temp_acquire("svn_delta_${$}_$suffix");
# $fh gets auto-closed() by SVN::TxDelta::apply(), # $fh gets auto-closed() by SVN::TxDelta::apply(),
# (but $base does not,) so dup() it for reading in close_file # (but $base does not,) so dup() it for reading in close_file
open my $dup, '<&', $fh or croak $!; open my $dup, '<&', $fh or croak $!;
my $base = $::_repository->temp_acquire('git_blob'); my $base = $::_repository->temp_acquire("git_blob_${$}_$suffix");
if ($fb->{blob}) { if ($fb->{blob}) {
my ($base_is_link, $size); my ($base_is_link, $size);