Skip to content

Commit

Permalink
Merge branch 'km/svn-1.8-serf-only' into maint
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Jonathan Nieder committed Sep 26, 2013
2 parents be5e850 + 9c08107 commit 76deaab
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 3 deletions.
31 changes: 30 additions & 1 deletion perl/Git.pm
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ require Exporter;
remote_refs prompt
get_tz_offset
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
Expand Down Expand Up @@ -1206,6 +1206,35 @@ sub temp_acquire {
$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 ( FILEHANDLE )
Expand Down
6 changes: 4 additions & 2 deletions perl/Git/SVN/Fetcher.pm
Original file line number Diff line number Diff line change
Expand Up @@ -315,11 +315,13 @@ sub change_file_prop {
sub apply_textdelta {
my ($self, $fb, $exp) = @_;
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(),
# (but $base does not,) so dup() it for reading in close_file
open my $dup, '<&', $fh or croak $!;
my $base = $::_repository->temp_acquire('git_blob');
my $base = $::_repository->temp_acquire("git_blob_${$}_$suffix");

if ($fb->{blob}) {
my ($base_is_link, $size);
Expand Down

0 comments on commit 76deaab

Please sign in to comment.