X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Frgit.git;a=blobdiff_plain;f=bin%2Frgit;fp=bin%2Frgit;h=3b908b4fe1f74255f52290b10797e08a7e2f18c4;hp=5b15f3427bbdc89b88e5b74bec840f6a4c73b19c;hb=dc668e3c302569ed2b5eb2ed893247308f22528a;hpb=edfd59020168422fe2c1baa014f0925968a77c9a

diff --git a/bin/rgit b/bin/rgit
index 5b15f34..3b908b4 100755
--- a/bin/rgit
+++ b/bin/rgit
@@ -8,8 +8,9 @@ use Config qw/%Config/;
 use Cwd qw/cwd/;
 use File::Spec::Functions qw/catfile path/;
 
-use App::Rgit::Utils qw/:codes :levels/;
 use App::Rgit;
+use App::Rgit::Utils qw/:levels/;
+use App::Rgit::Policy;
 
 our $VERSION;
 BEGIN {
@@ -28,26 +29,17 @@ BEGIN {
  $cmd = ' ' unless defined $cmd;
 }
 
-my $shell;
+my $policy;
 
-BEGIN {
- if (-t && $opts{I}) {
-  if (eval "require Term::ReadKey; 1") {
-   Term::ReadKey->import;
-   *policy = \&policy_interactive;
-   for (grep defined, $ENV{SHELL}, '/bin/sh') {
-    if (-x $_) {
-     $shell = $_;
-     last;
-    }
-   }
-  } else {
-   warn "You have to install Term::ReadKey to use the interactive mode.\n";
-  }
- }
- *policy = $opts{K} ? \&policy_keep
-                    : \&policy_default
-           unless defined *policy{CODE};
+if (-t && $opts{I}) {
+ $policy = 'Interactive';
+} elsif ($opts{K}) {
+ $policy = 'Keep';
+}
+$policy = eval { App::Rgit::Policy->new(name => $policy) };
+if (not defined $policy) {
+ print STDERR $@ if $@;
+ $policy = App::Rgit::Policy->new(name => 'Default');
 }
 
 setpgrp 0, 0 if $Config{d_setpgrp};
@@ -72,7 +64,7 @@ my $ar = App::Rgit->new(
  root   => $root,
  cmd    => $cmd,
  args   => \@ARGV,
- policy => \&policy,
+ policy => $policy,
  debug  => $opts{D} ? INFO : WARN,
 );
 
@@ -80,52 +72,6 @@ print STDOUT "rgit $VERSION\n" if $opts{V};
 
 exit $ar->run;
 
-sub policy_default {
- my ($cmd, $conf, $repo, $status, $signal) = @_;
- return NEXT unless $status;
- return LAST;
-}
-
-sub policy_keep { NEXT }
-
-sub policy_interactive {
- my ($cmd, $conf, $repo, $status, $signal) = @_;
- return NEXT unless $status;
- my %codes = (
-  'a' => [ LAST,        'aborting' ],
-  'i' => [ NEXT,        'ignoring' ],
-  'I' => [ NEXT | SAVE, 'ignoring all' ],
-  'r' => [ REDO,        'retrying' ],
- );
- my $int = { GetControlChars() }->{INTERRUPT};
- while (1) {
-  $conf->warn("[a]bort, [i]gnore, [I]gnore all, [r]etry, open [s]hell ?");
-  ReadMode(4);
-  my $key = ReadKey(0);
-  ReadMode(1);
-  print STDERR "\n";
-  next unless defined $key;
-  if ($key eq $int) {
-   $conf->warn("Interrupted, aborting\n");
-   return LAST;
-  } elsif ($key eq 's') {
-   if (defined $shell) {
-    $conf->info('Opening shell in ', $repo->work, "\n");
-    my $cwd = cwd;
-    $repo->chdir;
-    system { $shell } $shell;
-    chdir $cwd;
-   } else {
-    $conf->err("Couldn't find any shell\n");
-   }
-  } elsif (exists $codes{$key}) {
-   my $code = $codes{$key};
-   $conf->info('Okay, ', $code->[1], "\n");
-   return $code->[0];
-  }
- }
-}
-
 __END__
 
 =head1 NAME