X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=08fa8c5f52016684256a7338bbd8b244176fea72;hp=cdef628e19389783f66390a10a84734984a16f1d;hb=ebaa8c99e67440522c619b2ee8c250191b5d1397;hpb=f7571f78feb1a3a735f77a66d556bb8e6c61d3e1

diff --git a/darcs-all b/darcs-all
index cdef628..08fa8c5 100644
--- a/darcs-all
+++ b/darcs-all
@@ -125,6 +125,7 @@ sub darcsall {
     my $path;
     my $tag;
     my @repos;
+    my $command = $_[0];
 
     my ($repo_base, $checked_out_tree) = getrepo();
 
@@ -132,7 +133,7 @@ sub darcsall {
     @repos = <IN>;
     close IN;
 
-    REPO: foreach (@repos) {
+    foreach (@repos) {
         chomp;
         if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
             $localpath = $1;
@@ -148,7 +149,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 +278,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 @_;
@@ -295,6 +301,21 @@ version of bytestring will be used from a tarball instead.
 EOF
         }
     }
+
+    message "== Checking for unpulled tarball patches";
+    if ((system "darcs annotate --match 'hash 20090930200358-3fd76-cab3bf4a0a9e3902eb6dd41f71712ad3a6a9bcd1' > /dev/null 2> /dev/null") == 0) {
+        print <<EOF;
+============================
+ATTENTION!
+
+You have the unpulled tarball patches in your GHC tree!
+
+Please remove them:
+    darcs unpull -p "Use mingw tarballs to get mingw on Windows"
+and say yes to each patch.
+============================
+EOF
+    }
 }
 
 main(@ARGV);