Load all the modules in one place and before running code.

Just makes the code easier to follow.  No functional change.

Also eliminate an unused lexical $SVN.

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

diff --git a/git-svn.perl b/git-svn.perl
index 7342ce7332d1a40fb81a9a1a284e6a8ee0a5cc94..139f8eafb5333044f475b4c2781dfc846e13f257 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -10,11 +10,26 @@
 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
 $VERSION = '@@GIT_VERSION@@';
 
 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
 $VERSION = '@@GIT_VERSION@@';
 

+use Carp qw/croak/;
+use Digest::MD5;
+use IO::File qw//;
+use File::Basename qw/dirname basename/;
+use File::Path qw/mkpath/;
+use File::Spec;
+use File::Find;
+use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
+use IPC::Open3;
+use Memoize;
+

 use Git::SVN;
 use Git::SVN;

+use Git::SVN::Editor;
+use Git::SVN::Fetcher;
+use Git::SVN::Ra;
+use Git::SVN::Prompt;

 use Git::SVN::Log;
 use Git::SVN::Migration;
 use Git::SVN::Log;
 use Git::SVN::Migration;

-use Git::SVN::Utils qw(fatal can_compress);

 
 

+use Git::SVN::Utils qw(fatal can_compress);

 use Git qw(
        git_cmd_try
        command
 use Git qw(
        git_cmd_try
        command


@@ -26,6 +41,11 @@
        command_close_bidi_pipe
 );
 
        command_close_bidi_pipe
 );
 

+BEGIN {
+       Memoize::memoize 'Git::config';
+       Memoize::memoize 'Git::config_bool';
+}
+

 
 # From which subdir have we been invoked?
 my $cmd_dir_prefix = eval {
 
 # From which subdir have we been invoked?
 my $cmd_dir_prefix = eval {


@@ -79,28 +99,6 @@ sub _req_svn {
        }
 }
 
        }
 }
 

-use Carp qw/croak/;
-use Digest::MD5;
-use IO::File qw//;
-use File::Basename qw/dirname basename/;
-use File::Path qw/mkpath/;
-use File::Spec;
-use File::Find;
-use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
-use IPC::Open3;
-use Git::SVN::Editor qw//;
-use Git::SVN::Fetcher qw//;
-use Git::SVN::Ra qw//;
-use Git::SVN::Prompt qw//;
-use Memoize;  # core since 5.8.0, Jul 2002
-
-BEGIN {
-       Memoize::memoize 'Git::config';
-       Memoize::memoize 'Git::config_bool';
-}
-
-my ($SVN);
-

 $sha1 = qr/[a-f\d]{40}/;
 $sha1_short = qr/[a-f\d]{4,40}/;
 my ($_stdin, $_help, $_edit,
 $sha1 = qr/[a-f\d]{40}/;
 $sha1_short = qr/[a-f\d]{4,40}/;
 my ($_stdin, $_help, $_edit,