undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Git::SVN: use accessor for URLs internally

Browse Source 
So later it can do automatic canonicalization.

A later patch will make other things use the accessor.

No functional change here.

[ew: commit title]
Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Michael G. Schwern 2012-07-27 13:00:49 -07:00 committed by Eric Wong
parent 5578ed744d
commit 06ee19e8e5
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
perl/Git/SVN.pm
View File

@ -351,7 +351,7 @@ sub init_remote_config {
"svn-remote.$self->{repo_id}.fetch", "svn-remote.$self->{repo_id}.fetch",
$self->path.":".$self->refname); $self->path.":".$self->refname);
} }
$self->{url} = $url; $self->url($url);
} }
sub find_by_url { # repos_root and, path are optional sub find_by_url { # repos_root and, path are optional
@ -453,9 +453,10 @@ sub new {
$path =~ s{/\z}{}; $path =~ s{/\z}{};
$self->path($path); $self->path($path);
} }
$self->{url} = command_oneline('config', '--get', my $url = command_oneline('config', '--get',
"svn-remote.$repo_id.url") or "svn-remote.$repo_id.url") or
die "Failed to read \"svn-remote.$repo_id.url\" in config\n"; die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
$self->url($url);
$self->{pushurl} = eval { command_oneline('config', '--get', $self->{pushurl} = eval { command_oneline('config', '--get',
"svn-remote.$repo_id.pushurl") }; "svn-remote.$repo_id.pushurl") };
$self->rebuild; $self->rebuild;
@ -577,17 +578,18 @@ sub _set_svm_vars {
my $path = $self->path; my $path = $self->path;
my %tried; my %tried;
while (length $path) { while (length $path) {
unless ($tried{"$self->{url}/$path"}) { my $try = $self->url . "/$path";
unless ($tried{$try}) {
return $ra if $self->read_svm_props($ra, $path, $r); return $ra if $self->read_svm_props($ra, $path, $r);
$tried{"$self->{url}/$path"} = 1; $tried{$try} = 1;
} }
$path =~ s#/?[^/]+$##; $path =~ s#/?[^/]+$##;
} }
die "Path: '$path' should be ''\n" if $path ne ''; die "Path: '$path' should be ''\n" if $path ne '';
return $ra if $self->read_svm_props($ra, $path, $r); return $ra if $self->read_svm_props($ra, $path, $r);
$tried{"$self->{url}/$path"} = 1; $tried{$self->url."/$path"} = 1;
if ($ra->{repos_root} eq $self->{url}) { if ($ra->{repos_root} eq $self->url) {
die @err, (map { " $_\n" } keys %tried), "\n"; die @err, (map { " $_\n" } keys %tried), "\n";
} }
@ -610,7 +612,7 @@ sub _set_svm_vars {
if (!$ok) { if (!$ok) {
die @err, (map { " $_\n" } keys %tried), "\n"; die @err, (map { " $_\n" } keys %tried), "\n";
} }
Git::SVN::Ra->new($self->{url}); Git::SVN::Ra->new($self->url);
} }
sub svnsync { sub svnsync {
@ -677,7 +679,7 @@ sub ra_uuid {
if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) { if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) {
$self->{ra_uuid} = $uuid; $self->{ra_uuid} = $uuid;
} else { } else {
die "ra_uuid called without URL\n" unless $self->{url}; die "ra_uuid called without URL\n" unless $self->url;
$self->{ra_uuid} = $self->ra->get_uuid; $self->{ra_uuid} = $self->ra->get_uuid;
tmp_config('--add', $key, $self->{ra_uuid}); tmp_config('--add', $key, $self->{ra_uuid});
} }
@ -701,7 +703,7 @@ sub repos_root {
sub ra { sub ra {
my ($self) = shift; my ($self) = shift;
my $ra = Git::SVN::Ra->new($self->{url}); my $ra = Git::SVN::Ra->new($self->url);
$self->_set_repos_root($ra->{repos_root}); $self->_set_repos_root($ra->{repos_root});
if ($self->use_svm_props && !$self->{svm}) { if ($self->use_svm_props && !$self->{svm}) {
if ($self->no_metadata) { if ($self->no_metadata) {
@ -926,13 +928,13 @@ sub rewrite_uuid {
sub metadata_url { sub metadata_url {
my ($self) = @_; my ($self) = @_;
($self->rewrite_root || $self->{url}) . ($self->rewrite_root || $self->url) .
(length $self->path ? '/' . $self->path : ''); (length $self->path ? '/' . $self->path : '');
} }
sub full_url { sub full_url {
my ($self) = @_; my ($self) = @_;
$self->{url} . (length $self->path ? '/' . $self->path : ''); $self->url . (length $self->path ? '/' . $self->path : '');
} }
sub full_pushurl { sub full_pushurl {
@ -1436,7 +1438,7 @@ sub find_extra_svk_parents {
for my $ticket ( @tickets ) { for my $ticket ( @tickets ) {
my ($uuid, $path, $rev) = split /:/, $ticket; my ($uuid, $path, $rev) = split /:/, $ticket;
if ( $uuid eq $self->ra_uuid ) { if ( $uuid eq $self->ra_uuid ) {
my $url = $self->{url}; my $url = $self->url;
my $repos_root = $url; my $repos_root = $url;
my $branch_from = $path; my $branch_from = $path;
$branch_from =~ s{^/}{}; $branch_from =~ s{^/}{};
@ -1682,7 +1684,7 @@ sub find_extra_svn_parents {
# are now marked as merge, we can add the tip as a parent. # are now marked as merge, we can add the tip as a parent.
my @merges = split "\n", $mergeinfo; my @merges = split "\n", $mergeinfo;
my @merge_tips; my @merge_tips;
my $url = $self->{url}; my $url = $self->url;
my $uuid = $self->ra_uuid; my $uuid = $self->ra_uuid;
my %ranges; my %ranges;
for my $merge ( @merges ) { for my $merge ( @merges ) {
@ -2306,6 +2308,18 @@ sub path {
return $self->{path}; return $self->{path};
} }
sub url {
my $self = shift;
if (@_) {
my $url = shift;
$self->{url} = $url;
return;
}
return $self->{url};
}
# for read-only access of old .rev_db formats # for read-only access of old .rev_db formats
sub unlink_rev_db_symlink { sub unlink_rev_db_symlink {
my ($self) = @_; my ($self) = @_;