mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: introduce add_path_to_url function

Browse Source 
Remove the ad-hoc versions.

This is mostly to normalize the process and ensure the URLs produced
don't have double slashes or anything.

Also provides a place to fix the corner case where a file path
contains a percent sign.

[ew: commit title]

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Michael G. Schwern
2012-07-28 02:47:50 -07:00
committed by Eric Wong
parent 8266fc8be1
commit d2fd119c4f
5 changed files with 75 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ use warnings;
use SVN::Client;
use Git::SVN::Utils qw(
canonicalize_url
add_path_to_url
);
use SVN::Ra;
@ -287,9 +288,8 @@ sub gs_do_switch {
my $path = $gs->path;
my $pool = SVN::Pool->new;
my $full_url = $self->url;
my $old_url = $full_url;
$full_url .= '/' . $path if length $path;
my $old_url = $self->url;
my $full_url = add_path_to_url( $self->url, $path );
my ($ra, $reparented);
if ($old_url =~ m#^svn(\+ssh)?://# ||
@ -555,7 +555,7 @@ sub minimize_url {
my @components = split(m!/!, $self->{svn_path});
my $c = '';
do {
$url .= "/$c" if length $c;
$url = add_path_to_url($url, $c);
eval {
my $ra = (ref $self)->new($url);
my $latest = $ra->get_latest_revnum;

27
perl/Git/SVN/Utils.pm
View File

@ -13,6 +13,7 @@ our @EXPORT_OK = qw(
canonicalize_path
canonicalize_url
join_paths
add_path_to_url
);
@ -203,4 +204,30 @@ sub join_paths {
return $new_path .= "/$last_path";
}
=head3 add_path_to_url
my $new_url = add_path_to_url($url, $path);
Appends $path onto the $url. If $path is empty, $url is returned unchanged.
=cut
sub add_path_to_url {
my($url, $path) = @_;
return $url if !defined $path or !length $path;
# Strip trailing and leading slashes so we don't
# wind up with http://x.com///path
$url =~ s{/+$}{};
$path =~ s{^/+}{};
# If a path has a % in it, URI escape it so it's not
# mistaken for a URI escape later.
$path =~ s{%}{%25}g;
return join '/', $url, $path;
}
1;