Git::SVN: use accessors internally for path

Then later it can be canonicalized automatically rather than everywhere
its used.

Later patch will make other things use it.

[ew: commit title, reformatted accessor to match existing style]

Signed-off-by: Eric Wong <normalperson@yhbt.net>

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index b8b34744ea49df95196cfb7ef0566f6ced57ba6b..a93ac61b67dc341d2c5277e40f1060eb902e9d7a 100644 (file)
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -314,12 +314,12 @@ sub init_remote_config {
                                print STDERR "Using higher level of URL: ",
                                             "$url => $min_url\n";
                        }
                                print STDERR "Using higher level of URL: ",
                                             "$url => $min_url\n";
                        }

-                       my $old_path = $self->{path};
-                       $self->{path} = $url;
-                       $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
+                       my $old_path = $self->path;
+                       $url =~ s!^\Q$min_url\E(/|$)!!;

                        if (length $old_path) {
                        if (length $old_path) {

-                               $self->{path} .= "/$old_path";
+                               $url .= "/$old_path";

                        }
                        }

+                       $self->path($url);

                        $url = $min_url;
                }
        }
                        $url = $min_url;
                }
        }


@@ -343,11 +343,13 @@ sub init_remote_config {
        unless ($no_write) {
                command_noisy('config',
                              "svn-remote.$self->{repo_id}.url", $url);
        unless ($no_write) {
                command_noisy('config',
                              "svn-remote.$self->{repo_id}.url", $url);

-               $self->{path} =~ s{^/}{};
-               $self->{path} =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
+               my $path = $self->path;
+               $path =~ s{^/}{};
+               $path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
+               $self->path($path);

                command_noisy('config', '--add',
                              "svn-remote.$self->{repo_id}.fetch",
                command_noisy('config', '--add',
                              "svn-remote.$self->{repo_id}.fetch",

-                             "$self->{path}:".$self->refname);
+                             $self->path.":".$self->refname);

        }
        $self->{url} = $url;
 }
        }
        $self->{url} = $url;
 }


@@ -435,17 +437,22 @@ sub new {
                }
        }
        my $self = _new($class, $repo_id, $ref_id, $path);
                }
        }
        my $self = _new($class, $repo_id, $ref_id, $path);

-       if (!defined $self->{path} || !length $self->{path}) {
+       if (!defined $self->path || !length $self->path) {

                my $fetch = command_oneline('config', '--get',
                                            "svn-remote.$repo_id.fetch",
                                            ":$ref_id\$") or
                     die "Failed to read \"svn-remote.$repo_id.fetch\" ",
                         "\":$ref_id\$\" in config\n";
                my $fetch = command_oneline('config', '--get',
                                            "svn-remote.$repo_id.fetch",
                                            ":$ref_id\$") or
                     die "Failed to read \"svn-remote.$repo_id.fetch\" ",
                         "\":$ref_id\$\" in config\n";

-               ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
+               my($path) = split(/\s*:\s*/, $fetch);
+               $self->path($path);
+       }
+       {
+               my $path = $self->path;
+               $path =~ s{/+}{/}g;
+               $path =~ s{\A/}{};
+               $path =~ s{/\z}{};
+               $self->path($path);

        }
        }

-       $self->{path} =~ s{/+}{/}g;
-       $self->{path} =~ s{\A/}{};
-       $self->{path} =~ s{/\z}{};

        $self->{url} = command_oneline('config', '--get',
                                       "svn-remote.$repo_id.url") or
                   die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
        $self->{url} = command_oneline('config', '--get',
                                       "svn-remote.$repo_id.url") or
                   die "Failed to read \"svn-remote.$repo_id.url\" in config\n";


@@ -567,7 +574,7 @@ sub _set_svm_vars {
        }
 
        my $r = $ra->get_latest_revnum;
        }
 
        my $r = $ra->get_latest_revnum;

