From: Eric Wong <normalperson@yhbt.net>
To: Hin-Tak Leung <htl10@users.sourceforge.net>
Cc: stoklund@2pi.dk, fabian.schmied@gmail.com, git@vger.kernel.org,
sam@vilain.net, stevenrwalter@gmail.com, waste.manager@gmx.de,
amyrick@apple.com
Subject: [PATCH v2] git-svn: use SVN::Ra::get_dir2 when possible
Date: Fri, 31 Oct 2014 10:34:03 +0000 [thread overview]
Message-ID: <20141031103403.GA6190@dcvr.yhbt.net> (raw)
In-Reply-To: <20141031101530.GA29248@dcvr.yhbt.net>
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 <normalperson@yhbt.net>
Cc: Hin-Tak Leung <htl10@users.sourceforge.net>
---
Sorry, waaay past my bed time. This version doesn't infinite loop
on autoload or older SVN(*) (at least I hope it doesn't)
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..496f430 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 (::compare_svn_version('1.4.0') >= 0) {
+ # 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->SUPER::get_dir($dir, $r, $pool);
+ }
my %dirents = map { $_ => { kind => $d->{$_}->kind } } keys %$d;
$pool->clear;
if ($r != $cache->{r}) {
--
EW
next prev parent reply other threads:[~2014-10-31 10:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-31 10:15 [PATCH] git-svn: use SVN::Ra::get_dir2 when possible Eric Wong
2014-10-31 10:34 ` Eric Wong [this message]
2014-10-31 19:08 ` [PATCH v2] " Eric Wong
2014-11-02 12:31 ` [PATCH] " Hin-Tak Leung
2014-11-02 23:04 ` Eric Wong
-- strict thread matches above, loose matches on Subject: below --
2014-10-31 21:09 [PATCH v2] " Hin-Tak Leung
2014-10-31 21:42 ` Eric Wong
2014-10-31 21:53 Hin-Tak Leung
2014-10-31 23:22 ` Eric Wong
2014-11-01 2:19 ` Hin-Tak Leung
2014-11-01 3:13 ` Eric Wong
2014-11-01 6:13 ` Hin-Tak Leung
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141031103403.GA6190@dcvr.yhbt.net \
--to=normalperson@yhbt.net \
--cc=amyrick@apple.com \
--cc=fabian.schmied@gmail.com \
--cc=git@vger.kernel.org \
--cc=htl10@users.sourceforge.net \
--cc=sam@vilain.net \
--cc=stevenrwalter@gmail.com \
--cc=stoklund@2pi.dk \
--cc=waste.manager@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox