Move initialization of Git::SVN variables into Git::SVN.

Also it can compile on its own now, yay!

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>

diff --git a/git-svn.perl b/git-svn.perl
index 81d034ae51a522cb5ddea234df16612ff07401bb..9269d80a6d9a300e27571ae8560f76849ba5f700 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -20,10 +20,7 @@
 
 my $git_dir_user_set = 1 if defined $ENV{GIT_DIR};
 $ENV{GIT_DIR} ||= '.git';
 
 my $git_dir_user_set = 1 if defined $ENV{GIT_DIR};
 $ENV{GIT_DIR} ||= '.git';

-$Git::SVN::default_repo_id = 'svn';
-$Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn';

 $Git::SVN::Ra::_log_window_size = 100;
 $Git::SVN::Ra::_log_window_size = 100;

-$Git::SVN::_minimize_url = 'unset';

 
 if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) {
        $ENV{SVN_SSH} = $ENV{GIT_SSH};
 
 if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) {
        $ENV{SVN_SSH} = $ENV{GIT_SSH};


@@ -114,7 +111,6 @@ BEGIN
 # This is a refactoring artifact so Git::SVN can get at this git-svn switch.
 sub opt_prefix { return $_prefix || '' }
 
 # This is a refactoring artifact so Git::SVN can get at this git-svn switch.
 sub opt_prefix { return $_prefix || '' }
 

-$Git::SVN::_follow_parent = 1;

 $Git::SVN::Fetcher::_placeholder_filename = ".gitignore";
 $_q ||= 0;
 my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
 $Git::SVN::Fetcher::_placeholder_filename = ".gitignore";
 $_q ||= 0;
 my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index c71c041986857bcc9871e1f2af8edc3deaffb4f8..2e0d7f0373fe33782d31163f673e9e45491bdac1 100644 (file)
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -3,9 +3,9 @@ package Git::SVN;
 use warnings;
 use Fcntl qw/:DEFAULT :seek/;
 use constant rev_map_fmt => 'NH40';
 use warnings;
 use Fcntl qw/:DEFAULT :seek/;
 use constant rev_map_fmt => 'NH40';

-use vars qw/$default_repo_id $default_ref_id $_no_metadata $_follow_parent
+use vars qw/$_no_metadata

             $_repack $_repack_flags $_use_svm_props $_head
             $_repack $_repack_flags $_use_svm_props $_head

-            $_use_svnsync_props $no_reuse_existing $_minimize_url
+            $_use_svnsync_props $no_reuse_existing

            $_use_log_author $_add_author_from $_localtime/;
 use Carp qw/croak/;
 use File::Path qw/mkpath/;
            $_use_log_author $_add_author_from $_localtime/;
 use Carp qw/croak/;
 use File::Path qw/mkpath/;


@@ -30,6 +30,11 @@ BEGIN
        $can_use_yaml = eval { require Git::SVN::Memoize::YAML; 1};
 }
 
        $can_use_yaml = eval { require Git::SVN::Memoize::YAML; 1};
 }
 

+our $_follow_parent  = 1;
+our $_minimize_url   = 'unset';
+our $default_repo_id = 'svn';
+our $default_ref_id  = $ENV{GIT_SVN_ID} || 'git-svn';
+

 my ($_gc_nr, $_gc_period);
 
 # properties that we do not log:
 my ($_gc_nr, $_gc_period);
 
 # properties that we do not log:

diff --git a/t/Git-SVN/00compile.t b/t/Git-SVN/00compile.t
index a7aa85a36b433f2c4fa341ffd323664adc3c1289..97475d920c27933d25fb9415fec73edbadf7f2b1 100644 (file)
--- a/t/Git-SVN/00compile.t
+++ b/t/Git-SVN/00compile.t
@@ -3,6 +3,7 @@
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-use Test::More tests => 1;
+use Test::More tests => 2;

 
 require_ok 'Git::SVN::Utils';
 
 require_ok 'Git::SVN::Utils';

+require_ok 'Git::SVN';