use Cwd qw/cwd abs_path/;
use File::Spec::Functions qw/catdir splitdir abs2rel file_name_is_absolute/;
+use POSIX qw/WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG SIGINT SIGQUIT/;
use Object::Tiny qw/fake repo bare name work/;
=head1 VERSION
-Version 0.02
+Version 0.04
=cut
-our $VERSION = '0.02';
+our $VERSION = '0.04';
=head1 DESCRIPTION
$dir = cwd unless defined $dir;
my ($repo, $bare, $name, $work);
if ($args{fake}) {
- $work = $dir;
+ $repo = $work = $dir;
} else {
my @tries = ($dir);
- push @tries, "$dir.git" unless $dir =~ /\.git$/;
- push @tries, catdir($dir, '.git') unless $dir eq '.git';
+ my @chunks = splitdir $dir;
+ my $last = pop @chunks;
+ push @tries, "$dir.git" unless $last =~ /\.git$/;
+ push @tries, catdir($dir, '.git') unless $last eq '.git';
for (@tries) {
if (-d $_ && -d "$_/refs" and -d "$_/objects" and -e "$_/HEAD") {
$repo = $_;
}
}
return unless defined $repo;
- my @chunks = splitdir($repo);
- my $last = pop @chunks;
+ @chunks = splitdir $repo;
+ $last = pop @chunks;
if ($last eq '.git') {
$bare = 0;
$name = $chunks[-1];
- $work = catdir(@chunks);
+ $work = catdir @chunks;
} else {
$bare = 1;
($name) = $last =~ /(.*)\.git$/;
$a;
}
+my %escapes = (
+ '^' => sub { '^' },
+ 'n' => sub { shift->name },
+ 'g' => sub { _abs2rel(shift->repo, shift->root) },
+ 'G' => sub { shift->repo },
+ 'w' => sub { _abs2rel(shift->work, shift->root) },
+ 'W' => sub { shift->work },
+ 'b' => sub {
+ my ($self, $conf) = @_;
+ _abs2rel($self->bare ? $self->repo : $self->work . '.git', $conf->root)
+ },
+ 'B' => sub { $_[0]->bare ? $_[0]->repo : $_[0]->work . '.git' },
+ 'R' => sub { $_[1]->root },
+);
+my $e = quotemeta join '', keys %escapes;
+$e = "[$e]";
+
sub run {
my $self = shift;
my $conf = shift;
return unless $conf->isa('App::Rgit::Config');
my @args = @_;
unless ($self->fake) {
- my %escapes = (
- '^' => sub { '^' },
- 'n' => sub { $self->name },
- 'g' => sub { _abs2rel($self->repo, $conf->root) },
- 'G' => sub { $self->repo },
- 'w' => sub { _abs2rel($self->work, $conf->root) },
- 'W' => sub { $self->work },
- 'b' => sub { _abs2rel($self->bare ? $self->repo : $self->work . '.git', $conf->root) },
- 'B' => sub { $self->bare ? $self->repo : $self->work . '.git' },
- 'R' => sub { $conf->root },
- );
- s/\^([\^ngGwWbBR])/$escapes{$1}->()/eg for @args;
+ s/\^($e)/$escapes{$1}->($self, $conf)/eg for @args;
+ }
+ {
+ local $ENV{GIT_DIR} = $self->repo if exists $ENV{GIT_DIR};
+ local $ENV{GIT_EXEC_PATH} = $conf->git if exists $ENV{GIT_EXEC_PATH};
+ system { $conf->git } $conf->git, @args;
+ }
+ if ($? == -1) {
+ $conf->crit("Failed to execute git: $!\n");
+ return;
+ }
+ my $ret;
+ $ret = WEXITSTATUS($?) if WIFEXITED($?);
+ my $sig;
+ if (WIFSIGNALED($?)) {
+ $sig = WTERMSIG($?);
+ $conf->warn("git died with signal $sig\n");
+ if ($sig == SIGINT || $sig == SIGQUIT) {
+ $conf->err("Aborting\n");
+ exit $sig;
+ }
+ } elsif ($ret) {
+ $conf->info("git returned $ret\n");
}
- system { $conf->git } $conf->git, @args;
+ return wantarray ? ($ret, $sig) : $ret;
}
=head2 C<fake>