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

diff --git a/debian/changelog b/debian/changelog
index 1ec894e91886e8786a4a90014e07692848dd3285..29e50718153a3d98a2a36b4ff73276f8af37f044 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 mr (0.15) UNRELEASED; urgency=low
 mr (0.15) UNRELEASED; urgency=low

-
+  
+  [ Joey Hess ]

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

+  [ Josh Triplett ]
+  * Make -j with no argument run unlimited jobs in parallel, like make -j
+    Closes: #452467
+

  -- Joey Hess <joeyh@debian.org>  Sun, 25 Nov 2007 12:02:40 -0500
 
 mr (0.14) unstable; urgency=low
  -- Joey Hess <joeyh@debian.org>  Sun, 25 Nov 2007 12:02:40 -0500
 
 mr (0.14) unstable; urgency=low

diff --git a/mr b/mr
index a4469e9cf4506721f92e644e5702f9b81d3ed465..30f2e7f858823d8ec1e94644abe2b7e3e4bd703c 100755 (executable)
--- a/mr
+++ b/mr
@@ -161,11 +161,11 @@ 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.
 
 subdirectories deep. For example, with -n 2 it would recurse into ./src/foo,
 but not ./src/packages/bar.
 

-=item -j number
+=item -j [number]

 
 

-Run the specified number of jobs in parallel. This can greatly speed up
-operations such as updates. It is not recommended for interactive
-operations.
+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
 


@@ -510,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);


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

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

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


@@ -1052,7 +1052,7 @@ sub getopts { #{{{
                "v|verbose" => \$verbose,
                "s|stats" => \$stats,
                "n|no-recurse:i" => \$max_depth,
                "v|verbose" => \$verbose,
                "s|stats" => \$stats,
                "n|no-recurse:i" => \$max_depth,

-               "j|jobs=i" => \$jobs,
+               "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".