* Make -j with no argument run unlimited jobs in parallel, like make -j

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 5e0ac7f4f9fe63b1ac69773d271fa694cba1a79d..30f2e7f858823d8ec1e94644abe2b7e3e4bd703c 100755 (executable)
--- a/mr
+++ b/mr
@@ -152,16 +152,20 @@ Be verbose.
 Expand the statistics line displayed at the end to include information
 about exactly which repositories failed and were skipped, if any.
 
 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.

 
 

-=item -j number
+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.

 
 

-Run the specified number of jobs in parallel. This can greatly speed up
-operations such as updates. It is not recommended for interactive
-operations.
+=item -j [number]
+
+Run the specified number of jobs in parallel, or an unlimited number of jobs
+with no number specified. This can greatly speed up operations such as updates.
+It is not recommended for interactive operations.

 
 =back
 
 
 =back
 


@@ -309,7 +313,7 @@ use constant {
 my $config_overridden=0;
 my $verbose=0;
 my $stats=0;
 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();
 my $no_chdir=0;
 my $jobs=1;
 my $directory=getcwd();


@@ -506,7 +510,7 @@ sub mrs { #{{{
        my @out;
        my $running=0;
        while (@fhs or @repos) {
        my @out;
        my $running=0;
        while (@fhs or @repos) {

-               while ($running < $jobs && @repos) {
+               while ((!$jobs || $running < $jobs) && @repos) {

                        $running++;
                        my $repo = shift @repos;
                        pipe(my $outfh, CHILD_STDOUT);
                        $running++;
                        my $repo = shift @repos;
                        pipe(my $outfh, CHILD_STDOUT);


@@ -651,8 +655,13 @@ sub selectrepos { #{{{
                my $d=$directory;
                $dir.="/" unless $dir=~/\/$/;
                $d.="/" unless $d=~/\/$/;
                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/;
                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) {
                push @repos, [$dir, $topdir, $subdir];
        }
        if (! @repos) {


@@ -919,7 +928,7 @@ sub dispatch { #{{{
                register(@ARGV);
        }
 
                register(@ARGV);
        }
 

-       if ($jobs > 1) {
+       if (!$jobs || $jobs > 1) {

                mrs($action, selectrepos());
        }
        else {
                mrs($action, selectrepos());
        }
        else {


@@ -1042,8 +1051,8 @@ sub getopts { #{{{
                "c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },
                "v|verbose" => \$verbose,
                "s|stats" => \$stats,
                "c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },
                "v|verbose" => \$verbose,
                "s|stats" => \$stats,

-               "n|no-recurse" => \$no_recurse,
-               "j|jobs=i" => \$jobs,
+               "n|no-recurse:i" => \$max_depth,
+               "j|jobs:i" => \$jobs,

        );
        if (! $result || @ARGV < 1) {
                die("Usage: mr [-d directory] action [params ...]\n".
        );
        if (! $result || @ARGV < 1) {
                die("Usage: mr [-d directory] action [params ...]\n".