]> 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
don't push unless the commit succeeded!
[code/myrepos.git] / mr
diff --git a/mr b/mr
index 0f80fc8c25165bec270fbbf9103ba8b67f960d60..ee5e5e2befda8f44168bfd0b6b8ea75198e97662 100755 (executable)
--- a/mr
+++ b/mr
@@ -12,7 +12,7 @@ B<mr> [options] update
 
 B<mr> [options] status
 
 
 B<mr> [options] status
 
-B<mr> [options] commit -m "message"
+B<mr> [options] commit [-m "message"]
 
 B<mr> [options] action [params ...]
 
 
 B<mr> [options] action [params ...]
 
@@ -23,7 +23,36 @@ set of repositories in a .mrconfig file, and then checkout, update, or
 perform other actions on all of the repositories at once.
 
 Any mix of revision control systems can be used with B<mr>, and you can
 perform other actions on all of the repositories at once.
 
 Any mix of revision control systems can be used with B<mr>, and you can
-define arbitrary actions like "update", "checkout", or "commit".
+define arbitrary actions for commands like "update", "checkout", or "commit".
+
+The predefined commands should be fairly familiar to users of any revision
+control system:
+
+=over 4
+
+=item checkout
+
+Checks out all the registered repositories that are not already checked
+out.
+
+=item update
+
+Updates each registered repository from its configured remote repository.
+
+If a repository isn't checked out yet, it will first check it out.
+
+=item status
+
+Displays a status report for each registered repository, showing what
+uncommitted changes are present in the repository.
+
+=item commit
+
+Commits changes to each registered repository. (By default, changes
+are pushed to the remote repository too, when using distributed systems
+like git.)
+
+The optional -m parameter allows specifying a commit message.
 
 =head1 OPTIONS
 
 
 =head1 OPTIONS
 
@@ -61,9 +90,10 @@ directory that contains the .mrconfig file.
 
 Within a section, each parameter defines a shell command to run to handle a
 given action. Note that these shell commands are run in a "set -e" shell
 
 Within a section, each parameter defines a shell command to run to handle a
 given action. Note that these shell commands are run in a "set -e" shell
-environment, and B<mr> cds into the repository directory before running
-them, except for the "checkout" command, which is run in the parent of the
-repository directory, since the repository isn't checked out yet.
+environment, where any additional parameters you pass are available in
+"$@". B<mr> cds into the repository directory before running
+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
 its command returns nonzero, then B<mr> will skip acting on that repository.
 
 There are two special parameters. If the "skip" parameter is set and
 its command returns nonzero, then B<mr> will skip acting on that repository.
@@ -119,7 +149,7 @@ loadconfig($config);
 #use Data::Dumper;
 #print Dumper(\%config);
 
 #use Data::Dumper;
 #print Dumper(\%config);
 
