my $cmd = $args{cmd};
$cmd = ' ' unless defined $cmd;
my $action = $class->action($cmd);
- croak "Command $cmd shouldn't be executed as an $action"
- unless $class eq __PACKAGE__ or $class->isa($action);
+ if ($class eq __PACKAGE__) {
+ $class = $action;
+ } else {
+ croak "Command $cmd should be executed as a $action"
+ unless $class->isa($action);
+ }
eval "require $action; 1" or croak "Couldn't load $action: $@";
my $r = App::Rgit::Repository->new(fake => 1);
return unless defined $r;
- $action->SUPER::new(
+ $class->SUPER::new(
cmd => $cmd,
args => $args{args} || [ ],
repos => $args{repos},
sub action {
my ($self, $cmd, $pkg) = @_;
- $cmd = $self->cmd if !defined $cmd
- and defined $self and $self->isa(__PACKAGE__);
- return unless defined $cmd;
+ if (not defined $cmd) {
+ return unless defined $self and ref $self and $self->isa(__PACKAGE__);
+ $cmd = $self->cmd;
+ }
unless (defined $pkg) {
return __PACKAGE__ . '::Each' unless defined $commands{$cmd};
return $commands{$cmd}