add usage example

[code/myrepos.git] / mr

diff --git a/mr b/mr
index e927a125bdf97c92bd5ffbf1ae6854a175678c04..494e89bd4bb05a4ca5bcdded5fc81c94ef6ae6e8 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};
+                               $directory=$topdir;
                                last;
                        }
                }
@@ -439,13 +440,13 @@ elsif ($action eq 'register') {
        }
 
        $ENV{MR_REPO}=getcwd();
-       my $command=findcommand("register", '', '', 'DEFAULT');
+       my $command=findcommand("register", $ENV{MR_REPO}, $directory, 'DEFAULT');
        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{$directory}{DEFAULT}{lib}."\n".
                "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
-                       } 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";
@@ -570,6 +571,10 @@ sub rcs_test { #{{{
        
 sub findcommand { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
+       
+       if (exists $config{$topdir}{$subdir}{$action}) {
+               return $config{$topdir}{$subdir}{$action};
+       }
 
        my $rcs=rcs_test(@_);
 
@@ -577,9 +582,6 @@ sub findcommand { #{{{
            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;
        }
@@ -1121,21 +1123,21 @@ svn_register =
                error "cannot determine svn url"
        fi
        echo "Registering svn url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="svn co $url $MR_REPO"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="svn co '$url' '$MR_REPO'"
 git_register = 
        url="$(LANG=C git-config --get remote.origin.url)" || true
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
        echo "Registering git url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone $url $MR_REPO"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =
        url=$(cat .bzr/branch/parent)
        if [ -z "$url" ]; then
                error "cannot determine bzr url"
        fi
        echo "Registering bzr url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="bzr clone $url $MR_REPO"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="bzr clone '$url' '$MR_REPO'"
 cvs_register =
        repo=$(cat CVS/Repository)
        root=$(cat CVS/Root)
@@ -1143,22 +1145,22 @@ cvs_register =
                error "cannot determine cvs root"
                fi
        echo "Registering cvs repository $repo at root $root"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="cvs -d '$root' co -d $MR_REPO $repo"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="cvs -d '$root' co -d '$MR_REPO' '$repo'"
 hg_register = 
        url=$(hg showconfig paths.default)
        echo "Registering mercurial repo url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="hg clone $url $MR_REPO"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="hg clone '$url' '$MR_REPO'"
 darcs_register = 
        url=$(cat _darcs/prefs/defaultrepo)
        echo "Registering darcs repository $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get $url $MR_REPO"
+       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
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
        echo "Registering git url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone --bare $url $MR_REPO"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone --bare '$url' '$MR_REPO'"
 
 help =
        if [ ! -e "$MR_PATH" ]; then