summaryrefslogtreecommitdiff
path: root/perl/Git
diff options
context:
space:
mode:
authorMichael G. Schwern <schwern@pobox.com>2012-07-28 09:38:32 (GMT)
committerEric Wong <normalperson@yhbt.net>2012-08-02 21:45:56 (GMT)
commit565e56c2cc7ebe42ad12ee5970f3d5af1dc3f36c (patch)
tree083ae13fc414fe22d24e85670037116bcac78398 /perl/Git
parent3def8d088499b94919de36305ce710487a5e2bb0 (diff)
downloadgit-565e56c2cc7ebe42ad12ee5970f3d5af1dc3f36c.zip
git-565e56c2cc7ebe42ad12ee5970f3d5af1dc3f36c.tar.gz
git-565e56c2cc7ebe42ad12ee5970f3d5af1dc3f36c.tar.bz2
Git::SVN{,::Ra}: canonicalize earlier
This canonicalizes paths and urls as early as possible so we don't have to remember to do it at the point of use. It will fix a swath of SVN 1.7 problems in one go. Its ok to double canonicalize things. SVN 1.7 still fails, still not worrying about that. [ew: commit title] Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'perl/Git')
-rw-r--r--perl/Git/SVN.pm6
-rw-r--r--perl/Git/SVN/Ra.pm6
2 files changed, 9 insertions, 3 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index ff74782..dacac7f 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -27,6 +27,8 @@ use Git::SVN::Utils qw(
fatal
can_compress
join_paths
+ canonicalize_path
+ canonicalize_url
);
my $can_use_yaml;
@@ -2304,7 +2306,7 @@ sub path {
if (@_) {
my $path = shift;
- $self->{path} = $path;
+ $self->{path} = canonicalize_path($path);
return;
}
@@ -2316,7 +2318,7 @@ sub url {
if (@_) {
my $url = shift;
- $self->{url} = $url;
+ $self->{url} = canonicalize_url($url);
return;
}
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
index 9234bf9..77bceb9 100644
--- a/perl/Git/SVN/Ra.pm
+++ b/perl/Git/SVN/Ra.pm
@@ -3,6 +3,10 @@ use vars qw/@ISA $config_dir $_ignore_refs_regex $_log_window_size/;
use strict;
use warnings;
use SVN::Client;
+use Git::SVN::Utils qw(
+ canonicalize_url
+);
+
use SVN::Ra;
BEGIN {
@ISA = qw(SVN::Ra);
@@ -137,7 +141,7 @@ sub url {
if (@_) {
my $url = shift;
- $self->{url} = $url;
+ $self->{url} = canonicalize_url($url);
return;
}