134
init_vars();
135
load_authors() if $_authors;
136
load_all_refs() if $_branch_all_refs;
137
-svn_compat_check();
137
+svn_compat_check() unless $_use_lib;
138
migration_check() unless $cmd =~ /^(?:init|rebuild|multi-init)$/;
139
$cmd{$cmd}->[0]->(@ARGV);
140
exit 0;
379
# performance sucks with it enabled, so it's much
380
# faster to fetch revision ranges instead of relying
381
# on the limiter.
382
- $SVN_LOG->get_log( '/'.$SVN_PATH, $min, $max, 0, 1, 1,
382
+ libsvn_get_log($SVN_LOG, '/'.$SVN_PATH,
383
+ $min, $max, 0, 1, 1,
384
sub {
385
my $log_msg;
386
if ($last_commit) {
925
$SVN::Error::handler = \&libsvn_skip_unknown_revs;
926
while (1) {
927
my $pool = SVN::Pool->new;
927
- $SVN_LOG->get_log( "/$path", $min, $max, 0, 1, 1,
928
+ libsvn_get_log($SVN_LOG, "/$path", $min, $max, 0, 1, 1,
929
sub {
930
libsvn_graft_file_copies($grafts, $tree_paths,
931
$path, @_);
2359
return unless $_use_lib;
2360
$_use_lib = eval {
2361
require SVN::Core;
2361
- if ($SVN::Core::VERSION lt '1.2.1') {
2362
- die "Need SVN::Core 1.2.1 or better ",
2362
+ if ($SVN::Core::VERSION lt '1.1.0') {
2363
+ die "Need SVN::Core 1.1.0 or better ",
2364
"(got $SVN::Core::VERSION) ",
2365
"Falling back to command-line svn\n";
2366
}
2393
my $pool = SVN::Pool->new;
2394
defined($pid = open3($in, $out, '>&STDERR',
2395
qw/git-hash-object -w --stdin/)) or croak $!;
2395
- my ($r, $props) = $SVN->get_file($f, $rev, $in, $pool);
2396
+ # redirect STDOUT for SVN 1.1.x compatibility
2397
+ open my $stdout, '>&', \*STDOUT or croak $!;
2398
+ open STDOUT, '>&', $in or croak $!;
2399
+ $| = 1; # not sure if this is necessary, better safe than sorry...
2400
+ my ($r, $props) = $SVN->get_file($f, $rev, \*STDOUT, $pool);
2401
$in->flush == 0 or croak $!;
2402
+ open STDOUT, '>&', $stdout or croak $!;
2403
close $in or croak $!;
2404
+ close $stdout or croak $!;
2405
$pool->clear;
2406
chomp($hash = do { local $/; <$out> });
2407
close $out or croak $!;
2573
if ($_use_lib) {
2574
# should be OK to use Pool here (r1 - r0) should be small
2575
my $pool = SVN::Pool->new;
2569
- $SVN->get_log("/$path", $r0, $r1, 0, 1, 1, sub {$nr++},$pool);
2576
+ libsvn_get_log($SVN, "/$path", $r0, $r1,
2577
+ 0, 1, 1, sub {$nr++}, $pool);
2578
$pool->clear;
2579
} else {
2580
my ($url, undef) = repo_path_split($SVN_URL);
2614
return undef;
2615
}
2616
2617
+sub libsvn_get_log {
2618
+ my ($ra, @args) = @_;
2619
+ if ($SVN::Core::VERSION le '1.2.0') {
2620
+ splice(@args, 3, 1);
2621
+ }
2622
+ $ra->get_log(@args);
2623
+}
2624
+
2625
sub libsvn_new_tree {
2626
if (my $log_entry = libsvn_find_parent_branch(@_)) {
2627
return $log_entry;