git-svn: canonicalize earlier

Just a few things I noticed.  Its good to canonicalize as early as
possible.

[ew: commit title]

Signed-off-by: Eric Wong <normalperson@yhbt.net>

diff --git a/git-svn.perl b/git-svn.perl
index 6e975457f91f8bbbd0a84e04f5af1e2b976eb4de..6b9076599bbb5ac0b48b617b80e4647ed037f48e 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1436,16 +1436,16 @@ sub cmd_info {
        # canonicalize_path() will return "" to make libsvn 1.5.x happy,
        $path = "." if $path eq "";
 
-       my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
+       my $full_url = canonicalize_url( $url . ($fullpath eq "" ? "" : "/$fullpath") );
 
        if ($_url) {
-               print canonicalize_url($full_url), "\n";
+               print "$full_url\n";
                return;
        }
 
        my $result = "Path: $path\n";
        $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
-       $result .= "URL: " . canonicalize_url($full_url) . "\n";
+       $result .= "URL: $full_url\n";
 
        eval {
                my $repos_root = $gs->repos_root;

diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
index 268b368de34a3056e7da57fcf29128c170c62063..c88b2b91daad10ab565745e5659c0f110da6dbec 100644 (file)
--- a/perl/Git/SVN/Ra.pm
+++ b/perl/Git/SVN/Ra.pm
@@ -69,7 +69,7 @@ sub _auth_providers () {
 
 sub new {
        my ($class, $url) = @_;
-       $url =~ s!/+$!!;
+       $url = canonicalize_url($url);
        return $RA if ($RA && $RA->url eq $url);
 
        ::_req_svn();
@@ -101,7 +101,7 @@ sub new {
                        $Git::SVN::Prompt::_no_auth_cache = 1;
                }
        } # no warnings 'once'
-       my $self = SVN::Ra->new(url => canonicalize_url($url), auth => $baton,
+       my $self = SVN::Ra->new(url => $url, auth => $baton,
                              config => $config,
                              pool => SVN::Pool->new,
                              auth_provider_callbacks => $callbacks);