From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 30 Jan 2007 03:16:01 +0000 (-0800)
Subject: git-svn: don't rely on do_switch + reparenting with svn(+ssh)://
X-Git-Tag: v1.5.1-rc1~209
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5d3b7cd5fe5d0410915cc68b641415901e1b113e

git-svn: don't rely on do_switch + reparenting with svn(+ssh)://

I can't seem to figure out what I or the SVN libraries are doing
wrong, but it appears to be related to reparent and probably
some global structure that gets reset if multiple SVN
connections are being used.

So now, in order to use do_switch; we'll open a new connection
to the repository with the complete URL; but we can't seem to
ever use an existing Ra object after another one has been
created...

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index bbdaeea98a..4e357dfcef 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -870,7 +870,7 @@ sub new {
 
 sub ra {
 	my ($self) = shift;
-	$self->{ra} ||= Git::SVN::Ra->new($self->{url});
+	Git::SVN::Ra->new($self->{url});
 }
 
 sub rel_path {
@@ -897,9 +897,10 @@ sub copy_remote_ref {
 sub traverse_ignore {
 	my ($self, $fh, $path, $r) = @_;
 	$path =~ s#^/+##g;
-	my ($dirent, undef, $props) = $self->ra->get_dir($path, $r);
+	my $ra = $self->ra;
+	my ($dirent, undef, $props) = $ra->get_dir($path, $r);
 	my $p = $path;
-	$p =~ s#^\Q$self->{ra}->{svn_path}\E/##;
+	$p =~ s#^\Q$ra->{svn_path}\E/##;
 	print $fh length $p ? "\n# $p\n" : "\n# /\n";
 	if (my $s = $props->{'svn:ignore'}) {
 		$s =~ s/[\r\n]+/\n/g;
@@ -1027,7 +1028,7 @@ sub get_commit_parents {
 
 sub full_url {
 	my ($self) = @_;
-	$self->ra->{url} . (length $self->{path} ? '/' . $self->{path} : '');
+	$self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
 }
 
 sub do_git_commit {
@@ -2165,7 +2166,7 @@ package Git::SVN::Ra;
 use strict;
 use warnings;
 my ($can_do_switch);
-my %RA;
+my $RA;
 
 BEGIN {
 	# enforce temporary pool usage for some simple functions
@@ -2185,7 +2186,7 @@ BEGIN
 sub new {
 	my ($class, $url) = @_;
 	$url =~ s!/+$!!;
-	return $RA{$url} if $RA{$url};
+	return $RA if ($RA && $RA->{url} eq $url);
 
 	SVN::_Core::svn_config_ensure($config_dir, undef);
 	my ($baton, $callbacks) = SVN::Core::auth_open_helper([
@@ -2211,11 +2212,11 @@ sub new {
 	$self->{svn_path} = $url;
 	$self->{repos_root} = $self->get_repos_root;
 	$self->{svn_path} =~ s#^\Q$self->{repos_root}\E/*##;
-	$RA{$url} = bless $self, $class;
+	$RA = bless $self, $class;
 }
 
 sub DESTROY {
-	# do not call the real DESTROY since we store ourselves in %RA
+	# do not call the real DESTROY since we store ourselves in $RA
 }
 
 sub get_log {
@@ -2276,17 +2277,28 @@ sub gs_do_switch {
 	my $full_url = $self->{url};
 	my $old_url = $full_url;
 	$full_url .= "/$path" if length $path;
-	SVN::_Ra::svn_ra_reparent($self->{session}, $full_url, $pool);
-	$self->{url} = $full_url;
-
-	my $reporter = $self->do_switch($rev_b, '',
-	                                $recurse, $url_b, $editor, $pool);
+	my ($ra, $reparented);
+	if ($old_url ne $full_url) {
+		if ($old_url !~ m#^svn(\+ssh)?://#) {
+			SVN::_Ra::svn_ra_reparent($self->{session}, $full_url,
+			                          $pool);
+			$self->{url} = $full_url;
+			$reparented = 1;
+		} else {
+			$ra = Git::SVN::Ra->new($full_url);
+		}
+	}
+	$ra ||= $self;
+	my $reporter = $ra->do_switch($rev_b, '',
+	                              $recurse, $url_b, $editor, $pool);
 	my @lock = $SVN::Core::VERSION ge '1.2.0' ? (undef) : ();
 	$reporter->set_path('', $rev_a, 0, @lock, $pool);
 	$reporter->finish_report($pool);
 
-	SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool);
-	$self->{url} = $old_url;
+	if ($reparented) {
+		SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool);
+		$self->{url} = $old_url;
+	}
 
 	$pool->clear;
 	$editor->{git_commit_ok};