[PATCH 7/7] Make Git::SVN and Git::SVN::Ra canonicalize paths and urls.
From: Michael G. Schwern <hidden>
Date: 2016-06-15 22:54:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: "Michael G. Schwern" <redacted> 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. --- perl/Git/SVN.pm | 6 ++++-- perl/Git/SVN/Ra.pm | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index b0ed3ea..798f6c4 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;
@@ -2305,7 +2307,7 @@ sub path { if( @_ ) { my $path = shift; - $self->{path} = $path; + $self->{path} = canonicalize_path($path); return; }
@@ -2318,7 +2320,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 27dcdd5..ef7b3dd 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);
@@ -138,7 +142,7 @@ sub url { if( @_ ) { my $url = shift; - $self->{url} = $url; + $self->{url} = canonicalize_url($url); return; }
--
1.7.11.3