Browse Source

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>
maint
Michael G. Schwern 12 years ago committed by Eric Wong
parent
commit
565e56c2cc
  1. 6
      perl/Git/SVN.pm
  2. 6
      perl/Git/SVN/Ra.pm

6
perl/Git/SVN.pm

@ -27,6 +27,8 @@ use Git::SVN::Utils qw( @@ -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 { @@ -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 { @@ -2316,7 +2318,7 @@ sub url {

if (@_) {
my $url = shift;
$self->{url} = $url;
$self->{url} = canonicalize_url($url);
return;
}


6
perl/Git/SVN/Ra.pm

@ -3,6 +3,10 @@ use vars qw/@ISA $config_dir $_ignore_refs_regex $_log_window_size/; @@ -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 { @@ -137,7 +141,7 @@ sub url {

if (@_) {
my $url = shift;
$self->{url} = $url;
$self->{url} = canonicalize_url($url);
return;
}


Loading…
Cancel
Save