summaryrefslogtreecommitdiff
path: root/perl/Git
diff options
context:
space:
mode:
authorMichael G. Schwern <schwern@pobox.com>2012-07-27 20:00:52 (GMT)
committerEric Wong <normalperson@yhbt.net>2012-08-02 21:42:59 (GMT)
commitb1ea6c3829109aff412095b889432bf496f46a90 (patch)
treefc15660a5f2051122aaebfc1b300855d72d0a6da /perl/Git
parent6a8d999ed4a0030ab7902382ed3b122ce448e581 (diff)
downloadgit-b1ea6c3829109aff412095b889432bf496f46a90.zip
git-b1ea6c3829109aff412095b889432bf496f46a90.tar.gz
git-b1ea6c3829109aff412095b889432bf496f46a90.tar.bz2
use Git::SVN{,::RA}->url accessor globally
Note: The structure returned from Git::SVN->read_all_remotes() does not appear to contain objects, so I'm leaving them alone. That's everything converted over to the url and path accessors. No functional change. [ew: commit title] Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'perl/Git')
-rw-r--r--perl/Git/SVN.pm11
-rw-r--r--perl/Git/SVN/Migration.pm6
2 files changed, 9 insertions, 8 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index a16acbb..fc1ac07 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -560,7 +560,7 @@ sub _set_svm_vars {
# username is of no interest
$src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
- my $replace = $ra->{url};
+ my $replace = $ra->url;
$replace .= "/$path" if length $path;
my $section = "svn-remote.$self->{repo_id}";
@@ -599,16 +599,17 @@ sub _set_svm_vars {
$path = $ra->{svn_path};
$ra = Git::SVN::Ra->new($ra->{repos_root});
while (length $path) {
- unless ($tried{"$ra->{url}/$path"}) {
+ my $try = $ra->url ."/$path";
+ unless ($tried{$try}) {
$ok = $self->read_svm_props($ra, $path, $r);
last if $ok;
- $tried{"$ra->{url}/$path"} = 1;
+ $tried{$try} = 1;
}
$path =~ s#/?[^/]+$##;
}
die "Path: '$path' should be ''\n" if $path ne '';
$ok ||= $self->read_svm_props($ra, $path, $r);
- $tried{"$ra->{url}/$path"} = 1;
+ $tried{$ra->url ."/$path"} = 1;
if (!$ok) {
die @err, (map { " $_\n" } keys %tried), "\n";
}
@@ -1108,7 +1109,7 @@ sub find_parent_branch {
}
my $r = $i->{copyfrom_rev};
my $repos_root = $self->ra->{repos_root};
- my $url = $self->ra->{url};
+ my $url = $self->ra->url;
my $new_url = $url . $branch_from;
print STDERR "Found possible branch point: ",
"$new_url => ", $self->full_url, ", $r\n"
diff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm
index 75d7429..30daf35 100644
--- a/perl/Git/SVN/Migration.pm
+++ b/perl/Git/SVN/Migration.pm
@@ -177,14 +177,14 @@ sub minimize_connections {
my $ra = Git::SVN::Ra->new($url);
# skip existing cases where we already connect to the root
- if (($ra->{url} eq $ra->{repos_root}) ||
+ if (($ra->url eq $ra->{repos_root}) ||
($ra->{repos_root} eq $repo_id)) {
- $root_repos->{$ra->{url}} = $repo_id;
+ $root_repos->{$ra->url} = $repo_id;
next;
}
my $root_ra = Git::SVN::Ra->new($ra->{repos_root});
- my $root_path = $ra->{url};
+ my $root_path = $ra->url;
$root_path =~ s#^\Q$ra->{repos_root}\E(/|$)##;
foreach my $path (keys %$fetch) {
my $ref_id = $fetch->{$path};