perl: move CPAN loader wrappers to another namespace

Move the Git::Error and Git::Mail::Address wrappers to the
Git::LoadCPAN::Loader::* namespace, e.g. Git::LoadCPAN::Error. That
module will then either load Error from CPAN (if installed on the OS),
or use Git::FromCPAN::Error.

When I added the Error wrapper in 20d2a30f8f ("Makefile: replace
perl/Makefile.PL with simple make rules", 2017-12-10) I didn't think
about how confusing it would be to have these modules sitting in the
same tree as our normal modules. Let's put these all into
Git::{Load,From}CPAN::* to clearly distinguish them from the rest.

This also makes things a bit less confusing since there was already a
Git::Error namespace ever since 8b9150e3e3 ("Git.pm: Handle failed
commands' output", 2006-06-24).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/examples/git-difftool.perl b/contrib/examples/git-difftool.perl
index fb0fd0b84bee8e55973c1da3f34c83b7fbf16562..b2ea80f9edcafab01de5d4a5339341cd542034f3 100755 (executable)
--- a/contrib/examples/git-difftool.perl
+++ b/contrib/examples/git-difftool.perl
@@ -13,7 +13,7 @@
 use 5.008;
 use strict;
 use warnings;
 use 5.008;
 use strict;
 use warnings;

-use Git::Error qw(:try);
+use Git::LoadCPAN::Error qw(:try);

 use File::Basename qw(dirname);
 use File::Copy;
 use File::Find;
 use File::Basename qw(dirname);
 use File::Copy;
 use File::Find;

diff --git a/git-send-email.perl b/git-send-email.perl
index d5a4826a1c5b25238c42965f2b373c5dfbfa4c39..1ec22c5ef3418bdba25a7654f782748813c60541 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -26,13 +26,13 @@
 use Term::ANSIColor;
 use File::Temp qw/ tempdir tempfile /;
 use File::Spec::Functions qw(catdir catfile);
 use Term::ANSIColor;
 use File::Temp qw/ tempdir tempfile /;
 use File::Spec::Functions qw(catdir catfile);

-use Git::Error qw(:try);
+use Git::LoadCPAN::Error qw(:try);

 use Cwd qw(abs_path cwd);
 use Git;
 use Git::I18N;
 use Cwd qw(abs_path cwd);
 use Git;
 use Git::I18N;

-use Git::Mail::Address;

 use Net::Domain ();
 use Net::SMTP ();
 use Net::Domain ();
 use Net::SMTP ();

+use Git::LoadCPAN::Mail::Address;

 
 Getopt::Long::Configure qw/ pass_through /;
 
 
 Getopt::Long::Configure qw/ pass_through /;
 

diff --git a/perl/Git.pm b/perl/Git.pm
index 151b0e714490a936479fa530e6155fe51739781d..9f246c7988f5ff43ecf8ea3465387a526a66e6f4 100644 (file)
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -104,7 +104,7 @@ =head1 DESCRIPTION
 
 
 use Carp qw(carp croak); # but croak is bad - throw instead
 
 
 use Carp qw(carp croak); # but croak is bad - throw instead

-use Git::Error qw(:try);
+use Git::LoadCPAN::Error qw(:try);

 use Cwd qw(abs_path cwd);
 use IPC::Open2 qw(open2);
 use Fcntl qw(SEEK_SET SEEK_CUR);
 use Cwd qw(abs_path cwd);
 use IPC::Open2 qw(open2);
 use Fcntl qw(SEEK_SET SEEK_CUR);

diff --git a/perl/Git/Error.pm b/perl/Git/Error.pm
deleted file mode 100644 (file)
index 09bbc97..0000000
--- a/perl/Git/Error.pm
+++ /dev/null
@@ -1,46 +0,0 @@
-package Git::Error;
-use 5.008;
-use strict;
-use warnings;
-
-=head1 NAME
-
-Git::Error - Wrapper for the L<Error> module, in case it's not installed
-
-=head1 DESCRIPTION
-
-Wraps the import function for the L<Error> module.
-
-This module is only intended to be used for code shipping in the
-C<git.git> repository. Use it for anything else at your peril!
-
-=cut
-
-sub import {
-    shift;
-    my $caller = caller;
-
-    eval {
-       require Error;
-       1;
-    } or do {
-       my $error = $@ || "Zombie Error";
-
-       my $Git_Error_pm_path = $INC{"Git/Error.pm"} || die "BUG: Should have our own path from %INC!";
-
-       require File::Basename;
-       my $Git_Error_pm_root = File::Basename::dirname($Git_Error_pm_path) || die "BUG: Can't figure out lib/Git dirname from '$Git_Error_pm_path'!";
-
-       require File::Spec;
-       my $Git_pm_FromCPAN_root = File::Spec->catdir($Git_Error_pm_root, 'FromCPAN');
-       die "BUG: '$Git_pm_FromCPAN_root' should be a directory!" unless -d $Git_pm_FromCPAN_root;
-
-       local @INC = ($Git_pm_FromCPAN_root, @INC);
-       require Error;
-    };
-
-    unshift @_, $caller;
-    goto &Error::import;
-}
-
-1;

diff --git a/perl/Git/LoadCPAN/Error.pm b/perl/Git/LoadCPAN/Error.pm
new file mode 100644 (file)
index 0000000..3513fe7
--- /dev/null
+++ b/perl/Git/LoadCPAN/Error.pm
@@ -0,0 +1,46 @@
+package Git::LoadCPAN::Error;
+use 5.008;
+use strict;
+use warnings;
+
+=head1 NAME
+
+Git::LoadCPAN::Error - Wrapper for the L<Error> module, in case it's not installed
+
+=head1 DESCRIPTION
+
+Wraps the import function for the L<Error> module.
+
+This module is only intended to be used for code shipping in the
+C<git.git> repository. Use it for anything else at your peril!
+
+=cut
+
+sub import {
+    shift;
+    my $caller = caller;
+
+    eval {
+       require Error;
+       1;
+    } or do {
+       my $error = $@ || "Zombie Error";
+
+       my $Git_Error_pm_path = $INC{"Git/LoadCPAN/Error.pm"} || die "BUG: Should have our own path from %INC!";
+
+       require File::Basename;
+       my $Git_Error_pm_root = File::Basename::dirname($Git_Error_pm_path) || die "BUG: Can't figure out lib/Git dirname from '$Git_Error_pm_path'!";
+
+       require File::Spec;
+       my $Git_pm_FromCPAN_root = File::Spec->catdir($Git_Error_pm_root, '..', 'FromCPAN');
+       die "BUG: '$Git_pm_FromCPAN_root' should be a directory!" unless -d $Git_pm_FromCPAN_root;
+
+       local @INC = ($Git_pm_FromCPAN_root, @INC);
+       require Error;
+    };
+
+    unshift @_, $caller;
+    goto &Error::import;
+}
+
+1;

diff --git a/perl/Git/LoadCPAN/Mail/Address.pm b/perl/Git/LoadCPAN/Mail/Address.pm
new file mode 100644 (file)
index 0000000..879c2f5
--- /dev/null
+++ b/perl/Git/LoadCPAN/Mail/Address.pm
@@ -0,0 +1,24 @@
+package Git::LoadCPAN::Mail::Address;
+use 5.008;
+use strict;
+use warnings;
+
+=head1 NAME
+
+Git::LoadCPAN::Mail::Address - Wrapper for the L<Mail::Address> module, in case it's not installed
+
+=head1 DESCRIPTION
+
+This module is only intended to be used for code shipping in the
+C<git.git> repository. Use it for anything else at your peril!
+
+=cut
+
+eval {
+    require Mail::Address;
+    1;
+} or do {
+    require Git::FromCPAN::Mail::Address;
+};
+
+1;

diff --git a/perl/Git/Mail/Address.pm b/perl/Git/Mail/Address.pm
deleted file mode 100644 (file)
index 2ce3e84..0000000
--- a/perl/Git/Mail/Address.pm
+++ /dev/null
@@ -1,24 +0,0 @@
-package Git::Mail::Address;
-use 5.008;
-use strict;
-use warnings;
-
-=head1 NAME
-
-Git::Mail::Address - Wrapper for the L<Mail::Address> module, in case it's not installed
-
-=head1 DESCRIPTION
-
-This module is only intended to be used for code shipping in the
-C<git.git> repository. Use it for anything else at your peril!
-
-=cut
-
-eval {
-    require Mail::Address;
-    1;
-} or do {
-    require Git::FromCPAN::Mail::Address;
-};
-
-1;