X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=9eee3c6a408d3d4fbbe0f544c6fdaac207ebb265;hp=79f7a832596f2ad01be36a510f289646d71836cf;hb=0e17d4498cc037d5c18d33fcc4a4885778d266c0;hpb=92907d5d5e5f4d2a84a872500f40d909b5ee53b1

diff --git a/darcs-all b/darcs-all
index 79f7a83..9eee3c6 100644
--- a/darcs-all
+++ b/darcs-all
@@ -22,6 +22,24 @@ use strict;
 #      ./darc-all push --dry-run
 #          To see what local patches you have relative to the main repos
 #
+# -------------- Flags -------------------
+#   -q says to be quite, and -s to be silent.
+#
+#   -i says to ignore darcs errors and move on to the next repository
+#
+#   -r repo says to use repo as the location of package repositories
+#
+#   --checked-out says that the remote repo is in checked-out layout, as
+#   opposed to the layout used for the main repo.  By default a repo on
+#   the local filesystem is assumed to be checked-out, and repos accessed
+#   via HTTP or SSH are assumed to be in the main repo layout; use
+#   --checked-out to override the latter.
+#
+#   --nofib, --testsuite also get the nofib and testsuite repos respectively
+#
+#   The darcs get flag you are most likely to want is --complete. By
+#   default we pass darcs the --partial flag.
+#
 # ------------ Which repos to use -------------
 # darcs-all uses the following algorithm to decide which remote repos to use
 #
@@ -52,24 +70,6 @@ use strict;
 # 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
-#
-#   -r repo says to use repo as the location of package repositories
-#
-#   --checked-out says that the remote repo is in checked-out layout, as
-#   opposed to the layout used for the main repo.  By default a repo on
-#   the local filesystem is assumed to be checked-out, and repos accessed
-#   via HTTP or SSH are assumed to be in the main repo layout; use
-#   --checked-out to override the latter.
-#
-#   --nofib, --testsuite also get the nofib and testsuite repos respectively
-#
-#   The darcs get flag you are most likely to want is --complete. By
-#   default we pass darcs the --partial flag.
-#
 
 $| = 1; # autoflush stdout after each print, to avoid output after die
 
@@ -166,9 +166,9 @@ sub darcsall {
 
     foreach (@repos) {
         chomp;
-        if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
+        if (/^([^# ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
             $localpath = $1;
-            $tag = defined($2) ? $2 : "";
+            $tag = $2;
             $remotepath = $3;
 
             if ($checked_out_tree) {
@@ -190,7 +190,7 @@ sub darcsall {
                     darcs (@_, "--repodir", $localpath);
                 }
             }
-            elsif ($tag eq "") {
+            elsif ($tag eq "-") {
                 message "== Required repo $localpath is missing! Skipping";
             }
             else {
@@ -227,9 +227,9 @@ sub darcsget {
 
     foreach (@repos) {
         chomp;
-        if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
+        if (/^([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
             $localpath = $1;
-            $tag = defined($2) ? $2 : "";
+            $tag = $2;
             $remotepath = $3;
 
             if ($checked_out_tree) {
@@ -239,7 +239,7 @@ sub darcsget {
                 $path = "$repo_base/$remotepath";
             }
 
-            if (($tag eq "") || defined($tags{$tag})) {
+            if (($tag eq "-") || defined($tags{$tag})) {
                 if (-d $localpath) {
                     warning("$localpath already present; omitting");
                 }
@@ -285,6 +285,11 @@ sub main {
         elsif ($arg eq "--testsuite") {
             $tags{"testsuite"} = 1;
         }
+        # --extralibs tells get to also grab the extra repos.
+        # It has no effect on the other commands.
+        elsif ($arg eq "--extra") {
+            $tags{"extra"} = 1;
+        }
         elsif ($arg eq "--checked-out") {
             $checked_out_flag = 1;
         }
@@ -317,6 +322,8 @@ sub main {
 }
 
 END {
+    my $ec = $?;
+
     message "== Checking for old bytestring repo";
     if (-d "libraries/bytestring/_darcs") {
         if ((system "darcs annotate --repodir libraries/bytestring --match 'hash 20080118173113-3fd76-d5b74c04372a297b585ebea4e16d524551ce5035' > /dev/null 2> /dev/null") == 0) {
@@ -333,6 +340,20 @@ EOF
         }
     }
 
+    message "== Checking for bytestring tarball";
+    if (-d "libraries/bytestring" && not -d "libraries/bytestring/_darcs") {
+        print <<EOF;
+============================
+ATTENTION!
+
+You have an old bytestring in your GHC tree!
+
+Please remove it (e.g. "rm -r libraries/bytestring"), and then run
+"./darcs-all get" to get the darcs repository.
+============================
+EOF
+    }
+
     message "== Checking for unpulled tarball patches";
     if ((system "darcs annotate --match 'hash 20090930200358-3fd76-cab3bf4a0a9e3902eb6dd41f71712ad3a6a9bcd1' > /dev/null 2> /dev/null") == 0) {
         print <<EOF;
@@ -347,6 +368,8 @@ and say yes to each patch.
 ============================
 EOF
     }
+
+    $? = $ec;
 }
 
 main(@ARGV);