* Avoid creating parent directory for a checkout that will ultimately be

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 9501322e7a6d04004266f4a21bdc64136dc2dfc2..be7d2833db3de545d4e34143acc29ecf82ad66ee 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;
        }
@@ -383,11 +388,6 @@ sub action { #{{{
                }
 
                $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) {
@@ -396,7 +396,6 @@ sub action { #{{{
        }
 
        $ENV{MR_REPO}=$dir;
-
        my $skiptest=findcommand("skip", $dir, $topdir, $subdir);
        my $command=findcommand($action, $dir, $topdir, $subdir);
 
@@ -420,7 +419,12 @@ sub action { #{{{
                        return SKIPPED;
                }
        }
-       
+
+       if ($action eq '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;