git-svn: use ~/.subversion config files when using SVN:: libraries
This allows users to use HTTP proxy information (among other settings) from ~/.subversion/servers and ~/.subversion/config --config-dir (as before) may be passed to git-svn to override the default choice of '~/.subversion' for the configuration directory. Thanks to tko on #git for pointing this out. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong committed
Nov 27, 2006 at 13:20 UTC
6f23ebf600188fe4246c2fb118f0c977ba1a2ed6
1 file changed
+4
-2
git-svn.perl
+4
-2
@@ -2822,7 +2822,9 @@ sub libsvn_connect {
2822
SVN::Client::get_username_prompt_provider(
2823
\&_username_prompt, 2),
2824
]);
2825
+ my $config = SVN::Core::config_get_config($_config_dir);
2826
my $ra = SVN::Ra->new(url => $url, auth => $baton,
2827
+ config => $config,
2828
pool => SVN::Pool->new,
2829
auth_provider_callbacks => $callbacks);
2830
$ra->{svn_path} = $url;
@@ -2834,8 +2836,8 @@ sub libsvn_connect {
2836
2837
sub libsvn_dup_ra {
2838
my ($ra) = @_;
2837
- SVN::Ra->new(map { $_ => $ra->{$_} }
2838
- qw/url auth auth_provider_callbacks repos_root svn_path/);
2839
+ SVN::Ra->new(map { $_ => $ra->{$_} } qw/config url
2840
+ auth auth_provider_callbacks repos_root svn_path/);
2841
}
2842
2843
sub libsvn_get_file {