From: Joey Hess Date: Thu, 11 Oct 2007 18:21:25 +0000 (-0400) Subject: more leaf dir fixes X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/4e609667a9b2545726b8076da2f4504fa0d9c9b1?hp=d8306b87c7a8b6f9d1ddc76fd204f2570bc4e1e8 more leaf dir fixes --- diff --git a/mr b/mr index b1139e5..3c998f3 100755 --- a/mr +++ b/mr @@ -232,6 +232,7 @@ my @repos; my $nochdir=0; foreach my $topdir (sort keys %config) { foreach my $subdir (sort keys %{$config{$topdir}}) { + next if $subdir eq 'default'; my $dir=$topdir.$subdir; next if $dir ne $directory && $dir !~ /^\Q$directory\E\//; push @repos, [$dir, $topdir, $subdir]; @@ -239,20 +240,20 @@ foreach my $topdir (sort keys %config) { } if (! @repos) { # fallback to find a leaf repo - foreach my $topdir (sort keys %config) { - foreach my $subdir (sort keys %{$config{$topdir}}) { + 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; } } } - if (@repos > 1) { - die "mr: found multiple leaf repos (should never happen)"; - } + $nochdir=1; } my (@failed, @successful, @skipped);