diff options
| author | Michael G. Schwern <schwern@pobox.com> | 2012-07-26 16:22:25 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2012-07-27 22:14:54 +0000 |
| commit | 5c71028fced46d03bf81b8625680d9ac87c8f4f0 (patch) | |
| tree | c61b5b44816bba09f61bed84fc30be62affa0b6f | |
| parent | 29499c0b2741cc2ea13b78a342048bad928dfe2a (diff) | |
| download | git-5c71028fced46d03bf81b8625680d9ac87c8f4f0.tar.gz | |
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>
| -rwxr-xr-x | git-svn.perl | 4 | ||||
| -rw-r--r-- | perl/Git/SVN.pm | 9 | ||||
| -rw-r--r-- | t/Git-SVN/00compile.t | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/git-svn.perl b/git-svn.perl index 81d034ae51..9269d80a6d 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -20,10 +20,7 @@ my $cmd_dir_prefix = eval { 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::_minimize_url = 'unset'; if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) { $ENV{SVN_SSH} = $ENV{GIT_SSH}; @@ -114,7 +111,6 @@ my ($_stdin, $_help, $_edit, # 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, diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index c71c041986..2e0d7f0373 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -3,9 +3,9 @@ use strict; 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 - $_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/; @@ -30,6 +30,11 @@ BEGIN { $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: diff --git a/t/Git-SVN/00compile.t b/t/Git-SVN/00compile.t index a7aa85a36b..97475d920c 100644 --- a/t/Git-SVN/00compile.t +++ b/t/Git-SVN/00compile.t @@ -3,6 +3,7 @@ use strict; use warnings; -use Test::More tests => 1; +use Test::More tests => 2; require_ok 'Git::SVN::Utils'; +require_ok 'Git::SVN'; |