X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/7634c277a5d0fedfbeb314d79e6974fb16460472..4e609667a9b2545726b8076da2f4504fa0d9c9b1:/mr?ds=sidebyside

diff --git a/mr b/mr
index 00d0e1c..3c998f3 100755
--- a/mr
+++ b/mr
@@ -73,8 +73,8 @@ 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.
+directory. Or, if you are in a subdirectory of a repository that contains
+no other registered repositories, 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.
@@ -227,36 +227,38 @@ if ($action eq 'help') {
 	exec($config{''}{default}{help});
 }
 
-# handle being in a subdir of a repository
+# work out what repos to act on
+my @repos;
 my $nochdir=0;
 foreach my $topdir (sort keys %config) {
-	foreach my $subdir (reverse sort keys %{$config{$topdir}}) {
+	foreach my $subdir (sort keys %{$config{$topdir}}) {
 		next if $subdir eq 'default';
-		my $d=$directory."/";
 		my $dir=$topdir.$subdir;
-		$dir.="/" unless $dir=~/\/$/;
-		if ($d =~ /^\Q$dir\E/) {
-			$directory=$topdir.$subdir;
-			$nochdir=1;
-			last;
+		next if $dir ne $directory && $dir !~ /^\Q$directory\E\//;
+		push @repos, [$dir, $topdir, $subdir];
+	}
+}
+if (! @repos) {
+	# fallback to find a leaf repo
+	LEAF: foreach my $topdir (reverse sort keys %config) {
+		foreach my $subdir (reverse sort keys %{$config{$topdir}}) {
+			next if $subdir eq 'default';
+			my $dir=$topdir.$subdir;
+			my $d=$directory;
+			$dir.="/" unless $dir=~/\/$/;
+			$d.="/" unless $d=~/\/$/;
+			if ($d=~/^\Q$dir\E/) {
+				push @repos, [$dir, $topdir, $subdir];
+				last LEAF;
+			}
 		}
 	}
+	$nochdir=1;
 }
 
 my (@failed, @successful, @skipped);
-foreach my $topdir (sort keys %config) {
-	foreach my $subdir (sort keys %{$config{$topdir}}) {
-		
-		my $dir=$topdir.$subdir;
-
-		if (defined $directory &&
-		    $dir ne $directory &&
-		    $dir !~ /^\Q$directory\E\//) {
-			next;
-		}
-
-		action($action, $dir, $topdir, $subdir);
-	}
+foreach my $repo (@repos) {
+	action($action, @$repo);
 }
 
 sub action {