Add some comments on the alternative layout rule state

[ghc-hetmet.git] / darcs-all

diff --git a/darcs-all b/darcs-all
index a80e6f8..08fa8c5 100644 (file)
--- a/darcs-all
+++ b/darcs-all
@@ -112,20 +112,6 @@ sub warning {
     }
 }
 
-sub download {
-    my ($from, $to) = @_;
-
-    my @cmd = ("wget", $from, "-O", $to);
-    message "== running @cmd";
-    system @cmd;
-    if ($? == -1) {
-        die "Failed to execute wget: $!\n";
-    }
-    elsif ($? != 0) {
-        die "wget failed: $?\n";
-    }
-}
-
 sub darcs {
     message "== running darcs @_";
     system ("darcs", @_) == 0
@@ -139,6 +125,7 @@ sub darcsall {
     my $path;
     my $tag;
     my @repos;
+    my $command = $_[0];
 
     my ($repo_base, $checked_out_tree) = getrepo();
 
@@ -162,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);
                 }
@@ -178,10 +170,6 @@ sub darcsall {
             die "Bad line: $_";
         }
     }
-
-    if ($_[0] eq "pull" || $_[0] eq "pul") {
-        &sync_tarballs();
-    }
 }
 
 sub darcsget {
@@ -233,63 +221,6 @@ sub darcsget {
             die "Bad line: $_";
         }
     }
-
-    &sync_tarballs();
-}
-
-sub sync_tarballs {
-    my $localpath;
-    my $localdirectory;
-    my $localfilename;
-    my $actualpath;
-    my $actualfilename;
-    my $remotepath;
-    my $path;
-    my @tarballs;
-    my %localtarballs;
-    my ($repo_base, $checked_out_tree) = getrepo();
-
-    message "== Syncing tarballs";
-
-    open IN, "< tarballs" or die "Can't open packages file";
-    @tarballs = <IN>;
-    close IN;
-
-    foreach (@tarballs) {
-        chomp;
-        if (m@^([^# ]+)/([^#/ ]+) +([^ ]+)$@) {
-            $localdirectory = $1;
-            $localfilename = $2;
-            $remotepath = $3;
-            $localpath = "$localdirectory/$localfilename";
-
-            $localtarballs{$localdirectory}{$localfilename} = 1;
-
-            if (! -e $localpath) {
-                if ($checked_out_tree) {
-                    $path = "$repo_base/$localpath";
-                }
-                else {
-                    $path = "$repo_base/$remotepath";
-                }
-                &download($path, $localpath);
-            }
-        }
-        elsif (! /^(#.*)?$/) {
-            die "Bad line: $_";
-        }
-    }
-
-    foreach $localdirectory (keys %localtarballs) {
-        FILE: foreach $actualpath (glob "$localdirectory/*.tar.gz $localdirectory/*.tar.bz2") {
-            $actualfilename = $actualpath;
-            $actualfilename =~ s#.*/##;
-            if (! defined($localtarballs{$localdirectory}{$actualfilename})) {
-                message "== Deleting $actualpath";
-                unlink $actualpath;
-            }
-        }
-    }
 }
 
 sub main {
@@ -347,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 @_;
@@ -370,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);