]> 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:

config improvements
[code/myrepos.git] / mr
diff --git a/mr b/mr
index e15019e3b8092e74a250b9f902cd02a61d2b922c..59aab5ad845e498f69e22be6a6aba655f0832f82 100755 (executable)
--- a/mr
+++ b/mr
@@ -18,7 +18,7 @@ B<mr> [options] diff
 
 B<mr> [options] log
 
 
 B<mr> [options] log
 
-B<mr> [options] register repository
+B<mr> [options] register [repository]
 
 B<mr> [options] config section [parameter=[value] ...]
 
 
 B<mr> [options] config section [parameter=[value] ...]
 
@@ -80,19 +80,25 @@ List the repositories that mr will act on.
 
 =item register
 
 
 =item register
 
-The next parameter is the directory of an existing repository. The
-repository will be registered in the mrconfig file.
+Register an existing repository in the mrconfig file. By default, the
+epository in the current directory is registered, or you can specify a
+directory to register.
 
 =item config
 
 
 =item config
 
-Modifies the mrconfig file. The next parameter is the name of the section
-to add or modify, and it is followed by one or more instances of
-"parameter=value". Use "parameter=" to remove a parameter. 
+Adds, modifies, removes, or prints a value from the mrconfig file. The next
+parameter is the name of the section the value is in. To add or modify
+values, use one or more instances of "parameter=value". Use "parameter=" to
+remove a parameter. Use just "parameter" to get the value of a parameter.
 
 For example, to add (or edit) a repository in src/foo:
 
   mr config src/foo checkout="svn co svn://example.com/foo/trunk foo"
 
 
 For example, to add (or edit) a repository in src/foo:
 
   mr config src/foo checkout="svn co svn://example.com/foo/trunk foo"
 
+To show the command that mr uses to update the repository in src/foo:
+
+  mr config src/foo update
+
 =item help
 
 Displays this help.
 =item help
 
 Displays this help.
@@ -177,7 +183,16 @@ A few parameters have special meanings:
 =item skip
 
 If the "skip" parameter is set and its command returns nonzero, then B<mr>
 =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
 
 
 =item chain
 
@@ -281,16 +296,26 @@ elsif ($action eq 'config') {
                        $section=$1;
                }
        }
                        $section=$1;
                }
        }
-       my %fields;
+       my %changefields;
        foreach (@ARGV) {
                if (/^([^=]+)=(.*)$/) {
        foreach (@ARGV) {
                if (/^([^=]+)=(.*)$/) {
-                       $fields{$1}=$2;
+                       $changefields{$1}=$2;
                }
                else {
                }
                else {
-                       die "mr config: expected parameter=value, not \"$_\"\n";
+                       my $found=0;
+                       foreach my $topdir (sort keys %config) {
+                               if (exists $config{$topdir}{$section} &&
+                                   exists $config{$topdir}{$section}{$_}) {
+                                       print $config{$topdir}{$section}{$_}."\n";
+                                       $found=1;
+                               }
+                       }
+                       if (! $found) {
+                               die "mr $action: $section $_ not set\n";
+                       }
                }
        }
                }
        }
-       modifyconfig($config, $section, %fields);
+       modifyconfig($config, $section, %changefields) if %changefields;
        exit 0;
 }
 elsif ($action eq 'register') {
        exit 0;
 }
 elsif ($action eq 'register') {
@@ -377,7 +402,8 @@ sub action {
        $ENV{MR_REPO}=$dir;
 
        if (exists $config{$topdir}{$subdir}{skip}) {
        $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) {
                print "mr $action: running skip test >>$test<<\n" if $verbose;
                my $ret=system($test);
                if ($ret >> 8 == 0) {
@@ -643,80 +669,92 @@ __DATA__
        ls = list
 
 [DEFAULT]
        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
        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
        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
        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
        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 =                                                             \
        fi
 register =                                                             \
-       if [ -z "$1" ]; then                                            \
-               error "repository directory not specified"              \
+       if [ -n "$1" ]; then                                            \
+               cd "$1"                                                 \
        fi                                                              \
        fi                                                              \
-       cd "$1"                                                         \
        basedir="$(basename $(pwd))"                                    \
        if [ -d .svn ]; then                                            \
        basedir="$(basename $(pwd))"                                    \
        if [ -d .svn ]; then                                            \
-               url=$(svn info . |                                      \
+               url=$(LANG=C svn info . |                               \
                      grep -i ^URL: | cut -d ' ' -f 2)                  \
                if [ -z "$url" ]; then                                  \
                        error "cannot determine svn url"                \
                      grep -i ^URL: | cut -d ' ' -f 2)                  \
                if [ -z "$url" ]; then                                  \
                        error "cannot determine svn url"                \
@@ -724,7 +762,7 @@ register =                                                          \
                echo "Registering svn url: $url"                        \
                mr config "$(pwd)" checkout="svn co $url $basedir"      \
        elif [ -d .git ]; then                                          \
                echo "Registering svn url: $url"                        \
                mr config "$(pwd)" checkout="svn co $url $basedir"      \
        elif [ -d .git ]; then                                          \
-               url=$(git-config --get remote.origin.url)               \
+               url=$(LANG=C git-config --get remote.origin.url)        \
                if [ -z "$url" ]; then                                  \
                        error "cannot determine git url"                \
                fi                                                      \
                if [ -z "$url" ]; then                                  \
                        error "cannot determine git url"                \
                fi                                                      \
@@ -742,11 +780,11 @@ register =                                                                \
        fi
 list = true
 config = 
        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.."
                error "pod2man or man failed"
 
 ed = echo "A horse is a horse, of course, of course.."