Merge branch 'master' of ssh://kitenet.net/srv/git/kitenet.net/mr

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 6a525cdff7bf10618b9108f347ab35588b3b36fa..530f2e0f6ad2206f766deda6f74440fe26069918 100755 (executable)
--- a/mr
+++ b/mr
@@ -263,7 +263,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 {


@@ -350,9 +356,9 @@ 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]
 update = \
        if [ -d .svn ]; then \
 [default]
 update = \
        if [ -d .svn ]; then \


@@ -376,8 +382,7 @@ commit = \
        if [ -d .svn ]; then \
                svn commit "$@"; \
        elif [ -d .git ]; then \
        if [ -d .svn ]; then \
                svn commit "$@"; \
        elif [ -d .git ]; then \

-               echo git commit -a "$@" && echo git push --all \
-               git commit -a "$@" && git push --all \
+               git commit -a "$@" && git push --all; \

        else \
                echo "mr commit: unknown repo type"; \
                exit 1; \
        else \
                echo "mr commit: unknown repo type"; \
                exit 1; \