From d8306b87c7a8b6f9d1ddc76fd204f2570bc4e1e8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 11 Oct 2007 14:17:48 -0400
Subject: [PATCH] fix repo finding logic

---
 mr | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/mr b/mr
index 00d0e1c..b1139e5 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,37 @@ 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}}) {
-		next if $subdir eq 'default';
-		my $d=$directory."/";
+	foreach my $subdir (sort keys %{$config{$topdir}}) {
 		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
+	foreach my $topdir (sort keys %config) {
+		foreach my $subdir (sort keys %{$config{$topdir}}) {
+			my $dir=$topdir.$subdir;
+			my $d=$directory;
+			$dir.="/" unless $dir=~/\/$/;
+			$d.="/" unless $d=~/\/$/;
+			if ($d=~/^\Q$dir\E/) {
+				push @repos, [$dir, $topdir, $subdir];
+			}
 		}
 	}
+	if (@repos > 1) {
+		die "mr: found multiple leaf repos (should never happen)";
+	}
 }
 
 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 {
-- 
2.39.5