better docs

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 61e21024919d2911181c015b0df76f083a7ef94f..f1ca9f65bb52c77adb7874eba052bfec36d1af14 100755 (executable)
--- a/mr
+++ b/mr
@@ -339,6 +339,9 @@ The "MR_CONFIG" environment variable is set to the .mrconfig file
 that defines the repo being acted on, or, if the repo is not yet in a config
 file, the .mrconfig file that should be modified to register the repo.
 
 that defines the repo being acted on, or, if the repo is not yet in a config
 file, the .mrconfig file that should be modified to register the repo.
 

+The "MR_ACTION" environment variable is set to the command being run
+(update, checkout, etc).
+

 A few parameters have special meanings:
 
 =over 4
 A few parameters have special meanings:
 
 =over 4


@@ -354,8 +357,21 @@ mr is run by joey. The second uses the hours_since function
 (included in mr's built-in library) to skip updating the repo unless it's
 been at least 12 hours since the last update.
 
 (included in mr's built-in library) to skip updating the repo unless it's
 been at least 12 hours since the last update.
 

+  [mystuff]
+  checkout = ...

   skip = test `whoami` != joey
   skip = test `whoami` != joey

+
+  [linux]
+  checkout = ...

   skip = [ "$1" = update ] && ! hours_since "$1" 12
   skip = [ "$1" = update ] && ! hours_since "$1" 12

+ 
+Another way to use skip is for a lazy checkout. This makes mr skip
+operating on a repo unless it already exists. To enable the 
+repo, you have to explicitly check it out (using "mr -d foo checkout").
+
+  [foo]
+  checkout = ...
+  skip = lazy

 
 =item order
 
 
 =item order
 


@@ -579,6 +595,7 @@ sub action {
        my $is_update=($action =~ /update/);
 
        $ENV{MR_REPO}=$dir;
        my $is_update=($action =~ /update/);
 
        $ENV{MR_REPO}=$dir;

+       $ENV{MR_ACTION}=$action;

        
        foreach my $testname ("skip", "deleted") {
                my $testcommand=findcommand($testname, $dir, $topdir, $subdir, $is_checkout);
        
        foreach my $testname ("skip", "deleted") {
                my $testcommand=findcommand($testname, $dir, $topdir, $subdir, $is_checkout);


@@ -755,6 +772,9 @@ sub hook {
                        print STDERR "mr $hook: received signal ".($? & 127)."\n";
                        return ABORT;
                }
                        print STDERR "mr $hook: received signal ".($? & 127)."\n";
                        return ABORT;
                }

+               else {
+                       return FAILED;
+               }

        }
 
        return OK;
        }
 
        return OK;


@@ -1235,21 +1255,26 @@ sub loadconfig {
                                        $knownactions{$parameter}=1;
                                }
                                if ($parameter eq 'chain' &&
                                        $knownactions{$parameter}=1;
                                }
                                if ($parameter eq 'chain' &&

-                                   length $dir && $section ne "DEFAULT" &&
-                                   -e $dir.$section."/.mrconfig") {
-                                       my $ret=system($value);
-                                       if ($ret != 0) {
-                                               if (($? & 127) == 2) {
-                                                       print STDERR "mr: chain test interrupted\n";
-                                                       exit 2;
+                                   length $dir && $section ne "DEFAULT") {
+                                       my $chaindir="$section";
+                                       if ($chaindir !~ m!/!) {
+                                               $chaindir=$dir.$chaindir;
+                                       }
+                                       if (-e "$chaindir/.mrconfig") {
+                                               my $ret=system($value);
+                                               if ($ret != 0) {
+                                                       if (($? & 127) == 2) {
+                                                               print STDERR "mr: chain test interrupted\n";
+                                                               exit 2;
+                                                       }
+                                                       elsif ($? & 127) {
+                                                               print STDERR "mr: chain test received signal ".($? & 127)."\n";
+                                                       }

                                                }
                                                }

-                                               elsif ($? & 127) {
-                                                       print STDERR "mr: chain test received signal ".($? & 127)."\n";
+                                               else {
+                                                       push @toload, ["$chaindir/.mrconfig", $chaindir];

                                                }
                                        }
                                                }
                                        }

-                                       else {
-                                               push @toload, $dir.$section."/.mrconfig";
-                                       }

                                }
                        }
                }
                                }
                        }
                }


@@ -1258,8 +1283,8 @@ sub loadconfig {
                }
        }
 
                }
        }
 

-       foreach (@toload) {
-               loadconfig($_);
+       foreach my $c (@toload) {
+               loadconfig(@$c);

        }
 }
 
        }
 }
 


@@ -1695,6 +1720,13 @@ lib =
        is_bzr_checkout() {
                LANG=C bzr info | egrep -q '^Checkout'
        }
        is_bzr_checkout() {
                LANG=C bzr info | egrep -q '^Checkout'
        }

+       lazy() {
+               if [ "$MR_ACTION" = checkout ] || [ -d "$MR_REPO" ]; then
+                       return 1
+               else
+                       return 0
+               fi
+       }

 
 svn_test = test -d "$MR_REPO"/.svn
 git_test = test -d "$MR_REPO"/.git
 
 svn_test = test -d "$MR_REPO"/.svn
 git_test = test -d "$MR_REPO"/.git