]> 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
add fields
[code/myrepos.git] / mr
diff --git a/mr b/mr
index 72c917c66353024481761a1ca8dae5ed2668702f..ab71f36045abe6fc3e4fed67692bffbbf2d4ebcc 100755 (executable)
--- a/mr
+++ b/mr
@@ -82,9 +82,10 @@ Be verbose.
 
 =head1 FILES
 
 
 =head1 FILES
 
-B<mr> is configured by .mrconfig files. It searches for .mrconfig files in
-your home directory, and in the root directory of each repository specified
-in a .mrconfig file. So you could have a ~/.mrconfig that registers a
+B<mr> is configured by .mrconfig files. It starts by reading the .mrconfig
+file in your home directory. Each repository specified in a .mrconfig file
+can also have its own .mrconfig file in its root directory that can
+optionally be used as well. So you could have a ~/.mrconfig that registers a
 repository ~/src, that itself contains a ~/src/.mrconfig file, that in turn
 registers several additional repositories.
 
 repository ~/src, that itself contains a ~/src/.mrconfig file, that in turn
 registers several additional repositories.
 
@@ -100,8 +101,14 @@ environment, where any additional parameters you pass are available in
 a command, except for the "checkout" command, which is run in the parent
 of the repository directory, since the repository isn't checked out yet.
 
 a command, except for the "checkout" command, which is run in the parent
 of the repository directory, since the repository isn't checked out yet.
 
-There are two special parameters. If the "skip" parameter is set and
+There are three special parameters. If the "skip" parameter is set and
 its command returns nonzero, then B<mr> will skip acting on that repository.
 its command returns nonzero, then B<mr> will skip acting on that repository.
+If the "chain" parameter is set and its command returns nonzero, then B<mr>
+will try to load a .mrconfig file from the root of the repository. (You
+should avoid chaining from repositories with untrusted committers.) The
+"lib" parameter can specify some shell code that will be run before each
+command, this can be a useful way to define shell functions other commands
+can use.
 
 The "default" section allows setting up default handlers for each action,
 and is overridden by the contents of other sections. mr contains default
 
 The "default" section allows setting up default handlers for each action,
 and is overridden by the contents of other sections. mr contains default
@@ -112,12 +119,22 @@ For example:
 
   [src]
   checkout = svn co svn://svn.example.com/src/trunk src
 
   [src]
   checkout = svn co svn://svn.example.com/src/trunk src
+  chain = true
 
   [src/linux-2.6]
 
   [src/linux-2.6]
-  # only check this out on kodama
-  skip = test $(hostname) != kodama
+  skip = small
   checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 
   checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 
+  [default]
+  lib = \
+  small() {
+       case "$(hostname)" in; \
+       slug|snail); \
+               return 0; ;; ; \
+       esac; \
+       return 1; \
+  }
+
 =head1 AUTHOR
 
 Copyright 2007 Joey Hess <joey@kitenet.net>
 =head1 AUTHOR
 
 Copyright 2007 Joey Hess <joey@kitenet.net>
@@ -184,15 +201,6 @@ foreach my $topdir (sort keys %config) {
                print "\n" unless $first;
                $first=0;
 
                print "\n" unless $first;
                $first=0;
 
-               if (exists $config{$topdir}{$subdir}{skip}) {
-                       my $ret=system($config{$topdir}{$subdir}{skip});
-                       if ($ret >> 8 == 0) {
-                               print "mr $action: $dir skipped per config file\n" if $verbose;
-                               push @skipped, $dir;
-                               next;
-                       }
-               }
-
                action($action, $dir, $topdir, $subdir);
 
        }
                action($action, $dir, $topdir, $subdir);
 
        }
