git-svn fails to fetch repository

Hi all,

I'm trying to fetch svn repository: git svn clone http://qsb-mac.googlecode.com/svn/trunk qsb-mac

This one fails at random time at: Temp file with moniker ' at /opt/local/lib/perl5/site_perl/5.8.8/Git.pm line 1011.

I know nothing about perl, so can't make anything out of that. Any hints?

Running Git 1.6.1, perl 5.8.8, OSX 10.5.6

PS: Please CC me on answer.

Also just tried on linux box (git 1.6.0.4, perl 5.8.8). Got all the revisions
but git segfaulted at the end:
...
r21 = e839272549fd746cf45542a7aa6cb151ae3813da (trunk)
Checked out HEAD:
  http://qsb-mac.googlecode.com/svn/trunk r21
Segmentation fault

Vladimir Pouzanov venit, vidit, dixit 01/13/09 16:03:

I'm getting
...
r21 = e839272549fd746cf45542a7aa6cb151ae3813da (git-svn)
Checked out HEAD:
  http://qsb-mac.googlecode.com/svn/trunk r21

This is with git 1.6.1rc4 (yeah I should have updated), perl 5.8.8 and svn 1.4.6 on Linux. Same with git 1.6.0.6, perl 5.10.0 and svn 1.5.4 on another box. The one git-svn change between 1.6.0.4 and 1.6.0.6 should not matter because you don't have branches. What's your svn version?

Michael

Michael J Gruber <git <at> drmicha.warpmail.net> writes:

svn, version 1.5.5 (r34862) on OSX (where perl fails with error) and
svn, version 1.5.0 (Release Candidate 
5) on Linux
(where perl segfaults somewhere in apr).

On 2009.01.13 19:01:28 +0000, Vladimir Pouzanov wrote:

Is that Linux box using Gentoo? If so, try emerging subversion with -dso in your build flags.

Cloning the svn repo you mentioned works fine with git-svn version 1.6.1.40.g8ea6a (svn 1.5.1)

(On debian sid)

Björn

Björn Steinbrink <B.Steinbrink <at> gmx.de> writes:

Yeah, that's gentoo. Will try rebuilding svn now. Any hints about OSX perl problem?

On Tue, Jan 13, 2009 at 3:46 PM, Vladimir Pouzanov <farcaller@gmail.com> wrote:

Your original email doesn't appear to provide the complete error message. I'm on OS X 10.5.6 (Intel), git 1.6.1.77.g81ea1, system perl (/usr/bin/perl - 5.8.8) and I'm able to clone okay:

$ which git
/opt/git/bin/git
$ git version
git version 1.6.1.77.g81ea1
$ git svn clone http://qsb-mac.googlecode.com/svn/trunk qsb-mac
...
Checked out HEAD:
  http://qsb-mac.googlecode.com/svn/trunk r21

j.

Jay Soffian <jaysoffian <at> gmail.com> writes:

$ git version
git version 1.6.1
$ git svn clone http://qsb-mac.googlecode.com/svn/trunk qsb-mac
Initialized empty Git repository in /Users/farcaller/temp/qsb-mac/.git/
r1 = 810fe584c48b884460b5403a28bc61d872452b93 (git-svn)
	A	externals/BSJSONAdditions/NSDictionary+BSJSONAdditions.m
	A	externals/BSJSONAdditions/Example/Unit Tests/Test
Files/json_test_valid_01.txt
	A	externals/BSJSONAdditions/Example/Unit Tests/Test
Files/json_test_valid_02.txt
	A	externals/BSJSONAdditions/Example/version.plist
	A	externals/BSJSONAdditions/Example/main.m
	A	externals/BSJSONAdditions/Example/Unit Tests/Test
Files/json_test_valid_03.txt
	A	externals/BSJSONAdditions/NSArray+BSJSONAdditions.m
	A	externals/BSJSONAdditions/BSJSON.h
	A	externals/BSJSONAdditions/NSDictionary+BSJSONAdditions.h
Temp file with moniker ' at /opt/local/lib/perl5/site_perl/5.8.8/Git.pm line
1011.

Git, subversion and perl are from macports: $ port info perl5 perl5 @5.8.8, Revision 2 (lang)

