]> 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:

projects / code / myrepos.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
use newlines to separate shell command lines
[code/myrepos.git] / mr
diff --git a/mr b/mr
index b35a3b72d80d3ad0cd3820970e0eb05ee97a3b92..bed4cacf13dfd52ed95b3a0f4e031c42b108910f 100755 (executable)
--- a/mr
+++ b/mr
@@ -133,8 +133,10 @@ come after it.
 The "ALIAS" section allows adding aliases for actions. Each parameter
 is an alias, and its value is the action to use.
 
 The "ALIAS" section allows adding aliases for actions. Each parameter
 is an alias, and its value is the action to use.
 
-All other sections specify where each repository is located, relative to the
-directory that contains the .mrconfig file.
+All other sections add repositories. The section header specifies the
+directory where the repository is located. This is relative to the directory
+that contains the mrconfig file, but you can also choose to use absolute
+paths.
 
 Within a section, each parameter defines a shell command to run to handle a
 given action. mr contains default handlers for the "update", "status", and
 
 Within a section, each parameter defines a shell command to run to handle a
 given action. mr contains default handlers for the "update", "status", and
@@ -247,8 +249,11 @@ my $nochdir=0;
 foreach my $topdir (sort keys %config) {
        foreach my $subdir (sort keys %{$config{$topdir}}) {
                next if $subdir eq 'DEFAULT';
 foreach my $topdir (sort keys %config) {
        foreach my $subdir (sort keys %{$config{$topdir}}) {
                next if $subdir eq 'DEFAULT';
-               my $dir=$topdir.$subdir;
-               next if $dir ne $directory && $dir !~ /^\Q$directory\E\//;
+               my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+               my $d=$directory;
+               $dir.="/" unless $dir=~/\/$/;
+               $d.="/" unless $d=~/\/$/;
+               next if $dir ne $directory && $dir !~ /^\Q$directory\E/;
                push @repos, [$dir, $topdir, $subdir];
        }
 }
                push @repos, [$dir, $topdir, $subdir];
        }
 }
