* Better error message if more than one repo type test matches a single

[code/myrepos.git] / mr

diff --git a/mr b/mr
index aefbb4cde256298f4164f42afdf2a1ce79efe409..62c6be83af2c6dd015fb8cf7aa5104b999af732f 100755 (executable)
--- a/mr
+++ b/mr
@@ -296,7 +296,8 @@ use warnings;
 use strict;
 use Getopt::Long;
 use Cwd qw(getcwd abs_path);
-use POSIX "WNOHANG";
+
+# things that can happen when mr runs a command
 use constant {
        OK => 0,
        FAILED => 1,
@@ -304,6 +305,7 @@ use constant {
        ABORT => 3,
 };
 
+# configurables
 my $config_overridden=0;
 my $verbose=0;
 my $stats=0;
@@ -312,6 +314,7 @@ my $no_chdir=0;
 my $jobs=1;
 my $directory=getcwd();
 
+# globals :-(
 my %config;
 my %configfiles;
 my %knownactions;
@@ -320,30 +323,6 @@ my (@ok, @failed, @skipped);
 
 main();
 
-sub dispatch { #{{{
-       my $action=shift;
-
-       # actions that do not operate on all repos
-       if ($action eq 'help') {
-               help(@ARGV);
-       }
-       elsif ($action eq 'config') {
-               config(@ARGV);
-       }
-       elsif ($action eq 'register') {
-               register(@ARGV);
-       }
-
-       if ($jobs > 1) {
-               mrs($action, selectrepos());
-       }
-       else {
-               foreach my $repo (selectrepos()) {
-                       record($repo, action($action, @$repo));
-               }
-       }
-} #}}}
-
 sub rcs_test { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
 
@@ -364,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;
        }
@@ -909,7 +893,31 @@ sub modifyconfig { #{{{
        print $out @out;
        close $out;     
 } #}}}
-       
+
+sub dispatch { #{{{
+       my $action=shift;
+
+       # actions that do not operate on all repos
+       if ($action eq 'help') {
+               help(@ARGV);
+       }
+       elsif ($action eq 'config') {
+               config(@ARGV);
+       }
+       elsif ($action eq 'register') {
+               register(@ARGV);
+       }
+
+       if ($jobs > 1) {
+               mrs($action, selectrepos());
+       }
+       else {
+               foreach my $repo (selectrepos()) {
+                       record($repo, action($action, @$repo));
+               }
+       }
+} #}}}
+
 sub help { #{{{
        exec($config{''}{DEFAULT}{help}) || die "exec: $!";
 } #}}}
@@ -957,14 +965,19 @@ sub register { #{{{
                # Find the closest known mrconfig file to the current
                # directory.
                $directory.="/" unless $directory=~/\/$/;
+               my $foundconfig=0;
                foreach my $topdir (reverse sort keys %config) {
                        next unless length $topdir;
                        if ($directory=~/^\Q$topdir\E/) {
                                $ENV{MR_CONFIG}=$configfiles{$topdir};
                                $directory=$topdir;
+                               $foundconfig=1;
                                last;
                        }
                }
+               if (! $foundconfig) {
+                       $directory=""; # no config file, use builtin
+               }
        }
        if (@ARGV) {
                my $subdir=shift @ARGV;
@@ -1012,7 +1025,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 },
@@ -1128,7 +1141,7 @@ darcs_test = test -d "$MR_REPO"/_darcs
 git_bare_test =
        test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&
        test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&
-       test "$(GIT_CONFIG="$MR_REPO"/config git-config --get core.bare)" = true
+       test "$(GIT_CONFIG="$MR_REPO"/config git config --get core.bare)" = true
 
 svn_update = svn update "$@"
 git_update = if [ "$@" ]; then git pull "$@"; else git pull -t origin master; fi
@@ -1174,7 +1187,7 @@ svn_register =
        echo "Registering svn url: $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="svn co '$url' '$MR_REPO'"
 git_register = 
-       url="$(LANG=C git-config --get remote.origin.url)" || true
+       url="$(LANG=C git config --get remote.origin.url)" || true
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
@@ -1204,7 +1217,7 @@ darcs_register =
        echo "Registering darcs repository $url in $MR_CONFIG"
        mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get '$url'p '$MR_REPO'"
 git_bare_register = 
-       url="$(LANG=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
+       url="$(LANG=C GIT_CONFIG=config git config --get remote.origin.url)" || true
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi