Canonify the repository path

[perl/modules/rgit.git] / lib / App / Rgit / Repository.pm

diff --git a/lib/App/Rgit/Repository.pm b/lib/App/Rgit/Repository.pm
index b8cd5eb7a6204cbcdd86c765db4a20bcb928a68f..dbdfe731a86970373395bbca4138676d748675cc 100644 (file)
--- 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/;
@@ -17,11 +24,11 @@ App::Rgit::Repository - Class representing a Git repository.
 
 =head1 VERSION
 
-Version 0.04
+Version 0.05
 
 =cut
 
-our $VERSION = '0.04';
+our $VERSION = '0.05';
 
 =head1 DESCRIPTION
 
@@ -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,15 +141,17 @@ 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");
  {
   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;
+  system { $args[0] } @args;
  }
  if ($? == -1) {
-  warn "Failed to execute git: $!\n";
+  $conf->crit("Failed to execute git: $!\n");
   return;
  }
  my $ret;
@@ -149,13 +159,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;
 }