$ port info git-core
git-core @1.6.1 (devel)
Variants:    bash_completion, doc, gitweb, svn

$ port info subversion
subversion @1.5.5 (devel)
Variants:    bash_completion, (-)darwin_7, mac_os_x_server_mod_dav_svn,
mod_dav_svn, no_bdb, no_neon, tools, unicode_path, (-)universal

On Tue, Jan 13, 2009 at 4:16 PM, Vladimir Pouzanov <farcaller@gmail.com> wrote:

Ah "throw Error::Simple(...)" w/multiple arguments does not work as
the caller thought. Can you manually edit
/opt/local/lib/perl5/site_perl/5.8.8/Git.pm and edit lines 1011 and
1012. So instead of:

                if ($TEMP_FILES{$$temp_fd}{locked}) {
                        throw Error::Simple("Temp file with moniker '",
                                $name, "' already in use");
                }

It will look like:

                if ($TEMP_FILES{$$temp_fd}{locked}) {
                        throw Error::Simple("Temp file with moniker '" .
                                $name . "' already in use");
                }

(i.e., replace the commas with dots.)

Perhaps this will help in tracking down the problem.

j.

Jay Soffian <jaysoffian <at> gmail.com> writes:

$ git svn clone http://qsb-mac.googlecode.com/svn/trunk qsb-mac Initialized empty Git repository in /Users/farcaller/temp/qsb-mac/.git/ r1 = 810fe584c48b884460b5403a28bc61d872452b93 (git-svn) Temp file with moniker 'svn_delta' already in use at /opt/local/lib/perl5/ site_perl/5.8.8/Git.pm line 1011.

On Tue, Jan 13, 2009 at 4:34 PM, Vladimir Pouzanov <farcaller@gmail.com> wrote:

Hrmm, to me that doesn't help very much. Perhaps the author of git-svn (cc'd) might have an idea.

BTW, I installed git-core via DarwinPorts and I can clone w/that version as well.

$ port info --name --version git-core subversion perl5.8 version: 1.6.1 name: git-core -- version: 1.5.5 name: subversion -- version: 5.8.9 name: perl5.8

I was hoping it would fail for me so I could poke and prod.

j.

On Tue, Jan 13, 2009 at 4:34 PM, Vladimir Pouzanov <farcaller@gmail.com> wrote:

One more thing to try. Edit your Git.pm and make the top of _temp_cache() look like the following:

sub _temp_cache {
	my ($self, $name) = _maybe_self(@_);
	use Carp qw(longmess);
	warn longmess() if $name eq "svn_delta";

So you're adding the "use Carp..." and "warn..." lines.

Then try the import again. That should at least show why the svn_delta temp file is being acquired twice.

(Yes, this is the printf school of debugging...)

j.

Jay Soffian <jaysoffian <at> gmail.com> writes:

Output is pretty long so I've put in on pastebin: http://pastebin.com/m210be905

On Wed, Jan 14, 2009 at 3:32 AM, Vladimir Pouzanov <farcaller@gmail.com> wrote:

Okay, this is beyond me. git-svn (among other things) implements a so-called delta editor (part of the subversion API). The driver for that editor is apparently calling the editor's apply_textdelta() method twice in a row w/o an intervening call to the editor's close_file() method.

I don't understand when and/or why it would do this. This part of the Subversion API seems not that well documented, and I got lost trying to follow all the indirections in the Subversion source code (esp w/the swig'ified Perl bindings). AFAICT, this should not be happening.

I could ask you to insert some more debugging statements to try to track it to a specific file (or files), but I think at this point I'll going to wait to see if the git-svn author has any ideas.

BTW, it doesn't help any that the order that files are checked out seems not to be consistent. Not only is my git-svn clone working, the order my files are checked out in is different from yours.

Oh, one other thing I don't understand is why the debugging output is now showing that some files are being added for you (the lines beginning with \tA). Before you weren't getting that. I had thought these lines might be getting lost in stdout buffering, but git-svn disables buffering on stdout, so color me confused.

Sorry I can't be more help,

j.

Jay Soffian <jaysoffian@gmail.com> wrote:

Thank you Jay for your help and patch so far. I'm sorry you had to go through the craziness that is the Subversion library (and associated craziness that leaked into git-svn) to try an debug this problem.

