releasing version 0.15

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 66b88ffd5045509eff7b8ac2f3df3848a6e06904..8cfe01365a9994895430e2dbe714eb2b4cdb00b0 100755 (executable)
--- a/mr
+++ b/mr
@@ -152,16 +152,24 @@ 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.
+
+Note that running more than 10 jobs at a time is likely to run afoul of
+ssh connection limits. Running between 3 and 5 jobs at a time will yeild
+a good speedup in updates without loading the machine too much.

 
 =back
 
 
 =back
 


@@ -309,7 +317,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();


@@ -324,9 +332,14 @@ my (@ok, @failed, @skipped);
 
 main();
 
 
 main();
 

+my %rcs;

 sub rcs_test { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
 
 sub rcs_test { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
 

+       if (exists $rcs{$dir}) {
+               return $rcs{$dir};
+       }
+

        my $test="set -e\n";
        foreach my $rcs_test (
                        sort {
        my $test="set -e\n";
        foreach my $rcs_test (
                        sort {


@@ -350,10 +363,10 @@ sub rcs_test { #{{{
                return undef;
        }
        if (! length $rcs) {
                return undef;
        }
        if (! length $rcs) {

-               return undef;
+               return $rcs{$dir}=undef;

        }
        else {
        }
        else {

-               return $rcs;
+               return $rcs{$dir}=$rcs;

        }
 } #}}}
        
        }
 } #}}}
        


@@ -443,7 +456,7 @@ sub action { #{{{
                        return FAILED;
                }
                else {
                        return FAILED;
                }
                else {

-                       print STDERR "mr $action: no defined $action command for $rcs repository $topdir$subdir, skipping\n";
+                       print STDERR "mr $action: no defined action for $rcs repository $topdir$subdir, skipping\n";

                        return SKIPPED;
                }
        }
                        return SKIPPED;
                }
        }


@@ -501,7 +514,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);


@@ -646,8 +659,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) {


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

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

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


@@ -1037,8 +1055,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".