-       my $path = $self->{path};
+       my $path = $self->path;

        my %tried;
        while (length $path) {
                unless ($tried{"$self->{url}/$path"}) {
        my %tried;
        while (length $path) {
                unless ($tried{"$self->{url}/$path"}) {


@@ -728,7 +735,7 @@ sub prop_walk {
        $path =~ s#^/*#/#g;
        my $p = $path;
        # Strip the irrelevant part of the path.
        $path =~ s#^/*#/#g;
        my $p = $path;
        # Strip the irrelevant part of the path.

-       $p =~ s#^/+\Q$self->{path}\E(/|$)#/#;
+       $p =~ s#^/+\Q@{[$self->path]}\E(/|$)#/#;

        # Ensure the path is terminated by a `/'.
        $p =~ s#/*$#/#;
 
        # Ensure the path is terminated by a `/'.
        $p =~ s#/*$#/#;
 


@@ -749,7 +756,7 @@ sub prop_walk {
 
        foreach (sort keys %$dirent) {
                next if $dirent->{$_}->{kind} != $SVN::Node::dir;
 
        foreach (sort keys %$dirent) {
                next if $dirent->{$_}->{kind} != $SVN::Node::dir;

-               $self->prop_walk($self->{path} . $p . $_, $rev, $sub);
+               $self->prop_walk($self->path . $p . $_, $rev, $sub);

        }
 }
 
        }
 }
 


@@ -920,19 +927,19 @@ sub rewrite_uuid {
 sub metadata_url {
        my ($self) = @_;
        ($self->rewrite_root || $self->{url}) .
 sub metadata_url {
        my ($self) = @_;
        ($self->rewrite_root || $self->{url}) .

-          (length $self->{path} ? '/' . $self->{path} : '');
+          (length $self->path ? '/' . $self->path : '');

 }
 
 sub full_url {
        my ($self) = @_;
 }
 
 sub full_url {
        my ($self) = @_;

-       $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
+       $self->{url} . (length $self->path ? '/' . $self->path : '');

 }
 
 sub full_pushurl {
        my ($self) = @_;
        if ($self->{pushurl}) {
 }
 
 sub full_pushurl {
        my ($self) = @_;
        if ($self->{pushurl}) {

-               return $self->{pushurl} . (length $self->{path} ? '/' .
-                      $self->{path} : '');
+               return $self->{pushurl} . (length $self->path ? '/' .
+                      $self->path : '');

        } else {
                return $self->full_url;
        }
        } else {
                return $self->full_url;
        }


@@ -1048,20 +1055,20 @@ sub do_git_commit {
 
 sub match_paths {
        my ($self, $paths, $r) = @_;
 
 sub match_paths {
        my ($self, $paths, $r) = @_;

-       return 1 if $self->{path} eq '';
-       if (my $path = $paths->{"/$self->{path}"}) {
+       return 1 if $self->path eq '';
+       if (my $path = $paths->{"/".$self->path}) {

                return ($path->{action} eq 'D') ? 0 : 1;
        }
                return ($path->{action} eq 'D') ? 0 : 1;
        }

-       $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
+       $self->{path_regex} ||= qr{^/\Q@{[$self->path]}\E/};

        if (grep /$self->{path_regex}/, keys %$paths) {
                return 1;
        }
        my $c = '';
        if (grep /$self->{path_regex}/, keys %$paths) {
                return 1;
        }
        my $c = '';

-       foreach (split m#/#, $self->{path}) {
+       foreach (split m#/#, $self->path) {

                $c .= "/$_";
                next unless ($paths->{$c} &&
                             ($paths->{$c}->{action} =~ /^[AR]$/));
                $c .= "/$_";
                next unless ($paths->{$c} &&
                             ($paths->{$c}->{action} =~ /^[AR]$/));

-               if ($self->ra->check_path($self->{path}, $r) ==
+               if ($self->ra->check_path($self->path, $r) ==

                    $SVN::Node::dir) {
                        return 1;
                }
                    $SVN::Node::dir) {
                        return 1;
                }


@@ -1075,14 +1082,14 @@ sub find_parent_branch {
        unless (defined $paths) {
                my $err_handler = $SVN::Error::handler;
                $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
        unless (defined $paths) {
                my $err_handler = $SVN::Error::handler;
                $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;

-               $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
+               $self->ra->get_log([$self->path], $rev, $rev, 0, 1, 1,

                                   sub { $paths = $_[0] });
                $SVN::Error::handler = $err_handler;
        }
        return undef unless defined $paths;
 
        # look for a parent from another branch:
                                   sub { $paths = $_[0] });
                $SVN::Error::handler = $err_handler;
        }
        return undef unless defined $paths;
 
        # look for a parent from another branch:

-       my @b_path_components = split m#/#, $self->{path};
+       my @b_path_components = split m#/#, $self->path;

        my @a_path_components;
        my $i;
        while (@b_path_components) {
        my @a_path_components;
        my $i;
        while (@b_path_components) {


@@ -1235,7 +1242,7 @@ sub mkemptydirs {
                close $fh;
        }
 
                close $fh;
        }
 

-       my $strip = qr/\A\Q$self->{path}\E(?:\/|$)/;
+       my $strip = qr/\A\Q@{[$self->path]}\E(?:\/|$)/;

        foreach my $d (sort keys %empty_dirs) {
                $d = uri_decode($d);
                $d =~ s/$strip//;
        foreach my $d (sort keys %empty_dirs) {
                $d = uri_decode($d);
                $d =~ s/$strip//;


@@ -1858,7 +1865,7 @@ sub make_log_entry {
                $commit_email ||= "$author\@$uuid";
        } elsif ($self->use_svnsync_props) {
                my $full_url = $self->svnsync->{url};
                $commit_email ||= "$author\@$uuid";
        } elsif ($self->use_svnsync_props) {
                my $full_url = $self->svnsync->{url};

-               $full_url .= "/$self->{path}" if length $self->{path};
+               $full_url .= "/".$self->path if length $self->path;

                remove_username($full_url);
                my $uuid = $self->svnsync->{uuid};
                $log_entry{metadata} = "$full_url\@$rev $uuid";
                remove_username($full_url);
                my $uuid = $self->svnsync->{uuid};
                $log_entry{metadata} = "$full_url\@$rev $uuid";


@@ -1905,7 +1912,7 @@ sub set_tree {
                        tree_b => $tree,
                        editor_cb => sub {
                               $self->set_tree_cb($log_entry, $tree, @_) },
                        tree_b => $tree,
                        editor_cb => sub {
                               $self->set_tree_cb($log_entry, $tree, @_) },

-                       svn_path => $self->{path} );
+                       svn_path => $self->path );

        if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) {
                print "No changes\nr$self->{last_rev} = $tree\n";
        }
        if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) {
                print "No changes\nr$self->{last_rev} = $tree\n";
        }


@@ -2276,10 +2283,27 @@ sub _new {
 
        $_[3] = $path = '' unless (defined $path);
        mkpath([$dir]);
 
        $_[3] = $path = '' unless (defined $path);
        mkpath([$dir]);

-       bless {
+       my $obj = bless {

                ref_id => $ref_id, dir => $dir, index => "$dir/index",
                ref_id => $ref_id, dir => $dir, index => "$dir/index",

-               path => $path, config => "$ENV{GIT_DIR}/svn/config",
+               config => "$ENV{GIT_DIR}/svn/config",

                map_root => "$dir/.rev_map", repo_id => $repo_id }, $class;
                map_root => "$dir/.rev_map", repo_id => $repo_id }, $class;

+
+       # Ensure it gets canonicalized
+       $obj->path($path);
+
+       return $obj;
+}
+
+sub path {
+       my $self = shift;
+
+       if (@_) {
+               my $path = shift;
+               $self->{path} = $path;
+               return;
+       }
+
+       return $self->{path};

 }
 
 # for read-only access of old .rev_db formats
 }
 
 # for read-only access of old .rev_db formats