From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 25 Nov 2007 17:04:51 +0000 (-0500)
Subject: * Allow -n to be passed a number to specify how deep to go into
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/157203e8c58b608b328d55ba8dcbcfe791c847f5?ds=sidebyside;hp=1ff64653e8a4b53b1a132e1fed293de8d170d7ce

* Allow -n to be passed a number to specify how deep to go into
  subdirectories to find repositories to act on.
---

diff --git a/debian/changelog b/debian/changelog
index df12431..0d5211a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (0.15) UNRELEASED; urgency=low
+
+  * Allow -n to be passed a number to specify how deep to go into
+    subdirectories to find repositories to act on.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 25 Nov 2007 12:02:40 -0500
+
 mr (0.14) unstable; urgency=low
 
   * Portability fixes for the non-POSIX shell of SunOS 5. Patch from Ken
diff --git a/mr b/mr
index 5e0ac7f..a4469e9 100755
--- a/mr
+++ b/mr
@@ -152,10 +152,14 @@ Be verbose.
 Expand the statistics line displayed at the end to include information
 about exactly which repositories failed and were skipped, if any.
 
-=item -n
+=item -n [number]
 
-Just operate on the repository for the current directory, do not 
-recurse into deeper repositories.
+If no number if specified, just operate on the repository for the current
+directory, do not recurse into deeper repositories.
+
+If a number is specified, will recurse into repositories at most that many
+subdirectories deep. For example, with -n 2 it would recurse into ./src/foo,
+but not ./src/packages/bar.
 
 =item -j number
 
@@ -309,7 +313,7 @@ use constant {
 my $config_overridden=0;
 my $verbose=0;
 my $stats=0;
-my $no_recurse=0;
+my $max_depth;
 my $no_chdir=0;
 my $jobs=1;
 my $directory=getcwd();
@@ -651,8 +655,13 @@ sub selectrepos { #{{{
 		my $d=$directory;
 		$dir.="/" unless $dir=~/\/$/;
 		$d.="/" unless $d=~/\/$/;
-		next if $no_recurse && $d ne $dir;
 		next if $dir ne $d && $dir !~ /^\Q$d\E/;
+		if (defined $max_depth) {
+			my @a=split('/', $dir);
+			my @b=split('/', $d);
+			do { } while (@a && @b && shift(@a) eq shift(@b));
+			next if @a > $max_depth || @b > $max_depth;
+		}
 		push @repos, [$dir, $topdir, $subdir];
 	}
 	if (! @repos) {
@@ -1042,7 +1051,7 @@ sub getopts { #{{{
 		"c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },
 		"v|verbose" => \$verbose,
 		"s|stats" => \$stats,
-		"n|no-recurse" => \$no_recurse,
+		"n|no-recurse:i" => \$max_depth,
 		"j|jobs=i" => \$jobs,
 	);
 	if (! $result || @ARGV < 1) {