list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: "Kyle J. McKay" <>
Cc: David Rothenberger <>, Petr Baudis <>,
	Daniel Shahaf <>,
	Jonathan Nieder <>,
	Eric Wong <>
Subject: [PATCH v3 2/2] git-svn: allow git-svn fetching to work using serf
Date: Sat,  6 Jul 2013 21:20:49 -0700	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

From: "Kyle J. McKay" <>

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 line 1250
Temp file with moniker 'git_blob' already in use at line 1250

David Rothenberger <> 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 <>
 perl/Git/SVN/ | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/perl/Git/SVN/ b/perl/Git/SVN/
index bd17418..10edb27 100644
--- a/perl/Git/SVN/
+++ b/perl/Git/SVN/
@@ -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);

  parent reply	other threads:[~2013-07-07  4:21 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-07  4:20 [PATCH v3 0/2] " Kyle J. McKay
2013-07-07  4:20 ` [PATCH v3 1/2] add new temp_is_locked function Kyle J. McKay
2013-07-18 18:34   ` David Rothenberger
2013-07-18 19:14     ` Kyle J. McKay
2013-07-18 19:35       ` Jonathan Nieder
2013-07-07  4:20 ` Kyle J. McKay [this message]
2013-07-08 16:22 ` [PATCH v3 0/2] allow git-svn fetching to work using serf Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \
    --subject='Re: [PATCH v3 2/2] git-svn: allow git-svn fetching to work using serf' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ \
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
 note: .onion URLs require Tor:

code repositories for project(s) associated with this inbox:

AGPL code for this site: git clone