From: Hin-Tak Leung Date: Sun, 02 Nov 2014 12:31:56 GMT Subject: Re: [PATCH] git-svn: use SVN::Ra::get_dir2 when possible Message-ID: <1414931516.94573.YahooMailBasic@web172301.mail.ir2.yahoo.com> In-Reply-To: <20141031101530.GA29248@dcvr.yhbt.net> Hmm, I see you are filing the problem against subversion. FWIW, I am currently using subversion-perl-1.8.10-1.fc20.x86_64 package on fedora 20. I'll possibly think about filing one under redhat's bugzilla and let them take it upward too. -------------------------------------------- On Fri, 31/10/14, Eric Wong wrote: This avoids the following failure with normal "get_dir" on newer versions of SVN (tested with SVN 1.8.8-1ubuntu3.1):   Incorrect parameters given: Could not convert '%ld' into a number get_dir2 also has the potential to be more efficient by requesting less data. ref: <1414636504.45506.YahooMailBasic@web172304.mail.ir2.yahoo.com> ref: <1414722617.89476.YahooMailBasic@web172305.mail.ir2.yahoo.com> Signed-off-by: Eric Wong Cc: Hin-Tak Leung ---   This should fix the vbox clone problem.  SVN Perl binding   breakage (again :<).  I shall revert the int() changes.   > I added those two lines to my git and there is no improvement. It   > still won't svn fetch the next revision. I think it may be   > important/interesting to find out when or how it becomes non-int, so   > I have tar'gz'ed my wont-fetch virtual box .git and in the middle of   > uploading here:   >   > http://sourceforge.net/projects/outmodedbonsai/files/R/   > I am also uploading my old R clone also - maybe you'd like to see   > why its .git/svn/.caches is so big compared to a recent one,   Jakob's changes causes different access patterns, so it's expected the   sizes vary.  I also changed the cherry pick cache and removed the   _rev_list caching entirely, so it should be much smaller now.   > as well as how and why there were an extra merge and two missing   > merges compared to a recent clone?   The different merges are fine, I think, as stated in     http://mid.gmane.org/20141030230831.GA14160@dcvr.yhbt.net perl/Git/SVN/Ra.pm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm index 82d6108..1e52709 100644 --- a/perl/Git/SVN/Ra.pm +++ b/perl/Git/SVN/Ra.pm @@ -177,7 +177,17 @@ sub get_dir {         }     }     my $pool = SVN::Pool->new; -    my ($d, undef, $props) = $self->SUPER::get_dir($dir, $r, $pool); +    my ($d, undef, $props); + +    if (defined &SVN::Ra::get_dir2) { # appeared in SVN 1.4 +        # n.b. in addition to being potentially more efficient, +        # this works around what appears to be a bug in some +        # SVN 1.8 versions +        my $kind = 1; # SVN_DIRENT_KIND +        ($d, undef, $props) = $self->get_dir2($dir, $r, $kind, $pool); +    } else { +        ($d, undef, $props) = $self->get_dir($dir, $r, $pool); +    }     my %dirents = map { $_ => { kind => $d->{$_}->kind } } keys %$d;     $pool->clear;     if ($r != $cache->{r}) { -- EW