X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/adc607b0b5563afe596fdfa73347ea1cb9f1da49..e5dd85021198561461d46c50b41a927ef9e6050a:/mr?ds=inline

diff --git a/mr b/mr
index f725318..310f99a 100755
--- a/mr
+++ b/mr
@@ -39,7 +39,7 @@ working directory. Or, if you are in a subdirectory of a repository that
 contains no other registered repositories, it will stay in that directory,
 and work on only that repository,
 
-The predefined commands should be fairly familiar to users of any revision
+These predefined commands should be fairly familiar to users of any revision
 control system:
 
 =over 4
@@ -74,6 +74,12 @@ Show a diff of uncommitted changes.
 
 Show the commit log.
 
+=back
+
+These commands are also available:
+
+=over 4
+
 =item list (or ls)
 
 List the repositories that mr will act on.
@@ -132,6 +138,11 @@ directory.
 
 Be verbose.
 
+=item -s
+
+Expand the statistics line displayed at the end to include information
+about exactly which repositories failed and were skipped, if any.
+
 =back
 
 =head1 FILES
@@ -239,6 +250,7 @@ use Cwd qw(getcwd abs_path);
 my $directory=getcwd();
 my $config="$ENV{HOME}/.mrconfig";
 my $verbose=0;
+my $stats=0;
 my %config;
 my %knownactions;
 my %alias;
@@ -247,7 +259,8 @@ Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
 	"d|directory=s" => sub { $directory=abs_path($_[1]) },
 	"c|config=s" => \$config,
-	"verbose" => \$verbose,
+	"v|verbose" => \$verbose,
+	"s|stats" => \$stats,
 );
 if (! $result || @ARGV < 1) {
 	die("Usage: mr [-d directory] action [params ...]\n".
@@ -449,6 +462,12 @@ sub action { #{{{
 			}
 		}
 		else {
+			if ($action eq 'checkout' && ! -d $dir) {
+				print STDERR "mr $action: $dir missing after checkout\n";;
+				push @failed, $dir;
+				return;
+			}
+
 			push @ok, $dir;
 		}
 
@@ -473,6 +492,14 @@ print "mr $action: finished (".join("; ",
 	showstat($#failed+1, "failed", "failed"),
 	showstat($#skipped+1, "skipped", "skipped"),
 ).")\n";
+if ($stats) {
+	if (@skipped) {
+		print "mr $action: (skipped: ".join(" ", @skipped).")\n";
+	}
+	if (@failed) {
+		print "mr $action: (failed: ".join(" ", @failed).")\n";
+	}
+}
 if (@failed) {
 	exit 1;
 }
@@ -512,7 +539,10 @@ sub loadconfig { #{{{
 
 		# copy in defaults from first parent
 		my $parent=$dir;
-		while ($parent=~s/^(.*)\/[^\/]+\/?$/$1/) {
+		while ($parent=~s/^(.*\/)[^\/]+\/?$/$1/) {
+			if ($parent eq '/') {
+				$parent="";
+			}
 			if (exists $config{$parent} &&
 			    exists $config{$parent}{DEFAULT}) {
 				$config{$dir}{DEFAULT}={ %{$config{$parent}{DEFAULT}} };
@@ -527,8 +557,10 @@ sub loadconfig { #{{{
 	close $in;
 
 	my $section;
+	my $line=0;
 	while (@lines) {
 		$_=shift @lines;
+		$line++;
 		chomp;
 		next if /^\s*\#/ || /^\s*$/;
 		if (/^\[([^\]]*)\]\s*$/) {
@@ -541,6 +573,7 @@ sub loadconfig { #{{{
 			# continued value
 			while (@lines && $lines[0]=~/^\s(.+)/) {
 				shift(@lines);
+				$line++;
 				$value.="\n$1";
 				chomp $value;
 			}
@@ -572,7 +605,7 @@ sub loadconfig { #{{{
 			}
 		}
 		else {
-			die "$f line $.: parse error\n";
+			die "$f line $line: parse error\n";
 		}
 	}
 
@@ -806,4 +839,5 @@ config =
 
 ed = echo "A horse is a horse, of course, of course.."
 T = echo "I pity the fool."
+right = echo "Not found."
 #}}}