X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/2359ca6904c1b268ace92ee0306539c779eff8e8..32808ba79347c860fd3acfa3f8b731795170bc93:/mr

diff --git a/mr b/mr
index 6c59683..823e3df 100755
--- a/mr
+++ b/mr
@@ -14,6 +14,8 @@ B<mr> [options] status
 
 B<mr> [options] commit [-m "message"]
 
+B<mr> [options] diff
+
 B<mr> [options] action [params ...]
 
 =head1 DESCRIPTION
@@ -32,33 +34,52 @@ control system:
 
 =item checkout (or co)
 
-Checks out all the registered repositories that are not already checked
-out.
+Checks out any repositories that are not already checked out.
 
 =item update
 
-Updates each registered repository from its configured remote repository.
+Updates each repository from its configured remote repository.
 
 If a repository isn't checked out yet, it will first check it out.
 
 =item status
 
-Displays a status report for each registered repository, showing what
+Displays a status report for each repository, showing what
 uncommitted changes are present in the repository.
 
 =item commit (or ci)
 
-Commits changes to each registered repository. (By default, changes
-are pushed to the remote repository too, when using distributed systems
-like git.)
+Commits changes to each repository. (By default, changes are pushed to the
+remote repository too, when using distributed systems like git.)
 
 The optional -m parameter allows specifying a commit message.
 
+=item diff
+
+Show a diff of uncommitted changes.
+
+=item list
+
+List the repositories that mr will act on.
+
+=item help
+
+Displays this help.
+
 =back
 
 Actions can be abbreviated to any unambiguous subsctring, so
 "mr st" is equivilant to "mr status".
 
+B<mr> operates on all registered repsitories at or below your working
+directory. Or, if you are in a subdirectory of a repository, it will act on
+only that repository.
+
+Additional parameters can be passed to other commands than "commit", they
+will be passed on unchanged to the underlying revision control system.
+This is mostly useful if the repositories mr will act on all use the same
+revision control system.
+
 =head1 OPTIONS
 
 =over 4
@@ -167,7 +188,9 @@ my $result=GetOptions(
 	"v" => \$verbose,
 );
 if (! $result || @ARGV < 1) {
-	die("Usage: mr [-d directory] action [params ...]\n");
+	die("Usage: mr [-d directory] action [params ...]\n".
+	    "(Use mr help for man page.)\n");
+
 }
 
 loadconfig(\*DATA);
@@ -175,6 +198,12 @@ loadconfig($config);
 #use Data::Dumper;
 #print Dumper(\%config);
 
+eval {
+	use FindBin qw($Bin $Script);
+	$ENV{MR_PATH}=$Bin."/".$Script;
+};
+
+# alias expansion and command stemming
 my $action=shift @ARGV;
 if (! exists $knownactions{$action}) {
 	if (exists $alias{$action}) {
@@ -192,8 +221,20 @@ if (! exists $knownactions{$action}) {
 	}
 }
 
+if ($action eq 'help') {
+	exec($config{''}{default}{help});
+}
+
+# handle being in a subdir of a repository
+foreach my $topdir (sort keys %config) {
+	foreach my $subdir (sort keys %{$config{$topdir}}) {
+		if ($directory =~ /^\Q$topdir$subdir\E\//) {
+			$directory=$topdir.$subdir;
+		}
+	}
+}
+
 my (@failed, @successful, @skipped);
-my $first=1;
 foreach my $topdir (sort keys %config) {
 	foreach my $subdir (sort keys %{$config{$topdir}}) {
 		next if $subdir eq 'default';
@@ -203,16 +244,10 @@ foreach my $topdir (sort keys %config) {
 		if (defined $directory &&
 		    $dir ne $directory &&
 		    $dir !~ /^\Q$directory\E\//) {
-			print "mr $action: $dir skipped per -d parameter ($directory)\n" if $verbose;
-			push @skipped, $dir;
 			next;
 		}
 
-		print "\n" unless $first;
-		$first=0;
-
 		action($action, $dir, $topdir, $subdir);
-
 	}
 }
 
@@ -255,7 +290,7 @@ sub action {
 		push @skipped, $dir;
 	}
 	else {
-		print "mr $action: in $dir\n";
+		print "mr $action: $dir\n";
 		my $command="set -e; ".$lib.
 			"my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
 			join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
@@ -273,6 +308,8 @@ sub action {
 		else {
 			push @successful, $dir;
 		}
+
+		print "\n";
 	}
 }
 
@@ -285,7 +322,7 @@ sub showstat {
 	}
 	return;
 }
-print "\nmr $action: finished (".join("; ",
+print "mr $action: finished (".join("; ",
 	showstat($#successful+1, "successful", "successful"),
 	showstat($#failed+1, "failed", "failed"),
 	showstat($#skipped+1, "skipped", "skipped"),
@@ -427,3 +464,18 @@ commit = \
 	else \
 		error "unknown repo type"; \
 	fi
+diff = \
+	if [ -d .svn ]; then \
+		svn diff "$@"; \
+	elif [ -d .git ]; then \
+		git diff "$@"; \
+	else \
+		error "unknown repo type"; \
+	fi
+list = true
+help = \
+	if [ ! -e "$MR_PATH" ]; then \
+		error "cannot find program path";\
+	fi; \
+	(pod2man -c mr "$MR_PATH" | man -l -) || \
+		error "pod2man or man failed"