Putting "print" and "print Dumper(\@_)" everywhere is pretty much how I figured out how to use the delta interface the first time around.

Vladimir:

I can't reproduce this problem at all, either. git-svn dups the file handle in question, maybe your combination of (SVN/Perl/OSX) somehow handles dup'd file descriptors differently?

Does the following patch (a shot in the dark) work for you? (it generates a lot of warnings for me)

On 17 янв. 2009, at 11:51, Eric Wong wrote:

$ git svn clone http://qsb-mac.googlecode.com/svn/trunk qsbmac
Initialized empty Git repository in /Users/farcaller/temp/qsbmac/.git/
r1 = 810fe584c48b884460b5403a28bc61d872452b93 (git-svn)
Attempt to release temp file 'GLOB(0x82b290)' that has not been locked  
at /opt/local/libexec/git-core/git-svn line 3413
	A	externals/BSJSONAdditions/NSArray+BSJSONAdditions.m
Attempt to release temp file 'GLOB(0xa0de34)' that has not been locked  
at /opt/local/libexec/git-core/git-svn line 3413
	A	externals/BSJSONAdditions/BSJSON.h
Attempt to release temp file 'GLOB(0x80ed84)' that has not been locked  
at /opt/local/libexec/git-core/git-svn line 3413
	A	externals/BSJSONAdditions/NSDictionary+BSJSONAdditions.m
Attempt to release temp file 'GLOB(0x9d3018)' that has not been locked  
at /opt/local/libexec/git-core/git-svn line 3413
	A	externals/BSJSONAdditions/Example/Unit Tests/ 
BSJSONScanner_UnitTests.h
Attempt to release temp file 'GLOB(0xa0df48)' that has not been locked  
at /opt/local/libexec/git-core/git-svn line 3413
	A	externals/BSJSONAdditions/Example/version.plist
Attempt to release temp file 'GLOB(0x9d8114)' that has not been locked  
at /opt/local/libexec/git-core/git-svn line 3413
	A	externals/BSJSONAdditions/NSDictionary+BSJSONAdditions.h
Temp file with moniker 'svn_delta' already in use at /opt/local/lib/ 
perl5/site_perl/5.8.8/Git.pm line 1011.

I've built git 1.6.1 based on OSX original perl an subversion, and it handles the give repo without any problems, so the problem is kind of solved. Strange thing is that macports git (the one that fails) handles other svn repositories without any problems, I had cloned whole transmissionbt repo (>7000 revs) with all the tags and branches and several other simpler repositories.

Vladimir Pouzanov <farcaller@gmail.com> wrote:

OK, and there are no symlinks in the repository which could trigger a rare code path, either. Very strange, does abort_edit() ever get called in there?

At least you got a working combination working. Does anybody know if macports git have any patches/changes to it that could cause this?

On Sat, Jan 17, 2009 at 5:45 AM, Eric Wong <normalperson@yhbt.net> wrote:

I installed the macports git and it worked fine for me. Same versions of git and subversion. The only difference was that I was on macports perl 5.8.9 and Vladimir was on macports perl 5.8.8.

If I have time, I'll try it with macports perl 5.8.8 and see if I can reproduce. I'm pretty curious why the apply_textdelta() callback is apparently running twice on the same file w/o the intervening close. :-)

j.

On Tue, Jan 13, 2009 at 4:12 PM, Jay Soffian <jaysoffian@gmail.com> wrote:

BTW, since it's the system perl, it's also the system Perl subversion bindings, which means 1.4.4.

IOW, even though I have MacPorts installed, I define NO_DARWIN_PORTS=1 during install. I've attached the script I use for compiling & installing git for reference.

j.

On Tue, Jan 13, 2009 at 08:46:55PM +0000, Vladimir Pouzanov wrote:

I have hit the same issue (segfault on Gentoo) and this fixed it for me. But do you have any details on why is the segfault caused and how to prevent it? USE=dso is the default on Gentoo. :-(

On 2009.01.23 09:52:35 +0100, Petr Baudis wrote:

No idea, I just heard about that in #git. IIRC it was Mikachu who came up with that solution. Unfortunately, he's not around at the moment, and I don't recall his real name, so not on Cc. :-/

Björn