X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/d82be80725445a6f848c7207f77680a66a903311..cec9366aea873ebe2dca710d42f78d080c7d1ff0:/mr

diff --git a/mr b/mr
index 7c4ff30..470927a 100755
--- a/mr
+++ b/mr
@@ -16,6 +16,8 @@ B<mr> [options] commit [-m "message"]
 
 B<mr> [options] diff
 
+B<mr> [options] log
+
 B<mr> [options] action [params ...]
 
 =head1 DESCRIPTION
@@ -64,7 +66,11 @@ The optional -m parameter allows specifying a commit message.
 
 Show a diff of uncommitted changes.
 
-=item list
+=item log
+
+Show the commit log.
+
+=item list (or ls)
 
 List the repositories that mr will act on.
 
@@ -94,7 +100,7 @@ the current working directory.
 
 =item -c mrconfig
 
-Use the specified mrconfig file, instead of looking for on in your home
+Use the specified mrconfig file, instead of looking for one in your home
 directory.
 
 =item -v
@@ -114,11 +120,22 @@ registers several additional repositories.
 
 The .mrconfig file uses a variant of the INI file format. Lines starting with
 "#" are comments. Lines ending with "\" are continued on to the next line.
-Sections specify where each repository is located, relative to the
+
+The "default" section allows setting default values for the sections that
+come after it.
+
+The "alias" section allows adding aliases for actions. Each parameter
+is an alias, and its value is the action to use.
+
+All other sections specify where each repository is located, relative to the
 directory that contains the .mrconfig file.
 
 Within a section, each parameter defines a shell command to run to handle a
-given action. Note that these shell commands are run in a "set -e" shell
+given action. mr contains default handlers for the "update", "status", and
+"commit" actions, so normally you only need to specify what to do for
+"checkout".
+
+Note that these shell commands are run in a "set -e" shell
 environment, where any additional parameters you pass are available in
 "$@". The "checkout" command is run in the parent of the repository
 directory, since the repository isn't checked out yet. All other commands
@@ -132,16 +149,8 @@ If the "chain" parameter is set and its command returns nonzero, then B<mr>
 will try to load a .mrconfig file from the root of the repository. (You
 should avoid chaining from repositories with untrusted committers.) The
 "lib" parameter can specify some shell code that will be run before each
-command, this can be a useful way to define shell functions other commands
-can use.
-
-The "default" section allows setting up default handlers for each action,
-and is overridden by the contents of other sections. mr contains default
-handlers for the "update", "status", and "commit" actions, so normally
-you only need to specify what to do for "checkout".
-
-The "alias" section allows adding aliases for commands. Each parameter
-is an alias, and its value is the command to run.
+command, this can be a useful way to define shell functions for other commands
+to use.
 
 For example:
 
@@ -219,8 +228,13 @@ if (! exists $knownactions{$action}) {
 		if (@matches == 1) {
 			$action=$matches[0];
 		}
+		elsif (@matches == 0) {
+			die "mr: unknown action \"$action\" (known actions: ".
+				join(", ", sort keys %knownactions).")\n";
+		}
 		else {
-			die "mr: ambiguous action \"$action\" (matches @matches)\n";
+			die "mr: ambiguous action \"$action\" (matches: ".
+				join(", ", @matches).")\n";
 		}
 	}
 }
@@ -290,7 +304,9 @@ sub action {
 	}
 
 	if (exists $config{$topdir}{$subdir}{skip}) {
-		my $ret=system($lib.$config{$topdir}{$subdir}{skip});
+		my $test="set -e;".$lib.$config{$topdir}{$subdir}{skip};
+		print "mr $action: running skip test $test\n" if $verbose;
+		my $ret=system($test);
 		if ($ret >> 8 == 0) {
 			print "mr $action: $dir skipped per config file\n" if $verbose;
 			push @skipped, $dir;
@@ -303,13 +319,19 @@ sub action {
 		push @skipped, $dir;
 	}
 	else {
-		print "mr $action: $dir\n";
+		if (! $nochdir) {
+			print "mr $action: $dir\n";
+		}
+		else {
+			print "mr $action: $dir (in subdir $directory)\n";
+		}
 		my $command="set -e; ".$lib.
 			"my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
 			join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
+		print STDERR "mr $action: running $command\n" if $verbose;
 		my $ret=system($command);
 		if ($ret != 0) {
-			print STDERR "mr $action: failed to run: $command\n" if $verbose;
+			print STDERR "mr $action: failed ($ret)\n" if $verbose;
 			push @failed, $topdir.$subdir;
 			if ($ret >> 8 != 0) {
 				print STDERR "mr $action: command failed\n";
@@ -450,6 +472,7 @@ __DATA__
 [alias]
 	co = checkout
 	ci = commit
+	ls = list
 [default]
 lib = \
 	error() { \
@@ -461,6 +484,8 @@ update = \
 		svn update "$@"; \
 	elif [ -d "$MR_REPO"/.git ]; then \
 		git pull origin master "$@"; \
+	elif [ -d "$MR_REPO"/CVS ]; then \
+		cvs update "$@"; \
 	else \
 		error "unknown repo type"; \
 	fi
@@ -469,6 +494,8 @@ status = \
 		svn status "$@"; \
 	elif [ -d "$MR_REPO"/.git ]; then \
 		git status "$@" || true; \
+	elif [ -d "$MR_REPO"/CVS ]; then \
+		cvs status "$@"; \
 	else \
 		error "unknown repo type"; \
 	fi
@@ -477,6 +504,8 @@ commit = \
 		svn commit "$@"; \
 	elif [ -d "$MR_REPO"/.git ]; then \
 		git commit -a "$@" && git push --all; \
+	elif [ -d "$MR_REPO"/CVS ]; then \
+		cvs commit "$@"; \
 	else \
 		error "unknown repo type"; \
 	fi
@@ -485,6 +514,18 @@ diff = \
 		svn diff "$@"; \
 	elif [ -d "$MR_REPO"/.git ]; then \
 		git 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"/CVS ]; then \
+		cvs log "$@"; \
 	else \
 		error "unknown repo type"; \
 	fi