]> git.madduck.net Git - code/myrepos.git/blobdiff - mr

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

remove set -x
[code/myrepos.git] / mr
diff --git a/mr b/mr
index 74d0129432c3f701a0f29c2b816b4eb1a85583ab..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};
                        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_REPO}, $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{$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;
                "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";
@@ -1122,21 +1123,21 @@ svn_register =
                error "cannot determine svn url"
        fi
        echo "Registering svn url: $url in $MR_CONFIG"
                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"
 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"
 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)
 cvs_register =
        repo=$(cat CVS/Repository)
        root=$(cat CVS/Root)
@@ -1144,22 +1145,22 @@ cvs_register =
                error "cannot determine cvs root"
                fi
        echo "Registering cvs repository $repo at root $root"
                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"
 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"
 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"
 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
 
 help =
        if [ ! -e "$MR_PATH" ]; then