add a vim modeline to preserve joey's tabbing prefs

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 0a50a335e39e7e4ad937ca9bcdc91f4acd49396d..84f1a58a6abc878ddd6efa558d83e0a3948a91a5 100755 (executable)
--- a/mr
+++ b/mr
@@ -563,7 +563,9 @@ sub action { #{{{
                        print "mr $action: $topdir$subdir\n";
                }
                else {
                        print "mr $action: $topdir$subdir\n";
                }
                else {

-                       print "mr $action: $topdir$subdir (in subdir $directory)\n";
+                       my $s=$directory;
+                       $s=~s/^\Q$topdir$subdir\E\/?//;
+                       print "mr $action: $topdir$subdir (in subdir $s)\n";

                }
                my $command="set -e; ".$lib.
                        "my_action(){ $config{$topdir}{$subdir}{$action}\n }; my_action ".
                }
                my $command="set -e; ".$lib.
                        "my_action(){ $config{$topdir}{$subdir}{$action}\n }; my_action ".


@@ -971,7 +973,7 @@ update =
        elif [ -d "$MR_REPO"/.hg ]; then
                hg pull "$@" && hg update "$@"
        elif [ -d "$MR_REPO"/_darcs ]; then
        elif [ -d "$MR_REPO"/.hg ]; then
                hg pull "$@" && hg update "$@"
        elif [ -d "$MR_REPO"/_darcs ]; then

-               darcs pull "$@"
+               darcs pull -a "$@"

        else
                error "unknown repo type"
        fi
        else
                error "unknown repo type"
        fi


@@ -1003,7 +1005,7 @@ commit =
        elif [ -d "$MR_REPO"/.hg ]; then
                hg commit -m "$@" && hg push
        elif [ -d "$MR_REPO"/_darcs ]; then
        elif [ -d "$MR_REPO"/.hg ]; then
                hg commit -m "$@" && hg push
        elif [ -d "$MR_REPO"/_darcs ]; then

-               darcs commit -m "$@" && darcs push
+               darcs commit -a -m "$@" && darcs push -a

        else
                error "unknown repo type"
        fi
        else
                error "unknown repo type"
        fi


@@ -1099,3 +1101,5 @@ ed = echo "A horse is a horse, of course, of course.."
 T = echo "I pity the fool."
 right = echo "Not found."
 #}}}
 T = echo "I pity the fool."
 right = echo "Not found."
 #}}}

+
+# vim:sw=8:sts=0:ts=8:noet