undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: canonicalize newly-minted URLs

Browse Source 
Go through all the spots that use the new add_path_to_url() to
make a new URL and canonicalize them.

* copyfrom_path has to be canonicalized else find_parent_branch
  will get confused

* due to the `canonicalize_url($full_url) ne $full_url)` line of
  logic in gs_do_switch(), $full_url is left alone until after.

At this point SVN 1.7 passes except for 3 tests in
t9100-git-svn-basic.sh that look like an SVN bug to do with
symlinks.

[ew: commit title]

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Michael G. Schwern 2012-07-28 02:47:51 -07:00 committed by Eric Wong
parent d2fd119c4f
commit 705b49cb81
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
perl/Git/SVN.pm
View File

@ -362,6 +362,8 @@ sub init_remote_config {
sub find_by_url { # repos_root and, path are optional sub find_by_url { # repos_root and, path are optional
my ($class, $full_url, $repos_root, $path) = @_; my ($class, $full_url, $repos_root, $path) = @_;
$full_url = canonicalize_url($full_url);
return undef unless defined $full_url; return undef unless defined $full_url;
remove_username($full_url); remove_username($full_url);
remove_username($repos_root) if defined $repos_root; remove_username($repos_root) if defined $repos_root;
@ -400,6 +402,11 @@ sub find_by_url { # repos_root and, path are optional
} }
$p =~ s#^\Q$z\E(?:/|$)#$prefix# or next; $p =~ s#^\Q$z\E(?:/|$)#$prefix# or next;
} }
# remote fetch paths are not URI escaped. Decode ours
# so they match
$p = uri_decode($p);
foreach my $f (keys %$fetch) { foreach my $f (keys %$fetch) {
next if $f ne $p; next if $f ne $p;
return Git::SVN->new($fetch->{$f}, $repo_id, $f); return Git::SVN->new($fetch->{$f}, $repo_id, $f);
@ -934,18 +941,18 @@ sub rewrite_uuid {
sub metadata_url { sub metadata_url {
my ($self) = @_; my ($self) = @_;
my $url = $self->rewrite_root || $self->url; my $url = $self->rewrite_root || $self->url;
return add_path_to_url( $url, $self->path ); return canonicalize_url( add_path_to_url( $url, $self->path ) );
} }
sub full_url { sub full_url {
my ($self) = @_; my ($self) = @_;
return add_path_to_url( $self->url, $self->path ); return canonicalize_url( add_path_to_url( $self->url, $self->path ) );
} }
sub full_pushurl { sub full_pushurl {
my ($self) = @_; my ($self) = @_;
if ($self->{pushurl}) { if ($self->{pushurl}) {
return add_path_to_url( $self->{pushurl}, $self->path ); return canonicalize_url( add_path_to_url( $self->{pushurl}, $self->path ) );
} else { } else {
return $self->full_url; return $self->full_url;
} }
@ -1113,7 +1120,7 @@ sub find_parent_branch {
my $r = $i->{copyfrom_rev}; my $r = $i->{copyfrom_rev};
my $repos_root = $self->ra->{repos_root}; my $repos_root = $self->ra->{repos_root};
my $url = $self->ra->url; my $url = $self->ra->url;
my $new_url = add_path_to_url( $url, $branch_from ); my $new_url = canonicalize_url( add_path_to_url( $url, $branch_from ) );
print STDERR "Found possible branch point: ", print STDERR "Found possible branch point: ",
"$new_url => ", $self->full_url, ", $r\n" "$new_url => ", $self->full_url, ", $r\n"
unless $::_q > 1; unless $::_q > 1;
@ -1869,7 +1876,9 @@ sub make_log_entry {
$email ||= "$author\@$uuid"; $email ||= "$author\@$uuid";
$commit_email ||= "$author\@$uuid"; $commit_email ||= "$author\@$uuid";
} elsif ($self->use_svnsync_props) { } elsif ($self->use_svnsync_props) {
my $full_url = add_path_to_url( $self->svnsync->{url}, $self->path ); my $full_url = canonicalize_url(
add_path_to_url( $self->svnsync->{url}, $self->path )
);
remove_username($full_url); remove_username($full_url);
my $uuid = $self->svnsync->{uuid}; my $uuid = $self->svnsync->{uuid};
$log_entry{metadata} = "$full_url\@$rev $uuid"; $log_entry{metadata} = "$full_url\@$rev $uuid";

9
perl/Git/SVN/Ra.pm
View File

@ -5,6 +5,7 @@ use warnings;
use SVN::Client; use SVN::Client;
use Git::SVN::Utils qw( use Git::SVN::Utils qw(
canonicalize_url canonicalize_url
canonicalize_path
add_path_to_url add_path_to_url
); );
@ -102,6 +103,7 @@ sub new {
$Git::SVN::Prompt::_no_auth_cache = 1; $Git::SVN::Prompt::_no_auth_cache = 1;
} }
} # no warnings 'once' } # no warnings 'once'
my $self = SVN::Ra->new(url => $url, auth => $baton, my $self = SVN::Ra->new(url => $url, auth => $baton,
config => $config, config => $config,
pool => SVN::Pool->new, pool => SVN::Pool->new,
@ -198,6 +200,7 @@ sub get_log {
qw/copyfrom_path copyfrom_rev action/; qw/copyfrom_path copyfrom_rev action/;
if ($s{'copyfrom_path'}) { if ($s{'copyfrom_path'}) {
$s{'copyfrom_path'} =~ s/$prefix_regex//; $s{'copyfrom_path'} =~ s/$prefix_regex//;
$s{'copyfrom_path'} = canonicalize_path($s{'copyfrom_path'});
} }
$_[0]{$p} = \%s; $_[0]{$p} = \%s;
} }
@ -301,7 +304,11 @@ sub gs_do_switch {
$ra = Git::SVN::Ra->new($full_url); $ra = Git::SVN::Ra->new($full_url);
$ra_invalid = 1; $ra_invalid = 1;
} elsif ($old_url ne $full_url) { } elsif ($old_url ne $full_url) {
SVN::_Ra::svn_ra_reparent($self->{session}, $full_url, $pool); SVN::_Ra::svn_ra_reparent(
$self->{session},
canonicalize_url($full_url),
$pool
);
$self->url($full_url); $self->url($full_url);
$reparented = 1; $reparented = 1;
} }