-my (@failures, @successes, @skipped);
+my (@failed, @successful, @skipped);
 my $first=1;
 foreach my $topdir (sort keys %config) {
        foreach my $subdir (sort keys %{$config{$topdir}}) {
 my $first=1;
 foreach my $topdir (sort keys %config) {
        foreach my $subdir (sort keys %{$config{$topdir}}) {
@@ -128,6 +158,7 @@ foreach my $topdir (sort keys %config) {
                my $dir=$topdir.$subdir;
 
                if (defined $directory &&
                my $dir=$topdir.$subdir;
 
                if (defined $directory &&
+                   $dir ne $directory &&
                    $dir !~ /^\Q$directory\E\//) {
                        print "mr $action: $dir skipped per -d parameter ($directory)\n" if $verbose;
                        push @skipped, $dir;
                    $dir !~ /^\Q$directory\E\//) {
                        print "mr $action: $dir skipped per -d parameter ($directory)\n" if $verbose;
                        push @skipped, $dir;
@@ -146,40 +177,53 @@ foreach my $topdir (sort keys %config) {
                        }
                }
 
                        }
                }
 
-               if ($action eq 'checkout') {
-                       if (-e $dir) {
-                               print "mr $action: $dir already exists, skipping checkout\n";
-                               push @skipped, $dir;
-                               next;
-                       }
-                       $dir=~s/^(.*)\/[^\/]+\/?$/$1/;
-               }
-               if (! chdir($dir)) {
-                       print STDERR "mr $action: failed to chdir to $dir: $!\n";
+               action($action, $dir, $topdir, $subdir);
+
+       }
+}
+
+sub action {
+       my ($action, $dir, $topdir, $subdir) = @_;
+
+       if ($action eq 'checkout') {
+               if (-d $dir) {
+                       print "mr $action: $dir already exists, skipping checkout\n";
                        push @skipped, $dir;
                        push @skipped, $dir;
+                       next;
                }
                }
-               elsif (! exists $config{$topdir}{$subdir}{$action}) {
-                       print STDERR "mr $action: no defined $action command for $topdir$subdir, skipping\n";
-                       push @skipped, $dir;
+               $dir=~s/^(.*)\/[^\/]+\/?$/$1/;
+       }
+       if ($action eq 'update') {
+               if (! -d $dir) {
+                       return action("checkout", $dir, $topdir, $subdir);
                }
                }
-               else {
-                       print "mr $action: in $dir\n";
-                       my $command="set -e; my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action @ARGV";
-                       my $ret=system($command);
-                       if ($ret != 0) {
-                               print STDERR "mr $action: failed to run: $command\n" if $verbose;
-                               push @failures, $topdir.$subdir;
-                               if ($ret >> 8 != 0) {
-                                       print STDERR "mr $action: command failed\n";
-                               }
-                               elsif ($ret != 0) {
-                                       print STDERR "mr $action: command died ($ret)\n";
-                               }
+       }
+
+       if (! chdir($dir)) {
+               print STDERR "mr $action: failed to chdir to $dir: $!\n";
+               push @skipped, $dir;
+       }
+       elsif (! 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";
+               my $command="set -e; my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action @ARGV";
+               my $ret=system($command);
+               if ($ret != 0) {
+                       print STDERR "mr $action: failed to run: $command\n" if $verbose;
+                       push @failed, $topdir.$subdir;
+                       if ($ret >> 8 != 0) {
+                               print STDERR "mr $action: command failed\n";
                        }
                        }
-                       else {
-                               push @successes, $dir;
+                       elsif ($ret != 0) {
+                               print STDERR "mr $action: command died ($ret)\n";
                        }
                }
                        }
                }
+               else {
+                       push @successful, $dir;
+               }
        }
 }
 
        }
 }
 
@@ -193,11 +237,11 @@ sub showstat {
        return;
 }
 print "\nmr $action: finished (".join("; ",
        return;
 }
 print "\nmr $action: finished (".join("; ",
-       showstat($#successes+1, "success", "sucesses"),
-       showstat($#failures+1, "failure", "failures"),
+       showstat($#successful+1, "successful", "successful"),
+       showstat($#failed+1, "failed", "failed"),
        showstat($#skipped+1, "skipped", "skipped"),
 ).")\n";
        showstat($#skipped+1, "skipped", "skipped"),
 ).")\n";
-exit @failures ? 1 : 0;
+exit @failed ? 1 : 0;
 
 my %loaded;
 sub loadconfig {
 
 my %loaded;
 sub loadconfig {
@@ -222,6 +266,9 @@ sub loadconfig {
                print "mr: loading config $f\n" if $verbose;
                open($in, "<", $f) || die "mr: open $f: $!\n";
                ($dir)=$f=~/^(.*\/)[^\/]+$/;
                print "mr: loading config $f\n" if $verbose;
                open($in, "<", $f) || die "mr: open $f: $!\n";
                ($dir)=$f=~/^(.*\/)[^\/]+$/;
+               if (! defined $dir) {
+                       $dir=".";
+               }
                $dir=abs_path($dir)."/";
 
                # copy in defaults from first parent
                $dir=abs_path($dir)."/";
 
                # copy in defaults from first parent
@@ -287,7 +334,7 @@ update = \
        elif [ -d .git ]; then \
                git pull origin master; \
        else \
        elif [ -d .git ]; then \
                git pull origin master; \
        else \
-               echo "mr update: unknown RCS"; \
+               echo "mr update: unknown repo type"; \
                exit 1; \
        fi
 status = \
                exit 1; \
        fi
 status = \
@@ -296,15 +343,15 @@ status = \
        elif [ -d .git ]; then \
                git status || true; \
        else \
        elif [ -d .git ]; then \
                git status || true; \
        else \
-               echo "mr status: unknown RCS"; \
+               echo "mr status: unknown repo type"; \
                exit 1; \
        fi
 commit = \
        if [ -d .svn ]; then \
                svn commit "$@"; \
        elif [ -d .git ]; then \
                exit 1; \
        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 RCS"; \
+               echo "mr commit: unknown repo type"; \
                exit 1; \
        fi
                exit 1; \
        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.