2 use vars qw
/@ISA $config_dir $_ignore_refs_regex $_log_window_size/;
6 use Git
::SVN
::Utils
qw(
17 my ($ra_invalid, $can_do_switch, %ignored_err, $RA);
20 # enforce temporary pool usage for some simple functions
22 for my $f (qw
/rev_proplist get_latest_revnum get_uuid get_repos_root
24 my $SUPER = "SUPER::$f";
27 my $pool = SVN
::Pool
->new;
28 my @ret = $self->$SUPER(@_,$pool);
30 wantarray ?
@ret : $ret[0];
35 # serf has a bug that leads to a coredump upon termination if the
36 # remote access object is left around (not fixed yet in serf 1.3.1).
37 # Explicitly free it to work around the issue.
43 sub _auth_providers
() {
46 SVN
::Client
::get_simple_provider
(),
47 SVN
::Client
::get_ssl_server_trust_file_provider
(),
48 SVN
::Client
::get_simple_prompt_provider
(
49 \
&Git
::SVN
::Prompt
::simple
, 2),
50 SVN
::Client
::get_ssl_client_cert_file_provider
(),
51 SVN
::Client
::get_ssl_client_cert_prompt_provider
(
52 \
&Git
::SVN
::Prompt
::ssl_client_cert
, 2),
53 SVN
::Client
::get_ssl_client_cert_pw_file_provider
(),
54 SVN
::Client
::get_ssl_client_cert_pw_prompt_provider
(
55 \
&Git
::SVN
::Prompt
::ssl_client_cert_pw
, 2),
56 SVN
::Client
::get_username_provider
(),
57 SVN
::Client
::get_ssl_server_trust_prompt_provider
(
58 \
&Git
::SVN
::Prompt
::ssl_server_trust
),
59 SVN
::Client
::get_username_prompt_provider
(
60 \
&Git
::SVN
::Prompt
::username
, 2)
63 # earlier 1.6.x versions would segfault, and <= 1.5.x didn't have
65 if (::compare_svn_version
('1.6.15') >= 0) {
66 my $config = SVN
::Core
::config_get_config
($config_dir);
68 # config_get_config returns all config files from
69 # ~/.subversion, auth_get_platform_specific_client_providers
70 # just wants the config "file".
71 @a = ($config->{'config'}, undef);
72 $p = SVN
::Core
::auth_get_platform_specific_client_providers
(@a);
73 # Insert the return value from
74 # auth_get_platform_specific_providers
80 sub prepare_config_once
{
81 SVN
::_Core
::svn_config_ensure
($config_dir, undef);
82 my ($baton, $callbacks) = SVN
::Core
::auth_open_helper
(_auth_providers
);
83 my $config = SVN
::Core
::config_get_config
($config_dir);
84 my $dont_store_passwords = 1;
85 my $conf_t = $config->{'config'};
88 # The usage of $SVN::_Core::SVN_CONFIG_* variables
89 # produces warnings that variables are used only once.
90 # I had not found the better way to shut them up, so
91 # the warnings of type 'once' are disabled in this block.
92 if (SVN
::_Core
::svn_config_get_bool
($conf_t,
93 $SVN::_Core
::SVN_CONFIG_SECTION_AUTH
,
94 $SVN::_Core
::SVN_CONFIG_OPTION_STORE_PASSWORDS
,
96 SVN
::_Core
::svn_auth_set_parameter
($baton,
97 $SVN::_Core
::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS
,
98 bless (\
$dont_store_passwords, "_p_void"));
100 if (SVN
::_Core
::svn_config_get_bool
($conf_t,
101 $SVN::_Core
::SVN_CONFIG_SECTION_AUTH
,
102 $SVN::_Core
::SVN_CONFIG_OPTION_STORE_AUTH_CREDS
,
104 $Git::SVN
::Prompt
::_no_auth_cache
= 1;
107 return ($config, $baton, $callbacks);
108 } # no warnings 'once'
111 Memoize
::memoize
'_auth_providers';
112 Memoize
::memoize
'prepare_config_once';
116 my ($class, $url) = @_;
117 $url = canonicalize_url
($url);
118 return $RA if ($RA && $RA->url eq $url);
123 my ($config, $baton, $callbacks) = prepare_config_once
();
124 my $self = SVN
::Ra
->new(url
=> $url, auth
=> $baton,
126 pool
=> SVN
::Pool
->new,
127 auth_provider_callbacks
=> $callbacks);
128 $RA = bless $self, $class;
130 # Make sure its canonicalized
132 $self->{svn_path
} = $url;
133 $self->{repos_root
} = $self->get_repos_root;
134 $self->{svn_path
} =~ s
#^\Q$self->{repos_root}\E(/|$)##;
135 $self->{cache
} = { check_path
=> { r
=> 0, data
=> {} },
136 get_dir
=> { r
=> 0, data
=> {} } };
146 $self->{url
} = canonicalize_url
($url);
154 my ($self, $path, $r) = @_;
155 my $cache = $self->{cache
}->{check_path
};
156 if ($r == $cache->{r
} && exists $cache->{data
}->{$path}) {
157 return $cache->{data
}->{$path};
159 my $pool = SVN
::Pool
->new;
160 my $t = $self->SUPER::check_path
($path, $r, $pool);
162 if ($r != $cache->{r
}) {
163 %{$cache->{data
}} = ();
166 $cache->{data
}->{$path} = $t;
170 my ($self, $dir, $r) = @_;
171 my $cache = $self->{cache
}->{get_dir
};
172 if ($r == $cache->{r
}) {
173 if (my $x = $cache->{data
}->{$dir}) {
174 return wantarray ? @
$x : $x->[0];
177 my $pool = SVN
::Pool
->new;
178 my ($d, undef, $props);
180 if (::compare_svn_version
('1.4.0') >= 0) {
181 # n.b. in addition to being potentially more efficient,
182 # this works around what appears to be a bug in some
184 my $kind = 1; # SVN_DIRENT_KIND
185 ($d, undef, $props) = $self->get_dir2($dir, $r, $kind, $pool);
187 ($d, undef, $props) = $self->SUPER::get_dir
($dir, $r, $pool);
189 my %dirents = map { $_ => { kind
=> $d->{$_}->kind } } keys %$d;
191 if ($r != $cache->{r
}) {
192 %{$cache->{data
}} = ();
195 $cache->{data
}->{$dir} = [ \
%dirents, $r, $props ];
196 wantarray ?
(\
%dirents, $r, $props) : \
%dirents;
199 # get_log(paths, start, end, limit,
200 # discover_changed_paths, strict_node_history, receiver)
202 my ($self, @args) = @_;
203 my $pool = SVN
::Pool
->new;
205 # svn_log_changed_path_t objects passed to get_log are likely to be
206 # overwritten even if only the refs are copied to an external variable,
207 # so we should dup the structures in their entirety. Using an
208 # externally passed pool (instead of our temporary and quickly cleared
209 # pool in Git::SVN::Ra) does not help matters at all...
210 my $receiver = pop @args;
211 my $prefix = "/".$self->{svn_path
};
212 $prefix =~ s
#/+($)##;
213 my $prefix_regex = qr
#^\Q$prefix\E#;
216 return &$receiver(@_) unless $paths;
218 foreach my $p (keys %$paths) {
219 my $i = $paths->{$p};
220 # Make path relative to our url, not repos_root
221 $p =~ s/$prefix_regex//;
222 my %s = map { $_ => $i->$_; }
223 qw
/copyfrom_path copyfrom_rev action/;
224 if ($s{'copyfrom_path'}) {
225 $s{'copyfrom_path'} =~ s/$prefix_regex//;
226 $s{'copyfrom_path'} = canonicalize_path
($s{'copyfrom_path'});
234 # the limit parameter was not supported in SVN 1.1.x, so we
235 # drop it. Therefore, the receiver callback passed to it
236 # is made aware of this limitation by being wrapped if
237 # the limit passed to is being wrapped.
238 if (::compare_svn_version
('1.2.0') <= 0) {
239 my $limit = splice(@args, 3, 1);
241 my $receiver = pop @args;
242 push(@args, sub { &$receiver(@_) if (--$limit >= 0) });
245 my $ret = $self->SUPER::get_log
(@args, $pool);
250 # uncommon, only for ancient SVN (<= 1.4.2)
254 my ($self, $url1, $rev1, $url2, $rev2) = @_;
255 my $ctx = SVN
::Client
->new(auth
=> _auth_providers
);
256 my $out = IO
::File
->new_tmpfile;
258 # older SVN (1.1.x) doesn't take $pool as the last parameter for
259 # $ctx->diff(), so we'll create a default one
260 my $pool = SVN
::Pool
->new_default_sub;
262 $ra_invalid = 1; # this will open a new SVN::Ra connection to $url1
263 $ctx->diff([], $url1, $rev1, $url2, $rev2, 1, 1, 0, $out, $out);
265 my $ret = (($out->stat)[7] == 0);
266 close $out or croak
$!;
271 sub get_commit_editor
{
272 my ($self, $log, $cb, $pool) = @_;
274 my @lock = (::compare_svn_version
('1.2.0') >= 0) ?
(undef, 0) : ();
275 $self->SUPER::get_commit_editor
($log, $cb, @lock, $pool);
279 my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
280 my $new = ($rev_a == $rev_b);
281 my $path = $gs->path;
283 if ($new && -e
$gs->{index}) {
284 unlink $gs->{index} or die
285 "Couldn't unlink index: $gs->{index}: $!\n";
287 my $pool = SVN
::Pool
->new;
288 $editor->set_path_strip($path);
289 my (@pc) = split m
#/#, $path;
290 my $reporter = $self->do_update($rev_b, (@pc ?
shift @pc : ''),
292 my @lock = (::compare_svn_version
('1.2.0') >= 0) ?
(undef) : ();
294 # Since we can't rely on svn_ra_reparent being available, we'll
295 # just have to do some magic with set_path to make it so
296 # we only want a partial path.
298 my $final = join('/', @pc);
300 $reporter->set_path($sp, $rev_b, 0, @lock, $pool);
301 $sp .= '/' if length $sp;
304 die "BUG: '$sp' != '$final'\n" if ($sp ne $final);
306 $reporter->set_path($sp, $rev_a, $new, @lock, $pool);
308 $reporter->finish_report($pool);
310 $editor->{git_commit_ok
};
313 # this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and
314 # svn_ra_reparent didn't work before 1.4)
316 my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
317 my $path = $gs->path;
318 my $pool = SVN
::Pool
->new;
320 my $old_url = $self->url;
321 my $full_url = add_path_to_url
( $self->url, $path );
322 my ($ra, $reparented);
324 if ($old_url =~ m
#^svn(\+\w+)?://# ||
325 ($full_url =~ m
#^https?://# &&
326 canonicalize_url
($full_url) ne $full_url)) {
330 $ra = Git
::SVN
::Ra
->new($full_url);
332 } elsif ($old_url ne $full_url) {
333 SVN
::_Ra
::svn_ra_reparent
(
335 canonicalize_url
($full_url),
338 $self->url($full_url);
343 $url_b = canonicalize_url
($url_b);
344 my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
345 my @lock = (::compare_svn_version
('1.2.0') >= 0) ?
(undef) : ();
346 $reporter->set_path('', $rev_a, 0, @lock, $pool);
347 $reporter->finish_report($pool);
350 SVN
::_Ra
::svn_ra_reparent
($self->{session
}, $old_url, $pool);
351 $self->url($old_url);
355 $editor->{git_commit_ok
};
358 sub longest_common_path
{
359 my ($gsv, $globs) = @_;
361 my $common_max = scalar @
$gsv;
363 foreach my $gs (@
$gsv) {
364 my @tmp = split m
#/#, $gs->path;
367 $p .= length($p) ?
"/$_" : $_;
373 $common_max += scalar @
$globs;
374 foreach my $glob (@
$globs) {
375 my @tmp = split m
#/#, $glob->{path}->{left};
378 $p .= length($p) ?
"/$_" : $_;
384 my $longest_path = '';
385 foreach (sort {length $b <=> length $a} keys %common) {
386 if ($common{$_} == $common_max) {
394 sub gs_fetch_loop_common
{
395 my ($self, $base, $head, $gsv, $globs) = @_;
396 return if ($base > $head);
397 # Make sure the cat_blob open2 FileHandle is created before calling
398 # SVN::Pool::new_default so that it does not incorrectly end up in the pool.
399 $::_repository
->_open_cat_blob_if_needed;
400 my $gpool = SVN
::Pool
->new_default;
401 my $ra_url = $self->url;
402 my $reload_ra = sub {
407 $self = Git
::SVN
::Ra
->new($ra_url);
410 my $inc = $_log_window_size;
411 my ($min, $max) = ($base, $head < $base + $inc ?
$head : $base + $inc);
412 my $longest_path = longest_common_path
($gsv, $globs);
413 my $find_trailing_edge;
417 my $err_handler = $SVN::Error
::handler
;
418 $SVN::Error
::handler
= sub {
420 skip_unknown_revs
($err);
423 my ($paths, $r, $author, $date, $log) = @_;
425 { author
=> $author, date
=> $date, log => $log } ];
427 $self->get_log([$longest_path], $min, $max, 0, 1, 1,
428 sub { $revs{$_[1]} = _cb
(@_) });
430 print "Checked through r$max\r";
432 $find_trailing_edge = 1;
434 if ($err and $find_trailing_edge) {
435 print STDERR
"Path '$longest_path' ",
436 "was probably deleted:\n",
437 $err->expanded_message,
438 "\nWill attempt to follow ",
439 "revisions r$min .. r$max ",
440 "committed before the deletion\n";
442 while (--$hi >= $min) {
444 $self->get_log([$longest_path], $min, $hi,
447 $revs{$_[1]} = _cb
(@_) });
449 print STDERR
"r$min .. r$ok OK\n";
453 $find_trailing_edge = 0;
455 $SVN::Error
::handler
= $err_handler;
457 my %exists = map { $_->path => $_ } @
$gsv;
458 foreach my $r (sort {$a <=> $b} keys %revs) {
459 my ($paths, $logged) = @
{delete $revs{$r}};
461 foreach my $gs ($self->match_globs(\
%exists, $paths,
463 if ($gs->rev_map_max >= $r) {
466 next unless $gs->match_paths($paths, $r);
467 $gs->{logged_rev_props
} = $logged;
468 if (my $last_commit = $gs->last_commit) {
469 $gs->assert_index_clean($last_commit);
471 my $log_entry = $gs->do_fetch($paths, $r);
473 $gs->do_git_commit($log_entry);
475 $Git::SVN
::INDEX_FILES
{$gs->{index}} = 1;
477 foreach my $g (@
$globs) {
478 my $k = "svn-remote.$g->{remote}." .
480 Git
::SVN
::tmp_config
($k, $r);
482 $reload_ra->() if $ra_invalid;
484 # pre-fill the .rev_db since it'll eventually get filled in
485 # with '0' x40 if something new gets committed
486 foreach my $gs (@
$gsv) {
487 next if $gs->rev_map_max >= $max;
488 next if defined $gs->rev_map_get($max);
489 $gs->rev_map_set($max, 0 x40
);
491 foreach my $g (@
$globs) {
492 my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
493 Git
::SVN
::tmp_config
($k, $max);
495 last if $max >= $head;
498 $max = $head if ($max > $head);
505 sub get_dir_globbed
{
506 my ($self, $left, $depth, $r) = @_;
508 my @x = eval { $self->get_dir($left, $r) };
509 return unless scalar @x == 3;
512 foreach my $de (keys %$dirents) {
513 next if $dirents->{$de}->{kind
} != $SVN::Node
::dir
;
515 my @args = ("$left/$de", $depth - 1, $r);
516 foreach my $dir ($self->get_dir_globbed(@args)) {
517 push @finalents, "$de/$dir";
520 push @finalents, $de;
526 # return value: 0 -- don't ignore, 1 -- ignore
529 my $refname = $g->{ref}->full_path($p);
530 return 1 if defined($g->{ignore_refs_regex
}) &&
531 $refname =~ m!$g->{ignore_refs_regex}!;
532 return 0 unless defined($_ignore_refs_regex);
533 return 1 if $refname =~ m!$_ignore_refs_regex!o;
538 my ($self, $exists, $paths, $globs, $r) = @_;
541 my ($self, $exists, $g, $r) = @_;
543 my @dirs = $self->get_dir_globbed($g->{path
}->{left
},
547 foreach my $de (@dirs) {
548 my $p = $g->{path
}->full_path($de);
549 next if $exists->{$p};
550 next if (length $g->{path
}->{right
} &&
551 ($self->check_path($p, $r) !=
553 next unless $p =~ /$g->{path}->{regex}/;
554 $exists->{$p} = Git
::SVN
->init($self->url, $p, undef,
555 $g->{ref}->full_path($de), 1);
558 foreach my $g (@
$globs) {
559 if (my $path = $paths->{"/$g->{path}->{left}"}) {
560 if ($path->{action
} =~ /^[AR]$/) {
561 get_dir_check
($self, $exists, $g, $r);
564 foreach (keys %$paths) {
565 if (/$g->{path}->{left_regex}/ &&
566 !/$g->{path}->{regex}/) {
567 next if $paths->{$_}->{action
} !~ /^[AR]$/;
568 get_dir_check
($self, $exists, $g, $r);
570 next unless /$g->{path}->{regex}/;
572 my $pathname = $g->{path
}->full_path($p);
573 next if is_ref_ignored
($g, $p);
574 next if $exists->{$pathname};
575 next if ($self->check_path($pathname, $r) !=
577 $exists->{$pathname} = Git
::SVN
->init(
578 $self->url, $pathname, undef,
579 $g->{ref}->full_path($p), 1);
582 foreach (split m
#/#, $g->{path}->{left}) {
584 next unless ($paths->{$c} &&
585 ($paths->{$c}->{action
} =~ /^[AR]$/));
586 get_dir_check
($self, $exists, $g, $r);
594 return $self->url if ($self->url eq $self->{repos_root
});
595 my $url = $self->{repos_root
};
596 my @components = split(m!/!, $self->{svn_path
});
599 $url = add_path_to_url
($url, $c);
601 my $ra = (ref $self)->new($url);
602 my $latest = $ra->get_latest_revnum;
603 $ra->get_log("", $latest, 0, 1, 0, 1, sub {});
605 } while ($@
&& ($c = shift @components));
607 return canonicalize_url
($url);
612 unless (defined $can_do_switch) {
613 my $pool = SVN
::Pool
->new;
615 $self->do_switch(1, '', 0, $self->url,
616 SVN
::Delta
::Editor
->new, $pool);
621 $rep->abort_report($pool);
629 sub skip_unknown_revs
{
631 my $errno = $err->apr_err();
632 # Maybe the branch we're tracking didn't
633 # exist when the repo started, so it's
634 # not an error if it doesn't, just continue
636 # Wonderfully consistent library, eh?
637 # 160013 - svn:// and file://
638 # 175002 - http(s)://
639 # 175007 - http(s):// (this repo required authorization, too...)
640 # More codes may be discovered later...
641 if ($errno == 175007 || $errno == 175002 || $errno == 160013) {
642 my $err_key = $err->expanded_message;
643 # revision numbers change every time, filter them out
644 $err_key =~ s/\d+/\0/g;
645 $err_key = "$errno\0$err_key";
646 unless ($ignored_err{$err_key}) {
647 warn "W: Ignoring error from SVN, path probably ",
648 "does not exist: ($errno): ",
649 $err->expanded_message,"\n";
650 warn "W: Do not be alarmed at the above message ",
651 "git-svn is just searching aggressively for ",
653 "This may take a while on large repositories\n";
654 $ignored_err{$err_key} = 1;
658 die "Error from SVN, ($errno): ", $err->expanded_message,"\n";
666 Git::SVN::Ra - Subversion remote access functions for git-svn
672 my $ra = Git::SVN::Ra->new($branchurl);
673 my ($dirents, $fetched_revnum, $props) =
674 $ra->get_dir('.', $SVN::Core::INVALID_REVNUM);
678 This is a wrapper around the L<SVN::Ra> module for use by B<git-svn>.
679 It fills in some default parameters (such as the authentication
680 scheme), smooths over incompatibilities between libsvn versions, adds
681 caching, and implements some functions specific to B<git-svn>.
683 Do not use it unless you are developing git-svn. The interface will
684 change as git-svn evolves.
688 Subversion perl bindings,
691 C<Git::SVN::Ra> has not been tested using callers other than
698 =head1 INCOMPATIBILITIES