diff options
author | Michael G. Schwern <schwern@pobox.com> | 2012-07-28 13:47:50 +0400 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2012-08-03 01:46:03 +0400 |
commit | d2fd119c4fcaea266a894354b506959376140c37 (patch) | |
tree | 887faa7b3d86d181a3160256452bf890a8da632f /perl/Git/SVN | |
parent | 8266fc8be19ef1405d4ef175bb0e75ebc2730f5d (diff) |
git-svn: introduce add_path_to_url function
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>
Diffstat (limited to 'perl/Git/SVN')
-rw-r--r-- | perl/Git/SVN/Ra.pm | 8 | ||||
-rw-r--r-- | perl/Git/SVN/Utils.pm | 27 |
2 files changed, 31 insertions, 4 deletions
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm index c88b2b91da..ec3c570b21 100644 --- a/perl/Git/SVN/Ra.pm +++ b/perl/Git/SVN/Ra.pm @@ -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; diff --git a/perl/Git/SVN/Utils.pm b/perl/Git/SVN/Utils.pm index ab7add5e8b..4bb4dde89a 100644 --- a/perl/Git/SVN/Utils.pm +++ b/perl/Git/SVN/Utils.pm @@ -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; |