doc improvement

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 00d0e1c44e1f66b1e677dde3e205944ef6ca8915..7c4ff30b56dcc36f19339773e464d430ea3b830a 100755 (executable)
--- a/mr
+++ b/mr
@@ -28,6 +28,11 @@ respository.
 Any mix of revision control systems can be used with B<mr>, and you can
 define arbitrary actions for commands like "update", "checkout", or "commit".
 
 Any mix of revision control systems can be used with B<mr>, and you can
 define arbitrary actions for commands like "update", "checkout", or "commit".
 

+B<mr> cds into and operates on all registered repsitories at or below your
+working directory. Or, if you are in a subdirectory of a repository that
+contains no other registered repositories, it will stay in that directory,
+and work on only that repository,
+

 The predefined commands should be fairly familiar to users of any revision
 control system:
 
 The predefined commands should be fairly familiar to users of any revision
 control system:
 


@@ -70,11 +75,8 @@ Displays this help.
 =back
 
 Actions can be abbreviated to any unambiguous subsctring, so
 =back
 
 Actions can be abbreviated to any unambiguous subsctring, so

-"mr st" is equivilant to "mr status".
-
-B<mr> operates on all registered repsitories at or below your working
-directory. Or, if you are in a subdirectory of a repository, it will act on
-only that repository.
+"mr st" is equivilant to "mr status", and "mr up" is equivilant to "mr
+update"

 
 Additional parameters can be passed to other commands than "commit", they
 will be passed on unchanged to the underlying revision control system.
 
 Additional parameters can be passed to other commands than "commit", they
 will be passed on unchanged to the underlying revision control system.


@@ -227,36 +229,38 @@ if ($action eq 'help') {
        exec($config{''}{default}{help});
 }
 
        exec($config{''}{default}{help});
 }
 

-# handle being in a subdir of a repository
+# work out what repos to act on
+my @repos;

 my $nochdir=0;
 foreach my $topdir (sort keys %config) {
 my $nochdir=0;
 foreach my $topdir (sort keys %config) {

-       foreach my $subdir (reverse sort keys %{$config{$topdir}}) {
+       foreach my $subdir (sort keys %{$config{$topdir}}) {

                next if $subdir eq 'default';
                next if $subdir eq 'default';

-               my $d=$directory."/";

                my $dir=$topdir.$subdir;
                my $dir=$topdir.$subdir;

-               $dir.="/" unless $dir=~/\/$/;
-               if ($d =~ /^\Q$dir\E/) {
-                       $directory=$topdir.$subdir;
-                       $nochdir=1;
-                       last;
+               next if $dir ne $directory && $dir !~ /^\Q$directory\E\//;
+               push @repos, [$dir, $topdir, $subdir];
+       }
+}
+if (! @repos) {
+       # fallback to find a leaf repo
+       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;
+                       }

                }
        }
                }
        }

+       $nochdir=1;

 }
 
 my (@failed, @successful, @skipped);
 }
 
 my (@failed, @successful, @skipped);

-foreach my $topdir (sort keys %config) {
-       foreach my $subdir (sort keys %{$config{$topdir}}) {
-               
-               my $dir=$topdir.$subdir;
-
-               if (defined $directory &&
-                   $dir ne $directory &&
-                   $dir !~ /^\Q$directory\E\//) {
-                       next;
-               }
-
-               action($action, $dir, $topdir, $subdir);
-       }
+foreach my $repo (@repos) {
+       action($action, @$repo);

 }
 
 sub action {
 }
 
 sub action {