X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=63403155220454d7c8980617cdc32a8fa2c15d2c;hp=9defa0cc503dffadbc00329274db71bf628b7a71;hb=bc6f3d39d5f2811282d2948a25da8e4c8481f4c8;hpb=d1487e87d786983dbdcdb389b665df58265e34d0

diff --git a/darcs-all b/darcs-all
index 9defa0c..6340315 100644
--- a/darcs-all
+++ b/darcs-all
@@ -22,6 +22,37 @@ use strict;
 #      ./darc-all push --dry-run
 #          To see what local patches you have relative to the main repos
 #
+# ------------ Which repos to use -------------
+# darcs-all uses the following algorithm to decide which remote repos to use
+#
+#  It always computes the remote repos from a single base, $repo_base
+#  How is $repo_base set?  
+#    If you say "-r repo", then that's $repo_base
+#    othewise $repo_base is set thus:
+#       look in _darcs/prefs/defaultrepo, 
+#       and remove the trailing 'ghc'
+#
+#  Then darcs-all iterates over the package found in the file
+#  ./packages, which has entries like:
+#         libraries/array  packages/array  darcs
+#    or, in general
+#         <local-path>  <remote-path> <vcs>
+# 
+#    If $repo_base looks like a local filesystem path, or if you give
+#    the --checked-out flag, darcs-all works on repos of form
+#          $repo_base/<local-path>
+#    otherwise darcs-all works on repos of form
+#          $repo_base/<remote-path>
+#    This logic lets you say
+#      both    darcs-all -r http://darcs.haskell.org/ghc-6.12 pull
+#      and     darcs-all -r ../HEAD pull
+#    The latter is called a "checked-out tree".
+
+# NB: darcs-all *ignores* the defaultrepo of all repos other than the
+# root one.  So the remote repos must be laid out in one of the two
+# formats given by <local-path> and <remote-path> in the file 'packages'.
+
+# -------------- Flags -------------------
 #   -q says to be quite, and -s to be silent.
 #
 #   -i says to ignore darcs errors and move on to the next repository
@@ -125,6 +156,7 @@ sub darcsall {
     my $path;
     my $tag;
     my @repos;
+    my $command = $_[0];
 
     my ($repo_base, $checked_out_tree) = getrepo();
 
@@ -148,7 +180,12 @@ sub darcsall {
 
             if (-d "$localpath/_darcs") {
                 if ($want_remote_repo) {
-                    darcs (@_, "--repodir", $localpath, $path);
+                    if ($command =~ /^opt/) {
+                        # Allows ./darcs-all optimize --relink
+                        darcs (@_, "--repodir", $localpath, "--sibling=$path");
+                    } else {
+                        darcs (@_, "--repodir", $localpath, $path);
+                    }
                 } else {
                     darcs (@_, "--repodir", $localpath);
                 }
@@ -272,7 +309,7 @@ sub main {
             # Hack around whatsnew failing if there are no changes
             $ignore_failure = 1;
         }
-        if ($command =~ /^(pul|pus|sen|put)/) {
+        if ($command =~ /^(pul|pus|sen|put|opt)/) {
             $want_remote_repo = 1;
         }
         darcsall @_;