X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FApp%2FRgit%2FRepository.pm;h=dbdfe731a86970373395bbca4138676d748675cc;hb=c3b443e68bbe06efc7c40f0f9ace3919a6d0864b;hp=b4c11b6488505a5538774c1cd363440533368020;hpb=86c58db021c8508af677da9c11351f7591f3cd22;p=perl%2Fmodules%2Frgit.git diff --git a/lib/App/Rgit/Repository.pm b/lib/App/Rgit/Repository.pm index b4c11b6..dbdfe73 100644 --- a/lib/App/Rgit/Repository.pm +++ b/lib/App/Rgit/Repository.pm @@ -4,9 +4,16 @@ use strict; use warnings; use Cwd qw/cwd abs_path/; -use File::Spec::Functions qw/catdir splitdir abs2rel file_name_is_absolute/; +use File::Spec::Functions qw/canonpath 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/; @@ -59,6 +66,7 @@ sub new { } } return unless defined $repo; + $repo = canonpath $repo; @chunks = splitdir $repo; $last = pop @chunks; if ($last eq '.git') { @@ -111,7 +119,7 @@ sub _abs2rel { } my %escapes = ( - '^' => sub { '^' }, + '@' => sub { '@' }, 'n' => sub { shift->name }, 'g' => sub { _abs2rel(shift->repo, shift->root) }, 'G' => sub { shift->repo }, @@ -133,7 +141,7 @@ sub run { return unless $conf->isa('App::Rgit::Config'); my @args = @_; unless ($self->fake) { - s/\^($e)/$escapes{$1}->($self, $conf)/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");