From: "Michael G. Schwern" <schwern@pobox.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: robbat2@gentoo.org, bwalton@artsci.utoronto.ca,
normalperson@yhbt.net, jrnieder@gmail.com, schwern@pobox.com
Subject: [PATCH 7/8] Turn on canonicalization on newly minted URLs.
Date: Sat, 28 Jul 2012 02:47:51 -0700 [thread overview]
Message-ID: <1343468872-72133-8-git-send-email-schwern@pobox.com> (raw)
In-Reply-To: <1343468872-72133-1-git-send-email-schwern@pobox.com>
From: "Michael G. Schwern" <schwern@pobox.com>
Go through all the spots that use the new add_path_to_url() to
make a new URL and canonicalize them.
* copyfrom_path has to be canonicalized else find_parent_branch
will get confused
* due to the `canonicalize_url($full_url) ne $full_url)` line of
logic in gs_do_switch(), $full_url is left alone until after.
At this point SVN 1.7 passes except for 3 tests in
t9100-git-svn-basic.sh that look like an SVN bug to do with
symlinks.
---
perl/Git/SVN.pm | 19 ++++++++++++++-----
perl/Git/SVN/Ra.pm | 9 ++++++++-
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 22bf207..e5f7acc 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -362,6 +362,8 @@ sub init_remote_config {
sub find_by_url { # repos_root and, path are optional
my ($class, $full_url, $repos_root, $path) = @_;
+ $full_url = canonicalize_url($full_url);
+
return undef unless defined $full_url;
remove_username($full_url);
remove_username($repos_root) if defined $repos_root;
@@ -400,6 +402,11 @@ sub find_by_url { # repos_root and, path are optional
}
$p =~ s#^\Q$z\E(?:/|$)#$prefix# or next;
}
+
+ # remote fetch paths are not URI escaped. Decode ours
+ # so they match
+ $p = uri_decode($p);
+
foreach my $f (keys %$fetch) {
next if $f ne $p;
return Git::SVN->new($fetch->{$f}, $repo_id, $f);
@@ -934,18 +941,18 @@ sub rewrite_uuid {
sub metadata_url {
my ($self) = @_;
my $url = $self->rewrite_root || $self->url;
- return add_path_to_url( $url, $self->path );
+ return canonicalize_url( add_path_to_url( $url, $self->path ) );
}
sub full_url {
my ($self) = @_;
- return add_path_to_url( $self->url, $self->path );
+ return canonicalize_url( add_path_to_url( $self->url, $self->path ) );
}
sub full_pushurl {
my ($self) = @_;
if ($self->{pushurl}) {
- return add_path_to_url( $self->{pushurl}, $self->path );
+ return canonicalize_url( add_path_to_url( $self->{pushurl}, $self->path ) );
} else {
return $self->full_url;
}
@@ -1113,7 +1120,7 @@ sub find_parent_branch {
my $r = $i->{copyfrom_rev};
my $repos_root = $self->ra->{repos_root};
my $url = $self->ra->url;
- my $new_url = add_path_to_url( $url, $branch_from );
+ my $new_url = canonicalize_url( add_path_to_url( $url, $branch_from ) );
print STDERR "Found possible branch point: ",
"$new_url => ", $self->full_url, ", $r\n"
unless $::_q > 1;
@@ -1869,7 +1876,9 @@ sub make_log_entry {
$email ||= "$author\@$uuid";
$commit_email ||= "$author\@$uuid";
} elsif ($self->use_svnsync_props) {
- my $full_url = add_path_to_url( $self->svnsync->{url}, $self->path );
+ my $full_url = canonicalize_url(
+ add_path_to_url( $self->svnsync->{url}, $self->path )
+ );
remove_username($full_url);
my $uuid = $self->svnsync->{uuid};
$log_entry{metadata} = "$full_url\@$rev $uuid";
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
index 788e642..29b46e8 100644
--- a/perl/Git/SVN/Ra.pm
+++ b/perl/Git/SVN/Ra.pm
@@ -5,6 +5,7 @@ use warnings;
use SVN::Client;
use Git::SVN::Utils qw(
canonicalize_url
+ canonicalize_path
add_path_to_url
);
@@ -102,6 +103,7 @@ sub new {
$Git::SVN::Prompt::_no_auth_cache = 1;
}
} # no warnings 'once'
+
my $self = SVN::Ra->new(url => $url, auth => $baton,
config => $config,
pool => SVN::Pool->new,
@@ -200,6 +202,7 @@ sub get_log {
qw/copyfrom_path copyfrom_rev action/;
if ($s{'copyfrom_path'}) {
$s{'copyfrom_path'} =~ s/$prefix_regex//;
+ $s{'copyfrom_path'} = canonicalize_path($s{'copyfrom_path'});
}
$_[0]{$p} = \%s;
}
@@ -303,7 +306,11 @@ sub gs_do_switch {
$ra = Git::SVN::Ra->new($full_url);
$ra_invalid = 1;
} elsif ($old_url ne $full_url) {
- SVN::_Ra::svn_ra_reparent($self->{session}, $full_url, $pool);
+ SVN::_Ra::svn_ra_reparent(
+ $self->{session},
+ canonicalize_url($full_url),
+ $pool
+ );
$self->url($full_url);
$reparented = 1;
}
--
1.7.11.3
next prev parent reply other threads:[~2012-07-28 9:49 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-28 9:47 Fix git-svn for SVN 1.7 Michael G. Schwern
2012-07-28 9:47 ` [PATCH 1/8] SVN 1.7 will truncate "not-a%40{0}" to just "not-a" Michael G. Schwern
2012-07-28 14:16 ` Jonathan Nieder
2012-07-28 19:32 ` Michael G Schwern
2012-10-09 8:41 ` [PATCH/RFC] svn test: escape peg revision separator using empty peg rev Jonathan Nieder
2012-10-09 9:47 ` Michael J Gruber
2012-10-09 10:19 ` Jonathan Nieder
2012-10-10 20:37 ` Eric Wong
2012-10-10 21:02 ` Jonathan Nieder
2012-10-10 21:31 ` Eric Wong
2012-10-10 21:42 ` Jonathan Nieder
2012-10-10 22:16 ` Eric Wong
2012-10-10 22:33 ` Junio C Hamano
2012-07-28 9:47 ` [PATCH 2/8] Fix typo in test Michael G. Schwern
2012-07-28 9:47 ` [PATCH 3/8] Improve our URL canonicalization to be more like SVN 1.7's Michael G. Schwern
2012-07-28 9:47 ` [PATCH 4/8] Replace hand rolled URL escapes with canonicalization Michael G. Schwern
2012-07-28 9:47 ` [PATCH 5/8] Canonicalize earlier in a couple spots Michael G. Schwern
2012-07-28 9:47 ` [PATCH 6/8] Add function to append a path to a URL Michael G. Schwern
2012-07-28 9:47 ` Michael G. Schwern [this message]
2012-10-06 19:24 ` [PATCH/RFC] test: work around SVN 1.7 mishandling of svn:special changes Jonathan Nieder
2012-10-09 10:12 ` [PATCH/RFC v2] git svn: " Jonathan Nieder
2012-10-10 20:11 ` Eric Wong
2012-10-10 20:47 ` [PATCH v3] " Jonathan Nieder
2012-07-28 9:47 ` [PATCH 8/8] Remove some ad hoc canonicalizations Michael G. Schwern
2012-07-30 20:38 ` Fix git-svn for SVN 1.7 Eric Wong
2012-07-30 21:10 ` Michael G Schwern
2012-07-30 22:15 ` Eric Wong
2012-07-31 1:04 ` Michael G Schwern
2012-07-31 2:18 ` Eric Wong
2012-07-31 4:30 ` Michael G Schwern
2012-07-31 6:53 ` Junio C Hamano
2012-07-31 9:54 ` Michael G Schwern
2012-07-31 20:01 ` Eric Wong
2012-07-31 23:05 ` Junio C Hamano
2012-07-31 23:28 ` Michael G Schwern
2012-07-31 23:24 ` Michael G Schwern
2012-08-01 21:30 ` Eric Wong
2012-08-02 10:31 ` Eric Wong
2012-08-02 16:07 ` Jonathan Nieder
2012-08-02 18:58 ` Junio C Hamano
2012-08-02 19:50 ` Robin H. Johnson
2012-08-02 22:10 ` Eric Wong
2012-08-21 4:04 ` Junio C Hamano
2012-08-21 21:03 ` Eric Wong
2012-08-21 21:34 ` Junio C Hamano
2012-08-02 20:51 ` Eric Wong
2012-08-02 21:22 ` Junio C Hamano
2012-08-02 21:42 ` Eric Wong
2012-08-02 21:55 ` Eric Wong
2012-08-02 22:05 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343468872-72133-8-git-send-email-schwern@pobox.com \
--to=schwern@pobox.com \
--cc=bwalton@artsci.utoronto.ca \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=normalperson@yhbt.net \
--cc=robbat2@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).