@matheusbsbs / matheus-bagliano / commits / 8ac251b66b

git-svn: allow git-svn fetching to work using serf

When attempting to git-svn fetch files from an svn https?: url using the serf library (the only choice starting with svn 1.8) the following errors can occur: Temp file with moniker 'svn_delta' already in use at Git.pm line 1250 Temp file with moniker 'git_blob' already in use at Git.pm line 1250 David Rothenberger <daveroth@acm.org> has determined the cause to be that ra_serf does not drive the delta editor in a depth-first manner [...]. Instead, the calls come in this order: 1. open_root 2. open_directory 3. add_file 4. apply_textdelta 5. add_file 6. apply_textdelta When using the ra_serf access method, git-svn can end up needing to create several temp files before the first one is closed. This change causes a new temp file moniker to be generated if the one that would otherwise have been used is currently locked. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Kyle J. McKay committed Jul 6, 2013 at 21:20 UTC 8ac251b66b952b0eddfa4e5bbf08a3c0ae7dbc0b

1 file changed +4 -2

perl/Git/SVN/Fetcher.pm

+4 -2

@@ -315,11 +315,13 @@ sub change_file_prop {

315 sub apply_textdelta {

316 my ($self, $fb, $exp) = @_;

317 return undef if $self->is_path_ignored($fb->{path});

318 - my $fh = $::_repository->temp_acquire('svn_delta');

318 + my $suffix = 0;

319 + ++$suffix while $::_repository->temp_is_locked("svn_delta_${$}_$suffix");

320 + my $fh = $::_repository->temp_acquire("svn_delta_${$}_$suffix");

321 # $fh gets auto-closed() by SVN::TxDelta::apply(),

322 # (but $base does not,) so dup() it for reading in close_file

323 open my $dup, '<&', $fh or croak $!;

322 - my $base = $::_repository->temp_acquire('git_blob');

324 + my $base = $::_repository->temp_acquire("git_blob_${$}_$suffix");

325

326 if ($fb->{blob}) {

327 my ($base_is_link, $size);