@@ -203,29 +211,42 @@ sub action {
 
        if ($action eq 'checkout') {
                if (-d $dir) {
 
        if ($action eq 'checkout') {
                if (-d $dir) {
-                       print "mr $action: $dir already exists, skipping checkout\n";
+                       print "mr $action: $dir already exists, skipping checkout\n" if $verbose;
                        push @skipped, $dir;
                        push @skipped, $dir;
-                       next;
+                       return;
                }
                $dir=~s/^(.*)\/[^\/]+\/?$/$1/;
        }
                }
                $dir=~s/^(.*)\/[^\/]+\/?$/$1/;
        }
-       if ($action eq 'update') {
+       elsif ($action eq 'update') {
                if (! -d $dir) {
                        return action("checkout", $dir, $topdir, $subdir);
                }
        }
                if (! -d $dir) {
                        return action("checkout", $dir, $topdir, $subdir);
                }
        }
-
+       
        if (! chdir($dir)) {
                print STDERR "mr $action: failed to chdir to $dir: $!\n";
                push @skipped, $dir;
        }
        if (! chdir($dir)) {
                print STDERR "mr $action: failed to chdir to $dir: $!\n";
                push @skipped, $dir;
        }
-       elsif (! exists $config{$topdir}{$subdir}{$action}) {
+
+       if (exists $config{$topdir}{$subdir}{skip}) {
+               my $ret=system($config{$topdir}{$subdir}{skip});
+               if ($ret >> 8 == 0) {
+                       print "mr $action: $dir skipped per config file\n" if $verbose;
+                       push @skipped, $dir;
+                       next;
+               }
+       }
+
+       if (! exists $config{$topdir}{$subdir}{$action}) {
                print STDERR "mr $action: no defined $action command for $topdir$subdir, skipping\n";
                push @skipped, $dir;
        }
        else {
                print "mr $action: in $dir\n";
                print STDERR "mr $action: no defined $action command for $topdir$subdir, skipping\n";
                push @skipped, $dir;
        }
        else {
                print "mr $action: in $dir\n";
-               my $command="set -e; my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
+               my $command="set -e; ".
+                       (exists $config{$topdir}{$subdir}{lib} ?
+                               $config{$topdir}{$subdir}{lib} : "").
+                       "my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
                        join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
                my $ret=system($command);
                if ($ret != 0) {
                        join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
                my $ret=system($command);
                if ($ret != 0) {
@@ -258,7 +279,13 @@ print "\nmr $action: finished (".join("; ",
        showstat($#failed+1, "failed", "failed"),
        showstat($#skipped+1, "skipped", "skipped"),
 ).")\n";
        showstat($#failed+1, "failed", "failed"),
        showstat($#skipped+1, "skipped", "skipped"),
 ).")\n";
-exit @failed ? 1 : 0;
+if (@failed) {
+       exit 1;
+}
+elsif (! @successful && @skipped) {
+       exit 1;
+}
+exit 0;
 
 my %loaded;
 sub loadconfig {
 
 my %loaded;
 sub loadconfig {
@@ -305,10 +332,6 @@ sub loadconfig {
                next if /^\s*\#/ || /^\s*$/;
                if (/^\s*\[([^\]]*)\]\s*$/) {
                        $section=$1;
                next if /^\s*\#/ || /^\s*$/;
                if (/^\s*\[([^\]]*)\]\s*$/) {
                        $section=$1;
-                       if (length $dir && $section ne "default" &&
-                           -e $dir.$section."/.mrconfig") {
-                               push @toload, $dir.$section."/.mrconfig";
-                       }
                }
                elsif (/^\s*(\w+)\s*=\s*(.*)/) {
                        my $parameter=$1;
                }
                elsif (/^\s*(\w+)\s*=\s*(.*)/) {
                        my $parameter=$1;
@@ -328,8 +351,20 @@ sub loadconfig {
                                # copy in defaults
                                $config{$dir}{$section}={ %{$config{$dir}{default}} };
                        }
                                # copy in defaults
                                $config{$dir}{$section}={ %{$config{$dir}{default}} };
                        }
-                       $config{$dir}{$section}{$parameter}=$value;
-                       $knownactions{$parameter}=1;
+                       if ($parameter ne 'lib') {
+                               $config{$dir}{$section}{$parameter}=$value;
+                               $knownactions{$parameter}=1;
+                       }
+                       else {
+                               $config{$dir}{$section}{$parameter}.=$value." ; ";
+                       }
+
+                       if ($parameter eq 'chain' &&
+                           length $dir && $section ne "default" &&
+                           -e $dir.$section."/.mrconfig" &&
+                           system($value) >> 8 == 0) {
+                               push @toload, $dir.$section."/.mrconfig";
+                       }
                }
                else {
                                die "$f line $.: parse error\n";
                }
                else {
                                die "$f line $.: parse error\n";
@@ -342,18 +377,22 @@ sub loadconfig {
        }
 }
 
        }
 }
 
-__DATA__
-# Some useful actions that mr knows about by default.
+# Finally, some useful actions that mr knows about by default.
 # These can be overridden in ~/.mrconfig.
 # These can be overridden in ~/.mrconfig.
+__DATA__
 [default]
 [default]
+lib = \
+       error() { \
+               echo "mr: $@" >&2; \
+               exit 1; \
+       }
 update = \
        if [ -d .svn ]; then \
                svn update; \
        elif [ -d .git ]; then \
                git pull origin master; \
        else \
 update = \
        if [ -d .svn ]; then \
                svn update; \
        elif [ -d .git ]; then \
                git pull origin master; \
        else \
-               echo "mr update: unknown repo type"; \
-               exit 1; \
+               error "unknown repo type"; \
        fi
 status = \
        if [ -d .svn ]; then \
        fi
 status = \
        if [ -d .svn ]; then \
@@ -361,15 +400,13 @@ status = \
        elif [ -d .git ]; then \
                git status || true; \
        else \
        elif [ -d .git ]; then \
                git status || true; \
        else \
-               echo "mr status: unknown repo type"; \
-               exit 1; \
+               error "unknown repo type"; \
        fi
 commit = \
        if [ -d .svn ]; then \
                svn commit "$@"; \
        elif [ -d .git ]; then \
        fi
 commit = \
        if [ -d .svn ]; then \
                svn commit "$@"; \
        elif [ -d .git ]; then \
-               git commit -a "$@" \
+               git commit -a "$@" && git push --all; \
        else \
        else \
-               echo "mr commit: unknown repo type"; \
-               exit 1; \
+               error "unknown repo type"; \
        fi
        fi
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.