fix mr register to support actions defined in config files

[code/myrepos.git] / mr

diff --git a/mr b/mr
index e927a125bdf97c92bd5ffbf1ae6854a175678c04..5ced95eeaeb5e411a8282de9a618c00000d49525 100755 (executable)
--- a/mr
+++ b/mr
@@ -427,6 +427,7 @@ elsif ($action eq 'register') {
                        next unless length $topdir;
                        if ($directory=~/^\Q$topdir\E/) {
                                $ENV{MR_CONFIG}=$configfiles{$topdir};
                        next unless length $topdir;
                        if ($directory=~/^\Q$topdir\E/) {
                                $ENV{MR_CONFIG}=$configfiles{$topdir};

+                               $directory=$topdir;

                                last;
                        }
                }
                                last;
                        }
                }


@@ -439,13 +440,13 @@ elsif ($action eq 'register') {
        }
 
        $ENV{MR_REPO}=getcwd();
        }
 
        $ENV{MR_REPO}=getcwd();

-       my $command=findcommand("register", '', '', 'DEFAULT');
+       my $command=findcommand("register", $ENV{MR_CONFIG}, $directory, 'DEFAULT');

        if (! defined $command) {
                die "mr $action: unknown repository type\n";
        }
 
        $ENV{MR_REPO}=~s/.*\/(.*)/$1/;
        if (! defined $command) {
                die "mr $action: unknown repository type\n";
        }
 
        $ENV{MR_REPO}=~s/.*\/(.*)/$1/;

-       $command="set -e; ".$config{''}{DEFAULT}{lib}."\n".
+       $command="set -e; ".$config{$ENV{MR_CONFIG}}{$directory}{lib}."\n".

                "my_action(){ $command\n }; my_action ".
                join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
        print "mr $action: running >>$command<<\n" if $verbose;
                "my_action(){ $command\n }; my_action ".
                join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
        print "mr $action: running >>$command<<\n" if $verbose;


@@ -549,7 +550,7 @@ sub rcs_test { #{{{
                                length $a <=> length $b 
                                          ||
                                       $a cmp $b
                                length $a <=> length $b 
                                          ||
                                       $a cmp $b

-                       } grep { /_test/ } keys %{$config{$topdir}{$subdir}}) {
+                       } grep { /_test$/ } keys %{$config{$topdir}{$subdir}}) {

                my ($rcs)=$rcs_test=~/(.*)_test/;
                $test="my_$rcs_test() {\n$config{$topdir}{$subdir}{$rcs_test}\n}\n".$test;
                $test.="if my_$rcs_test; then echo $rcs; fi\n";
                my ($rcs)=$rcs_test=~/(.*)_test/;
                $test="my_$rcs_test() {\n$config{$topdir}{$subdir}{$rcs_test}\n}\n".$test;
                $test.="if my_$rcs_test; then echo $rcs; fi\n";


@@ -570,6 +571,10 @@ sub rcs_test { #{{{
        
 sub findcommand { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
        
 sub findcommand { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;

+       
+       if (exists $config{$topdir}{$subdir}{$action}) {
+               return $config{$topdir}{$subdir}{$action};
+       }

 
        my $rcs=rcs_test(@_);
 
 
        my $rcs=rcs_test(@_);
 


@@ -577,9 +582,6 @@ sub findcommand { #{{{
            exists $config{$topdir}{$subdir}{$rcs."_".$action}) {
                return $config{$topdir}{$subdir}{$rcs."_".$action};
        }
            exists $config{$topdir}{$subdir}{$rcs."_".$action}) {
                return $config{$topdir}{$subdir}{$rcs."_".$action};
        }

-       elsif (exists $config{$topdir}{$subdir}{$action}) {
-               return $config{$topdir}{$subdir}{$action};
-       }

        else {
                return undef;
        }
        else {
                return undef;
        }