| 1 |
robbat2 |
1.1 |
diff --git a/git-svn.perl b/git-svn.perl
|
| 2 |
|
|
index eeb83d3..ae77c6a 100755
|
| 3 |
|
|
--- a/git-svn.perl
|
| 4 |
|
|
+++ b/git-svn.perl
|
| 5 |
|
|
@@ -1248,6 +1248,7 @@ sub canonicalize_path {
|
| 6 |
|
|
$path =~ s#^\./## if $dot_slash_added;
|
| 7 |
|
|
$path =~ s#^/##;
|
| 8 |
|
|
$path =~ s#^\.$##;
|
| 9 |
|
|
+ #$path =~ s# #%20#;
|
| 10 |
|
|
return $path;
|
| 11 |
|
|
}
|
| 12 |
|
|
|
| 13 |
|
|
@@ -2134,6 +2135,7 @@ sub fetch_all {
|
| 14 |
|
|
die "[svn-remote \"$repo_id\"] unknown\n";
|
| 15 |
|
|
my $fetch = $remote->{fetch};
|
| 16 |
|
|
my $url = $remote->{url} or die "svn-remote.$repo_id.url not defined\n";
|
| 17 |
|
|
+ #$url = main::canonicalize_url($url);
|
| 18 |
|
|
my (@gs, @globs);
|
| 19 |
|
|
my $ra = Git::SVN::Ra->new($url);
|
| 20 |
|
|
my $uuid = $ra->get_uuid;
|
| 21 |
|
|
@@ -2285,6 +2287,7 @@ sub find_existing_remote {
|
| 22 |
|
|
|
| 23 |
|
|
sub init_remote_config {
|
| 24 |
|
|
my ($self, $url, $no_write) = @_;
|
| 25 |
|
|
+ #$url = main::canonicalize_url($url);
|
| 26 |
|
|
$url =~ s!/+$!!; # strip trailing slash
|
| 27 |
|
|
my $r = read_all_remotes();
|
| 28 |
|
|
my $existing = find_existing_remote($url, $r);
|
| 29 |
|
|
@@ -2325,6 +2328,7 @@ sub init_remote_config {
|
| 30 |
|
|
command_oneline('config', '--get',
|
| 31 |
|
|
"svn-remote.$self->{repo_id}.url")
|
| 32 |
|
|
};
|
| 33 |
|
|
+ #$orig_url = main::canonicalize_url($orig_url);
|
| 34 |
|
|
if ($orig_url && ($orig_url ne $url)) {
|
| 35 |
|
|
die "svn-remote.$self->{repo_id}.url already set: ",
|
| 36 |
|
|
"$orig_url\nwanted to set to: $url\n";
|
| 37 |
|
|
@@ -2446,6 +2450,8 @@ sub new {
|
| 38 |
|
|
die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
|
| 39 |
|
|
$self->{pushurl} = eval { command_oneline('config', '--get',
|
| 40 |
|
|
"svn-remote.$repo_id.pushurl") };
|
| 41 |
|
|
+ #$self->{url} = main::canonicalize_url($self->{url});
|
| 42 |
|
|
+ #$self->{pushurl} = main::canonicalize_url($self->{pushurl}) if defined $self->{pushurl};
|
| 43 |
|
|
$self->rebuild;
|
| 44 |
|
|
$self;
|
| 45 |
|
|
}
|
| 46 |
|
|
@@ -6475,6 +6481,7 @@ sub migrate_from_v1 {
|
| 47 |
|
|
next unless -f "$git_dir/$x/info/url";
|
| 48 |
|
|
my $u = eval { ::file_to_s("$git_dir/$x/info/url") };
|
| 49 |
|
|
next unless $u;
|
| 50 |
|
|
+ #$u = main::canonicalize_url($u);
|
| 51 |
|
|
my $dn = dirname("$git_dir/svn/$x");
|
| 52 |
|
|
mkpath([$dn]) unless -d $dn;
|
| 53 |
|
|
if ($x eq 'svn') { # they used 'svn' as GIT_SVN_ID:
|
| 54 |
|
|
@@ -6509,7 +6516,8 @@ sub read_old_urls {
|
| 55 |
|
|
$pfx .= '/' if $pfx && $pfx !~ m!/$!;
|
| 56 |
|
|
my $ref_id = $pfx . basename $_;
|
| 57 |
|
|
my $url = ::file_to_s("$_/info/url");
|
| 58 |
|
|
- $l_map->{$ref_id} = $url;
|
| 59 |
|
|
+ $l_map->{$ref_id} = $url;
|
| 60 |
|
|
+ #$l_map->{$ref_id} = main::canonicalize_url($url);
|
| 61 |
|
|
} elsif (-d $_) {
|
| 62 |
|
|
push @dir, $_;
|
| 63 |
|
|
}
|
Parent Directory
| 
Revision Log