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>
Michael G. Schwern committed
Jul 26, 2012 at 17:26 UTC
e96cdba110346691794c1160db17f7a1b1f974b5
1 file changed
+21
-23
git-svn.perl
+21
-23
@@ -10,11 +10,26 @@ use vars qw/ $AUTHOR $VERSION
10
$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
11
$VERSION = '@@GIT_VERSION@@';
12
13
+use Carp qw/croak/;
14
+use Digest::MD5;
15
+use IO::File qw//;
16
+use File::Basename qw/dirname basename/;
17
+use File::Path qw/mkpath/;
18
+use File::Spec;
19
+use File::Find;
20
+use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
21
+use IPC::Open3;
22
+use Memoize;
23
+
24
use Git::SVN;
25
+use Git::SVN::Editor;
26
+use Git::SVN::Fetcher;
27
+use Git::SVN::Ra;
28
+use Git::SVN::Prompt;
29
use Git::SVN::Log;
30
use Git::SVN::Migration;
16
-use Git::SVN::Utils qw(fatal can_compress);
31
32
+use Git::SVN::Utils qw(fatal can_compress);
33
use Git qw(
34
git_cmd_try
35
command
@@ -26,6 +41,11 @@ use Git qw(
41
command_close_bidi_pipe
42
);
43
44
+BEGIN {
45
+ Memoize::memoize 'Git::config';
46
+ Memoize::memoize 'Git::config_bool';
47
+}
48
+
49
50
# From which subdir have we been invoked?
51
my $cmd_dir_prefix = eval {
@@ -79,28 +99,6 @@ sub _req_svn {
99
}
100
}
101
82
-use Carp qw/croak/;
83
-use Digest::MD5;
84
-use IO::File qw//;
85
-use File::Basename qw/dirname basename/;
86
-use File::Path qw/mkpath/;
87
-use File::Spec;
88
-use File::Find;
89
-use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
90
-use IPC::Open3;
91
-use Git::SVN::Editor qw//;
92
-use Git::SVN::Fetcher qw//;
93
-use Git::SVN::Ra qw//;
94
-use Git::SVN::Prompt qw//;
95
-use Memoize; # core since 5.8.0, Jul 2002
96
-
97
-BEGIN {
98
- Memoize::memoize 'Git::config';
99
- Memoize::memoize 'Git::config_bool';
100
-}
101
-
102
-my ($SVN);
103
-
102
$sha1 = qr/[a-f\d]{40}/;
103
$sha1_short = qr/[a-f\d]{4,40}/;
104
my ($_stdin, $_help, $_edit,