X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FApp%2FRgit%2FRepository.pm;h=2fa3837d7c22e9b1e175d9c6069ef41e0cb6bf97;hb=efa8c661b3f2394fec9b0a494fabc6efc27e1328;hp=50cc9d015ff9dd6585f3499274582ed5e27be26d;hpb=a43b4096bf0350b564465090554317935a84e7ef;p=perl%2Fmodules%2Frgit.git

diff --git a/lib/App/Rgit/Repository.pm b/lib/App/Rgit/Repository.pm
index 50cc9d0..2fa3837 100644
--- a/lib/App/Rgit/Repository.pm
+++ b/lib/App/Rgit/Repository.pm
@@ -7,6 +7,13 @@ 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/;
 
+BEGIN {
+ no warnings 'redefine';
+ *WIFEXITED   = sub { 1 }             unless eval { WIFEXITED(0);   1 };
+ *WEXITSTATUS = sub { shift() >> 8 }  unless eval { WEXITSTATUS(0); 1 };
+ *WIFSIGNALED = sub { shift() & 127 } unless eval { WIFSIGNALED(0); 1 };
+}
+
 use Object::Tiny qw/fake repo bare name work/;
 
 use App::Rgit::Utils qw/validate/;
@@ -17,11 +24,11 @@ App::Rgit::Repository - Class representing a Git repository.
 
 =head1 VERSION
 
-Version 0.03
+Version 0.05
 
 =cut
 
-our $VERSION = '0.03';
+our $VERSION = '0.05';
 
 =head1 DESCRIPTION
 
@@ -45,7 +52,7 @@ sub new {
  $dir = cwd       unless defined $dir;
  my ($repo, $bare, $name, $work);
  if ($args{fake}) {
-  $work = $dir;
+  $repo = $work = $dir;
  } else { 
   my @tries = ($dir);
   my @chunks = splitdir $dir;
@@ -110,28 +117,40 @@ sub _abs2rel {
  $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;
+ }
+ unshift @args, $conf->git;
+ $conf->info('Executing "', join(' ', @args), '" into ', $self->work, "\n");
+ {
+  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 { $args[0] } @args;
  }
- system { $conf->git } $conf->git, @args;
  if ($? == -1) {
-  warn "Failed to execute git: $!\n";
+  $conf->crit("Failed to execute git: $!\n");
   return;
  }
  my $ret;
@@ -139,13 +158,13 @@ sub run {
  my $sig;
  if (WIFSIGNALED($?)) {
   $sig = WTERMSIG($?);
-  warn "git died with signal $sig\n";
+  $conf->warn("git died with signal $sig\n");
   if ($sig == SIGINT || $sig == SIGQUIT) {
-   warn "Aborting.\n";
+   $conf->err("Aborting\n");
    exit $sig;
   }
  } elsif ($ret) {
-  warn "git returned $ret\n";
+  $conf->info("git returned $ret\n");
  }
  return wantarray ? ($ret, $sig) : $ret;
 }