* Don't try to test the repo type when doing a checkout, that can't work

[code/myrepos.git] / mr

diff --git a/mr b/mr
index b8d5835e8a038800d50629ea7daf498c556d5f7c..29001e0446c5bc4c72333d9b056c04d997a3703d 100755 (executable)
--- a/mr
+++ b/mr
@@ -343,6 +343,11 @@ sub rcs_test { #{{{
        print "mr $action: running rcs test >>$test<<\n" if $verbose;
        my $rcs=`$test`;
        chomp $rcs;
+       if ($rcs=~/\n/s) {
+               $rcs=~s/\n/, /g;
+               print STDERR "mr $action: found multiple possible repository types ($rcs) for $topdir$subdir\n";
+               return undef;
+       }
        if (! length $rcs) {
                return undef;
        }
@@ -352,12 +357,16 @@ sub rcs_test { #{{{
 } #}}}
        
 sub findcommand { #{{{
-       my ($action, $dir, $topdir, $subdir) = @_;
+       my ($action, $dir, $topdir, $subdir, $is_checkout) = @_;
        
        if (exists $config{$topdir}{$subdir}{$action}) {
                return $config{$topdir}{$subdir}{$action};
        }
 
+       if ($is_checkout) {
+               return undef;
+       }
+
        my $rcs=rcs_test(@_);
 
        if (defined $rcs && 
@@ -375,19 +384,15 @@ sub action { #{{{
        $ENV{MR_CONFIG}=$configfiles{$topdir};
        my $lib=exists $config{$topdir}{$subdir}{lib} ?
                       $config{$topdir}{$subdir}{lib}."\n" : "";
+       my $is_checkout=($action eq 'checkout');
 
-       if ($action eq 'checkout') {
+       if ($is_checkout) {
                if (-d $dir) {
                        print "mr $action: $dir already exists, skipping checkout\n" if $verbose;
                        return SKIPPED;
                }
 
                $dir=~s/^(.*)\/[^\/]+\/?$/$1/;
-
-               if (! -d $dir) {
-                       print "mr $action: creating parent directory $dir\n" if $verbose;
-                       system("mkdir", "-p", $dir);
-               }
        }
        elsif ($action =~ /update/) {
                if (! -d $dir) {
@@ -397,8 +402,8 @@ sub action { #{{{
 
        $ENV{MR_REPO}=$dir;
 
-       my $skiptest=findcommand("skip", $dir, $topdir, $subdir);
-       my $command=findcommand($action, $dir, $topdir, $subdir);
+       my $skiptest=findcommand("skip", $dir, $topdir, $subdir, $is_checkout);
+       my $command=findcommand($action, $dir, $topdir, $subdir, $is_checkout);
 
        if (defined $skiptest) {
                my $test="set -e;".$lib.
@@ -420,7 +425,12 @@ sub action { #{{{
                        return SKIPPED;
                }
        }
-       
+
+       if ($is_checkout && ! -d $dir) {
+               print "mr $action: creating parent directory $dir\n" if $verbose;
+               system("mkdir", "-p", $dir);
+       }
+
        if (! $no_chdir && ! chdir($dir)) {
                print STDERR "mr $action: failed to chdir to $dir: $!\n";
                return FAILED;
@@ -982,7 +992,7 @@ sub register { #{{{
        }
 
        $ENV{MR_REPO}=getcwd();
-       my $command=findcommand("register", $ENV{MR_REPO}, $directory, 'DEFAULT');
+       my $command=findcommand("register", $ENV{MR_REPO}, $directory, 'DEFAULT', 0);
        if (! defined $command) {
                die "mr register: unknown repository type\n";
        }
@@ -1020,7 +1030,7 @@ sub expandaction { #{{{
 } #}}}
 
 sub getopts { #{{{
-       Getopt::Long::Configure("no_permute");
+       Getopt::Long::Configure("bundling", "no_permute");
        my $result=GetOptions(
                "d|directory=s" => sub { $directory=abs_path($_[1]) },
                "c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },