Merge branch 'cc/bisect'

[git.git] / git-svn.perl

diff --git a/git-svn.perl b/git-svn.perl
index fd1036104550c6d500a9ee64498c06558fcca9ff..43e1591cef4e69a1d06463ad996190b89df6cfe6 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -65,7 +65,7 @@ my ($_stdin, $_help, $_edit,
        $_template, $_shared,
        $_version, $_fetch_all, $_no_rebase,
        $_merge, $_strategy, $_dry_run, $_local,
-       $_prefix, $_no_checkout, $_verbose);
+       $_prefix, $_no_checkout, $_url, $_verbose);
 $Git::SVN::_follow_parent = 1;
 my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
                     'config-dir=s' => \$Git::SVN::Ra::config_dir,
@@ -181,7 +181,7 @@ my %cmd = (
        'info' => [ \&cmd_info,
                    "Show info about the latest SVN revision
                     on the current branch",
-                   { } ],
+                   { 'url' => \$_url, } ],
 );
 
 my $cmd;
@@ -773,13 +773,23 @@ sub cmd_info {
        }
        my $full_url = $url . ($path eq "." ? "" : "/$path");
 
+       if ($_url) {
+               print $full_url, "\n";
+               return;
+       }
+
        my $result = "Path: $path\n";
        $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
        $result .= "URL: " . $full_url . "\n";
 
-       my $repos_root = $gs->ra->{repos_root};
-       Git::SVN::remove_username($repos_root);
-       $result .= "Repository Root: $repos_root\n";
+       eval {
+               my $repos_root = $gs->repos_root;
+               Git::SVN::remove_username($repos_root);
+               $result .= "Repository Root: $repos_root\n";
+       };
+       if ($@) {
+               $result .= "Repository Root: (offline)\n";
+       }
        $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A";
        $result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
 
@@ -1768,9 +1778,24 @@ sub ra_uuid {
        $self->{ra_uuid};
 }
 
+sub _set_repos_root {
+       my ($self, $repos_root) = @_;
+       my $k = "svn-remote.$self->{repo_id}.reposRoot";
+       $repos_root ||= $self->ra->{repos_root};
+       tmp_config($k, $repos_root);
+       $repos_root;
+}
+
+sub repos_root {
+       my ($self) = @_;
+       my $k = "svn-remote.$self->{repo_id}.reposRoot";
+       eval { tmp_config('--get', $k) } || $self->_set_repos_root;
+}
+
 sub ra {
        my ($self) = shift;
        my $ra = Git::SVN::Ra->new($self->{url});
+       $self->_set_repos_root($ra->{repos_root});
        if ($self->use_svm_props && !$self->{svm}) {
                if ($self->no_metadata) {
                        die "Can't have both 'noMetadata' and ",