X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/54b2aa669527829d36eeb92dbda13977200d5545..a992ce8dba8c624d6266cb29a59280895ba51947:/mr

diff --git a/mr b/mr
index db209d2..59aab5a 100755
--- a/mr
+++ b/mr
@@ -86,16 +86,19 @@ directory to register.
 
 =item config
 
-Adds, modifies, removed, 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 a
-value, follow it by one or more instances of "parameter=value". Use
-"parameter=" to remove a parameter. Use just "parameter" to get the value
-of 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"
 
+To show the command that mr uses to update the repository in src/foo:
+
+  mr config src/foo update
+
 =item help
 
 Displays this help.
@@ -180,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>
-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
 
@@ -290,12 +302,17 @@ elsif ($action eq 'config') {
 			$changefields{$1}=$2;
 		}
 		else {
+			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, %changefields) if %changefields;
@@ -385,7 +402,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 +669,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 +780,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.."