add ability to skip doing eg, updates, more frequently than a specified number of...

diff --git a/mr b/mr
index db209d27c38409b4dfdc09ba93cb7e85a96bbc00..06829d2c9abaaddcdab5861cfadb6888c76ee8f5 100755 (executable)
--- a/mr
+++ b/mr
@@ -180,7 +180,16 @@ A few parameters have special meanings:
 =item skip
 
 If the "skip" parameter is set and its command returns nonzero, then B<mr>
-will skip acting on that repository.
+will skip acting on that repository. The command is passed the action
+name in $1.
+
+Here are two examples. The first skips the repo unless
+mr is run by joey. The second uses the hours_since function
+(included in mr's built-in library) to skip updating the repo unless it's
+been at least 12 hours since the last update.
+
+  skip = test $(whoami) != joey
+  skip = [ "$1" = update ] && [ $(hours_since "$1") -lt 12 ]
 
 =item chain
 
@@ -385,7 +394,8 @@ sub action {
        $ENV{MR_REPO}=$dir;
 
        if (exists $config{$topdir}{$subdir}{skip}) {
-               my $test="set -e;".$lib.$config{$topdir}{$subdir}{skip};
+               my $test="set -e;".$lib.
+                       "my_action(){ $config{$topdir}{$subdir}{skip}\n }; my_action '$action'";
                print "mr $action: running skip test >>$test<<\n" if $verbose;
                my $ret=system($test);
                if ($ret >> 8 == 0) {
@@ -651,71 +661,84 @@ __DATA__
        ls = list
 
 [DEFAULT]
-lib =                                                  \
-       error() {                                       \
-               echo "mr: $@" >&2                       \
-               exit 1                                  \
+lib =                                                                  \
+       error() {                                                       \
+               echo "mr: $@" >&2                                       \
+               exit 1                                                  \
+       }                                                               \
+       hours_since() {                                                 \
+               for dir in .git .svn .bzr CVS; do                       \
+                       if [ -e "$MR_REPO/$dir" ]; then                 \
+                               flagfile="$MR_REPO/$dir/.mr_last$1"     \
+                               break                                   \
+                       fi                                              \
+               done                                                    \
+               if [ -z "$flagfile" ]; then                             \
+                       error "cannot determine flag filename"          \
+               fi                                                      \
+               perl -wle 'print -f shift() ? int((-M _) * 24) : 9999' "$flagfile" \
+               touch "$flagfile"                                       \
        }
 
-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
-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
-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
-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
-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
 register =                                                             \
        if [ -n "$1" ]; then                                            \
@@ -749,11 +772,11 @@ register =                                                                \
        fi
 list = true
 config = 
-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.."

diff --git a/mrconfig b/mrconfig
index 1668b473988c9a5ddfb635410c74655e5866b548..57868f4be51ed61fad87702d6e982615b6b2a077 100644 (file)
--- a/mrconfig
+++ b/mrconfig
@@ -12,26 +12,26 @@ gc = if [ -d "$MR_REPO"/.git ]; then git gc; fi
 # - mylaptop only succeeds if it's on my main development laptop, which 
 #   gets lots of extra cruft
 # - kite only succeeds on kite
-lib =                                                          \
-       wantsrc() {                                             \
-               test "$(whoami)" = joey                         \
-       }                                                       \
-       private() {                                             \
-               if [ "$(whoami)" = joey ]; then                 \
-                       case "$(hostname)" in                   \
-                       wren|kodama|dragon|dodo|bluebird)       \
-                               return 0                        \
-                       ;;                                      \
-                       esac                                    \
-               fi                                              \
-               return 1                                        \
-       }                                                       \
-       mylaptop() {                                            \
-               test "$(hostname)" = kodama                     \
-       }                                                       \
-       kite() {                                                \
-               test "$(hostname)" = wren                       \
-       }
+lib =                                                                  \
+       wantsrc() {                                                     \
+               test "$(whoami)" = joey                                 \
+       }                                                               \
+       private() {                                                     \
+               if [ "$(whoami)" = joey ]; then                         \
+                       case "$(hostname)" in                           \
+                       wren|kodama|dragon|dodo|bluebird)               \
+                               return 0                                \
+                       ;;                                              \
+                       esac                                            \
+               fi                                                      \
+               return 1                                                \
+       }                                                               \
+       mylaptop() {                                                    \
+               test "$(hostname)" = kodama                             \
+       }                                                               \
+       kite() {                                                        \
+               test "$(hostname)" = wren                               \
+       }                                                               \
 
 [src/mr]
 checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/mr
@@ -39,7 +39,8 @@ skip = ! wantsrc
 
 [src/linux-2.6]
 checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
-skip = ! mylaptop || ! wantsrc
+skip = ! mylaptop || ! wantsrc || \
+       ([ "$1" = update ] && [ $(hours_since "$1") -lt 12 ])
 
 [src/dpkg]
 # A merge of the upstream dpkg git repo and my own personal branch.
@@ -93,3 +94,7 @@ skip = ! private
 [doc]
 checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/doc
 skip = ! private
+
+[lib/text]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/text
+skip = ! wantmedia