diff options
| author | Michael G. Schwern <schwern@pobox.com> | 2012-07-27 13:00:51 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2012-08-02 21:42:58 +0000 |
| commit | 6a8d999ed4a0030ab7902382ed3b122ce448e581 (patch) | |
| tree | cf87ed3a736875fd7e2faf1678bdfa41849d5cd1 /perl/Git | |
| parent | b4943dc96324fec568125d7a5af1c4fdbd078543 (diff) | |
| download | git-6a8d999ed4a0030ab7902382ed3b122ce448e581.tar.gz | |
use Git::SVN->path accessor globally
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.pm | 4 | ||||
| -rw-r--r-- | perl/Git/SVN/Fetcher.pm | 2 | ||||
| -rw-r--r-- | perl/Git/SVN/Ra.pm | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index 208a0edc89..a16acbbbff 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -1123,7 +1123,7 @@ sub find_parent_branch { ($base, $head) = parse_revision_argument(0, $r); } else { if ($r0 < $r) { - $gs->ra->get_log([$gs->{path}], $r0 + 1, $r, 1, + $gs->ra->get_log([$gs->path], $r0 + 1, $r, 1, 0, 1, sub { $base = $_[1] - 1 }); } } @@ -1145,7 +1145,7 @@ sub find_parent_branch { # at the moment), so we can't rely on it $self->{last_rev} = $r0; $self->{last_commit} = $parent; - $ed = Git::SVN::Fetcher->new($self, $gs->{path}); + $ed = Git::SVN::Fetcher->new($self, $gs->path); $gs->ra->gs_do_switch($r0, $rev, $gs, $self->full_url, $ed) or die "SVN connection failed somewhere...\n"; diff --git a/perl/Git/SVN/Fetcher.pm b/perl/Git/SVN/Fetcher.pm index 76fae9bce0..046a7a2f31 100644 --- a/perl/Git/SVN/Fetcher.pm +++ b/perl/Git/SVN/Fetcher.pm @@ -83,7 +83,7 @@ sub _mark_empty_symlinks { chomp(my $empty_blob = `git hash-object -t blob --stdin < /dev/null`); my ($ls, $ctx) = command_output_pipe(qw/ls-tree -r -z/, $cmt); local $/ = "\0"; - my $pfx = defined($switch_path) ? $switch_path : $git_svn->{path}; + my $pfx = defined($switch_path) ? $switch_path : $git_svn->path; $pfx .= '/' if length($pfx); while (<$ls>) { chomp; diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm index df8dcb35ef..9234bf99e8 100644 --- a/perl/Git/SVN/Ra.pm +++ b/perl/Git/SVN/Ra.pm @@ -262,7 +262,7 @@ sub get_commit_editor { sub gs_do_update { my ($self, $rev_a, $rev_b, $gs, $editor) = @_; my $new = ($rev_a == $rev_b); - my $path = $gs->{path}; + my $path = $gs->path; if ($new && -e $gs->{index}) { unlink $gs->{index} or die @@ -298,7 +298,7 @@ sub gs_do_update { # svn_ra_reparent didn't work before 1.4) sub gs_do_switch { my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_; - my $path = $gs->{path}; + my $path = $gs->path; my $pool = SVN::Pool->new; my $full_url = $self->url; @@ -342,7 +342,7 @@ sub longest_common_path { my $common_max = scalar @$gsv; foreach my $gs (@$gsv) { - my @tmp = split m#/#, $gs->{path}; + my @tmp = split m#/#, $gs->path; my $p = ''; foreach (@tmp) { $p .= length($p) ? "/$_" : $_; |