mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perl: move CPAN loader wrappers to another namespace

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2018-03-03 15:38:13 +00:00
committed by Junio C Hamano
parent 10cf3b076d
commit 28654678cf
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/examples/git-difftool.perl
View File

@ -13,7 +13,7 @@
use 5.008; use 5.008;
use strict; use strict;
use warnings; use warnings;
use Git::Error qw(:try); use Git::LoadCPAN::Error qw(:try);
use File::Basename qw(dirname); use File::Basename qw(dirname);
use File::Copy; use File::Copy;
use File::Find; use File::Find;

4
git-send-email.perl
View File

@ -26,13 +26,13 @@ use Text::ParseWords;
use Term::ANSIColor; use Term::ANSIColor;
use File::Temp qw/ tempdir tempfile /; use File::Temp qw/ tempdir tempfile /;
use File::Spec::Functions qw(catdir catfile); 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 Cwd qw(abs_path cwd);
use Git; use Git;
use Git::I18N; use Git::I18N;
use Git::Mail::Address;
use Net::Domain (); use Net::Domain ();
use Net::SMTP (); use Net::SMTP ();
use Git::LoadCPAN::Mail::Address;
Getopt::Long::Configure qw/ pass_through /; Getopt::Long::Configure qw/ pass_through /;

2
perl/Git.pm
View File

@ -104,7 +104,7 @@ increase notwithstanding).
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 Cwd qw(abs_path cwd);
use IPC::Open2 qw(open2); use IPC::Open2 qw(open2);
use Fcntl qw(SEEK_SET SEEK_CUR); use Fcntl qw(SEEK_SET SEEK_CUR);

8
perl/Git/Error.pm → perl/Git/LoadCPAN/Error.pm
View File

@ -1,11 +1,11 @@
package Git::Error; package Git::LoadCPAN::Error;
use 5.008; use 5.008;
use strict; use strict;
use warnings; use warnings;
=head1 NAME =head1 NAME
Git::Error - Wrapper for the L<Error> module, in case it's not installed Git::LoadCPAN::Error - Wrapper for the L<Error> module, in case it's not installed
=head1 DESCRIPTION =head1 DESCRIPTION
@ -26,13 +26,13 @@ sub import {
} or do { } or do {
my $error = $@ || "Zombie Error"; my $error = $@ || "Zombie Error";
my $Git_Error_pm_path = $INC{"Git/Error.pm"} || die "BUG: Should have our own path from %INC!"; my $Git_Error_pm_path = $INC{"Git/LoadCPAN/Error.pm"} || die "BUG: Should have our own path from %INC!";
require File::Basename; 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'!"; 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; require File::Spec;
my $Git_pm_FromCPAN_root = File::Spec->catdir($Git_Error_pm_root, 'FromCPAN'); 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; die "BUG: '$Git_pm_FromCPAN_root' should be a directory!" unless -d $Git_pm_FromCPAN_root;
local @INC = ($Git_pm_FromCPAN_root, @INC); local @INC = ($Git_pm_FromCPAN_root, @INC);

4
perl/Git/Mail/Address.pm → perl/Git/LoadCPAN/Mail/Address.pm
View File

@ -1,11 +1,11 @@
package Git::Mail::Address; package Git::LoadCPAN::Mail::Address;
use 5.008; use 5.008;
use strict; use strict;
use warnings; use warnings;
=head1 NAME =head1 NAME
Git::Mail::Address - Wrapper for the L<Mail::Address> module, in case it's not installed Git::LoadCPAN::Mail::Address - Wrapper for the L<Mail::Address> module, in case it's not installed
=head1 DESCRIPTION =head1 DESCRIPTION