@@ -257,7 +262,7 @@ if (! @repos) {
        LEAF: foreach my $topdir (reverse sort keys %config) {
                foreach my $subdir (reverse sort keys %{$config{$topdir}}) {
                        next if $subdir eq 'DEFAULT';
        LEAF: foreach my $topdir (reverse sort keys %config) {
                foreach my $subdir (reverse sort keys %{$config{$topdir}}) {
                        next if $subdir eq 'DEFAULT';
-                       my $dir=$topdir.$subdir;
+                       my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
                        my $d=$directory;
                        $dir.="/" unless $dir=~/\/$/;
                        $d.="/" unless $d=~/\/$/;
                        my $d=$directory;
                        $dir.="/" unless $dir=~/\/$/;
                        $d.="/" unless $d=~/\/$/;
@@ -279,7 +284,7 @@ sub action {
        my ($action, $dir, $topdir, $subdir) = @_;
        
        my $lib= exists $config{$topdir}{$subdir}{lib} ?
        my ($action, $dir, $topdir, $subdir) = @_;
        
        my $lib= exists $config{$topdir}{$subdir}{lib} ?
-                       $config{$topdir}{$subdir}{lib} : "";
+                       $config{$topdir}{$subdir}{lib}."\n" : "";
 
        if ($action eq 'checkout') {
                if (-d $dir) {
 
        if ($action eq 'checkout') {
                if (-d $dir) {
@@ -299,7 +304,7 @@ sub action {
 
        if (exists $config{$topdir}{$subdir}{skip}) {
                my $test="set -e;".$lib.$config{$topdir}{$subdir}{skip};
 
        if (exists $config{$topdir}{$subdir}{skip}) {
                my $test="set -e;".$lib.$config{$topdir}{$subdir}{skip};
-               print "mr $action: running skip test $test\n" if $verbose;
+               print "mr $action: running skip test >>$test<<\n" if $verbose;
                my $ret=system($test);
                if ($ret >> 8 == 0) {
                        print "mr $action: $dir skipped per config file\n" if $verbose;
                my $ret=system($test);
                if ($ret >> 8 == 0) {
                        print "mr $action: $dir skipped per config file\n" if $verbose;
@@ -318,19 +323,19 @@ sub action {
        }
        else {
                if (! $nochdir) {
        }
        else {
                if (! $nochdir) {
-                       print "mr $action: $dir\n";
+                       print "mr $action: $topdir$subdir\n";
                }
                else {
                }
                else {
-                       print "mr $action: $dir (in subdir $directory)\n";
+                       print "mr $action: $topdir$subdir (in subdir $directory)\n";
                }
                my $command="set -e; ".$lib.
                }
                my $command="set -e; ".$lib.
-                       "my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
+                       "my_action(){ $config{$topdir}{$subdir}{$action}\n }; my_action ".
                        join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
                        join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
-               print STDERR "mr $action: running $command\n" if $verbose;
+               print STDERR "mr $action: running >>$command<<\n" if $verbose;
                my $ret=system($command);
                if ($ret != 0) {
                        print STDERR "mr $action: failed ($ret)\n" if $verbose;
                my $ret=system($command);
                if ($ret != 0) {
                        print STDERR "mr $action: failed ($ret)\n" if $verbose;
-                       push @failed, $topdir.$subdir;
+                       push @failed, $dir;
                        if ($ret >> 8 != 0) {
                                print STDERR "mr $action: command failed\n";
                        }
                        if ($ret >> 8 != 0) {
                                print STDERR "mr $action: command failed\n";
                        }
@@ -422,8 +427,8 @@ sub loadconfig {
                        my $value=$2;
 
                        # continuation line
                        my $value=$2;
 
                        # continuation line
-                       while ($value=~/(.*)\\$/) {
-                               $value=$1.<$in>;
+                       while ($value=~/(.*)\\$/s) {
+                               $value=$1."\n".<$in>;
                                chomp $value;
                        }
 
                                chomp $value;
                        }
 
@@ -440,7 +445,7 @@ sub loadconfig {
                                $alias{$parameter}=$value;
                        }
                        elsif ($parameter eq 'lib') {
                                $alias{$parameter}=$value;
                        }
                        elsif ($parameter eq 'lib') {
-                               $config{$dir}{$section}{lib}.=$value." ; ";
+                               $config{$dir}{$section}{lib}.=$value."\n";
                        }
                        else {
                                $config{$dir}{$section}{$parameter}=$value;
                        }
                        else {
                                $config{$dir}{$section}{$parameter}=$value;
@@ -473,79 +478,79 @@ __DATA__
        ls = list
 
 [DEFAULT]
        ls = list
 
 [DEFAULT]
-lib = \
-       error() { \
-               echo "mr: $@" >&2; \
-               exit 1; \
+lib =                                                  \
+       error() {                                       \
+               echo "mr: $@" >&2                       \
+               exit 1                                  \
        }
 
        }
 
-update = \
-       if [ -d "$MR_REPO"/.svn ]; then \
-               svn update "$@"; \
-       elif [ -d "$MR_REPO"/.git ]; then \
-               git pull origin master "$@"; \
-       elif [ -d "$MR_REPO"/.bzr ]; then \
-               bzr merge "$@"; \
-       elif [ -d "$MR_REPO"/CVS ]; then \
-               cvs update "$@"; \
-       else \
-               error "unknown repo type"; \
+update =                                               \
+       if [ -d "$MR_REPO"/.svn ]; then                 \
+               svn update "$@"                         \
+       elif [ -d "$MR_REPO"/.git ]; then               \
+               git pull origin master "$@"             \
+       elif [ -d "$MR_REPO"/.bzr ]; then               \
+               bzr merge "$@"                          \
+       elif [ -d "$MR_REPO"/CVS ]; then                \
+               cvs update "$@"                         \
+       else                                            \
+               error "unknown repo type"               \
        fi
        fi
-status = \
-       if [ -d "$MR_REPO"/.svn ]; then \
-               svn status "$@"; \
-       elif [ -d "$MR_REPO"/.git ]; then \
-               git status "$@" || true; \
-       elif [ -d "$MR_REPO"/.bzr ]; then \
-               bzr status "$@"; \
-       elif [ -d "$MR_REPO"/CVS ]; then \
-               cvs status "$@"; \
-       else \
-               error "unknown repo type"; \
+status =                                               \
+       if [ -d "$MR_REPO"/.svn ]; then                 \
+               svn status "$@"                         \
+       elif [ -d "$MR_REPO"/.git ]; then               \
+               git status "$@" || true                 \
+       elif [ -d "$MR_REPO"/.bzr ]; then               \
+               bzr status "$@"                         \
+       elif [ -d "$MR_REPO"/CVS ]; then                \
+               cvs status "$@"                         \
+       else                                            \
+               error "unknown repo type"               \
        fi
        fi
-commit = \
-       if [ -d "$MR_REPO"/.svn ]; then \
-               svn commit "$@"; \
-       elif [ -d "$MR_REPO"/.git ]; then \
-               git commit -a "$@" && git push --all; \
-       elif [ -d "$MR_REPO"/.bzr ]; then \
-               bzr commit "$@" && bzr push; \
-       elif [ -d "$MR_REPO"/CVS ]; then \
-               cvs commit "$@"; \
-       else \
-               error "unknown repo type"; \
+commit =                                               \
+       if [ -d "$MR_REPO"/.svn ]; then                 \
+               svn commit "$@"                         \
+       elif [ -d "$MR_REPO"/.git ]; then               \
+               git commit -a "$@" && git push --all    \
+       elif [ -d "$MR_REPO"/.bzr ]; then               \
+               bzr commit "$@" && bzr push             \
+       elif [ -d "$MR_REPO"/CVS ]; then                \
+               cvs commit "$@"                         \
+       else                                            \
+               error "unknown repo type"               \
        fi
        fi
-diff = \
-       if [ -d "$MR_REPO"/.svn ]; then \
-               svn diff "$@"; \
-       elif [ -d "$MR_REPO"/.git ]; then \
-               git diff "$@"; \
-       elif [ -d "$MR_REPO"/.bzr ]; then \
-               bzr diff "$@"; \
-       elif [ -d "$MR_REPO"/CVS ]; then \
-               cvs diff "$@"; \
-       else \
-               error "unknown repo type"; \
+diff =                                                 \
+       if [ -d "$MR_REPO"/.svn ]; then                 \
+               svn diff "$@"                           \
+       elif [ -d "$MR_REPO"/.git ]; then               \
+               git diff "$@"                           \
+       elif [ -d "$MR_REPO"/.bzr ]; then               \
+               bzr diff "$@"                           \
+       elif [ -d "$MR_REPO"/CVS ]; then                \
+               cvs diff "$@"                           \
+       else                                            \
+               error "unknown repo type"               \
        fi
        fi
-log = \
-       if [ -d "$MR_REPO"/.svn ]; then \
-               svn log"$@"; \
-       elif [ -d "$MR_REPO"/.git ]; then \
-               git log "$@"; \
-       elif [ -d "$MR_REPO"/.bzr ]; then \
-               bzr log "$@"; \
-       elif [ -d "$MR_REPO"/CVS ]; then \
-               cvs log "$@"; \
-       else \
-               error "unknown repo type"; \
+log =                                                  \
+       if [ -d "$MR_REPO"/.svn ]; then                 \
+               svn log"$@"                             \
+       elif [ -d "$MR_REPO"/.git ]; then               \
+               git log "$@"                            \
+       elif [ -d "$MR_REPO"/.bzr ]; then               \
+               bzr log "$@"                            \
+       elif [ -d "$MR_REPO"/CVS ]; then                \
+               cvs log "$@"                            \
+       else                                            \
+               error "unknown repo type"               \
        fi
 list = true
 
        fi
 list = true
 
-help = \
-       if [ ! -e "$MR_PATH" ]; then \
-               error "cannot find program path";\
-       fi; \
-       (pod2man -c mr "$MR_PATH" | man -l -) || \
+help =                                                 \
+       if [ ! -e "$MR_PATH" ]; then                    \
+               error "cannot find program path"        \
+       fi                                              \
+       (pod2man -c mr "$MR_PATH" | man -l -) ||        \
                error "pod2man or man failed"
 
 ed = echo "A horse is a horse, of course, of course.."
                error "pod2man or man failed"
 
 ed = echo "A horse is a horse, of course, of course.."
hacking on myrepos

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.