Make the "tag" column of the packages file always present

[ghc-hetmet.git] / darcs-all

diff --git a/darcs-all b/darcs-all
index cdef628..9eee3c6 100644 (file)
--- a/darcs-all
+++ b/darcs-all
@@ -22,6 +22,7 @@ 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
@@ -39,6 +40,36 @@ use strict;
 #   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
+#
+#  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'.
+
 
 $| = 1; # autoflush stdout after each print, to avoid output after die
 
@@ -125,6 +156,7 @@ sub darcsall {
     my $path;
     my $tag;
     my @repos;
+    my $command = $_[0];
 
     my ($repo_base, $checked_out_tree) = getrepo();
 
@@ -132,11 +164,11 @@ sub darcsall {
     @repos = <IN>;
     close IN;
 
-    REPO: foreach (@repos) {
+    foreach (@repos) {
         chomp;
-        if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
+        if (/^([^# ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
             $localpath = $1;
-            $tag = defined($2) ? $2 : "";
+            $tag = $2;
             $remotepath = $3;
 
             if ($checked_out_tree) {
@@ -148,12 +180,17 @@ 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);
                 }
             }
-            elsif ($tag eq "") {
+            elsif ($tag eq "-") {
                 message "== Required repo $localpath is missing! Skipping";
             }
             else {
@@ -176,7 +213,7 @@ sub darcsget {
 
     my ($repo_base, $checked_out_tree) = getrepo();
 
-    if (! grep /(?:--complete|--partial)/, @_) {
+    if (! grep /(?:--complete|--partial|--lazy)/, @_) {
         warning("adding --partial, to override use --complete");
         $r_flags = [@_, "--partial"];
     }
@@ -190,9 +227,9 @@ sub darcsget {
 
     foreach (@repos) {
         chomp;
-        if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
+        if (/^([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
             $localpath = $1;
-            $tag = defined($2) ? $2 : "";
+            $tag = $2;
             $remotepath = $3;
 
             if ($checked_out_tree) {
@@ -202,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");
                 }
@@ -248,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;
         }
@@ -272,7 +314,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 @_;
@@ -280,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) {
@@ -295,6 +339,37 @@ version of bytestring will be used from a tarball instead.
 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;
+============================
+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
+    }
+
+    $? = $ec;
 }
 
 main(@ARGV);