X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=106eb8f5ccbff273959b72aedea9b9fd3ced1e0a;hp=69445d04d38f80d33753f14915f4ae109b400343;hb=cb8fb4dc68b503474bd65c0a669d9018a3ce96fe;hpb=5dd95594637dbb6b03bc675c032a1bf430c4b0bf

diff --git a/darcs-all b/darcs-all
index 69445d0..106eb8f 100644
--- 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
 
@@ -51,6 +82,8 @@ my $checked_out_flag = 0;
 
 my %tags;
 
+my @packages;
+
 # Figure out where to get the other repositories from.
 sub getrepo {
     my $basedir = ".";
@@ -112,14 +145,6 @@ sub warning {
     }
 }
 
-sub download {
-    my ($from, $to) = @_;
-
-    my @cmd = ("wget", $from, "-O", $to);
-    message "== running @cmd";
-    system @cmd;
-}
-
 sub darcs {
     message "== running darcs @_";
     system ("darcs", @_) == 0
@@ -127,12 +152,9 @@ sub darcs {
        or die "darcs failed: $?";
 }
 
-sub darcsall {
-    my $localpath;
-    my $remotepath;
-    my $path;
-    my $tag;
+sub parsePackages {
     my @repos;
+    my $lineNum;
 
     my ($repo_base, $checked_out_tree) = getrepo();
 
@@ -140,41 +162,67 @@ sub darcsall {
     @repos = <IN>;
     close IN;
 
+    @packages = ();
+    $lineNum = 0;
     foreach (@repos) {
         chomp;
-        if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
-            $localpath = $1;
-            $tag = defined($2) ? $2 : "";
-            $remotepath = $3;
+        $lineNum++;
+        if (/^([^# ]+) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
+            my %line;
+            $line{"localpath"}  = $1;
+            $line{"tag"}        = $2;
+            $line{"remotepath"} = $3;
+            $line{"vcs"}        = $4;
+            $line{"upstream"}   = $5;
+            push @packages, \%line;
+        }
+        elsif (! /^(#.*)?$/) {
+            die "Bad content on line $lineNum of packages file: $_";
+        }
+    }
+}
 
-            if ($checked_out_tree) {
-                $path = "$repo_base/$localpath";
-            }
-            else {
-                $path = "$repo_base/$remotepath";
-            }
+sub darcsall {
+    my $localpath;
+    my $remotepath;
+    my $path;
+    my $tag;
+    my @repos;
+    my $command = $_[0];
+    my $line;
 
-            if (-d "$localpath/_darcs") {
-                if ($want_remote_repo) {
-                    darcs (@_, "--repodir", $localpath, $path);
+    my ($repo_base, $checked_out_tree) = getrepo();
+
+    for $line (@packages) {
+        $localpath  = $$line{"localpath"};
+        $tag        = $$line{"tag"};
+        $remotepath = $$line{"remotepath"};
+
+        if ($checked_out_tree) {
+            $path = "$repo_base/$localpath";
+        }
+        else {
+            $path = "$repo_base/$remotepath";
+        }
+
+        if (-d "$localpath/_darcs") {
+            if ($want_remote_repo) {
+                if ($command =~ /^opt/) {
+                    # Allows ./darcs-all optimize --relink
+                    darcs (@_, "--repodir", $localpath, "--sibling=$path");
                 } else {
-                    darcs (@_, "--repodir", $localpath);
+                    darcs (@_, "--repodir", $localpath, $path);
                 }
-            }
-            elsif ($tag eq "") {
-                message "== Required repo $localpath is missing! Skipping";
-            }
-            else {
-                message "== $localpath repo not present; skipping";
+            } else {
+                darcs (@_, "--repodir", $localpath);
             }
         }
-        elsif (! /^(#.*)?$/) {
-            die "Bad line: $_";
+        elsif ($tag eq "-") {
+            message "== Required repo $localpath is missing! Skipping";
+        }
+        else {
+            message "== $localpath repo not present; skipping";
         }
-    }
-
-    if ($_[0] eq "pull" || $_[0] eq "pul") {
-        &sync_tarballs();
     }
 }
 
@@ -185,10 +233,11 @@ sub darcsget {
     my $path;
     my $tag;
     my @repos;
+    my $line;
 
     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"];
     }
@@ -196,91 +245,41 @@ sub darcsget {
         $r_flags = \@_;
     }
 
-    open IN, "< packages" or die "Can't open packages file";
-    @repos = <IN>;
-    close IN;
+    for $line (@packages) {
+        $localpath  = $$line{"localpath"};
+        $tag        = $$line{"tag"};
+        $remotepath = $$line{"remotepath"};
 
-    foreach (@repos) {
-        chomp;
-        if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
-            $localpath = $1;
-            $tag = defined($2) ? $2 : "";
-            $remotepath = $3;
+        if ($checked_out_tree) {
+            $path = "$repo_base/$localpath";
+        }
+        else {
+            $path = "$repo_base/$remotepath";
+        }
 
-            if ($checked_out_tree) {
-                $path = "$repo_base/$localpath";
+        if ($tags{$tag} eq 1) {
+            if (-d $localpath) {
+                warning("$localpath already present; omitting");
             }
             else {
-                $path = "$repo_base/$remotepath";
-            }
-
-            if (($tag eq "") || defined($tags{$tag})) {
-                if (-d $localpath) {
-                    warning("$localpath already present; omitting");
-                }
-                else {
-                    darcs (@$r_flags, $path, $localpath);
-                }
+                darcs (@$r_flags, $path, $localpath);
             }
         }
-        elsif (! /^(#.*)?$/) {
-            die "Bad line: $_";
-        }
     }
-
-    &sync_tarballs();
 }
 
-sub sync_tarballs {
+sub darcsupstreampull {
     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;
+    my $upstream;
+    my $line;
 
-    foreach (@tarballs) {
-        chomp;
-        if (m@^([^# ]+)/([^#/ ]+) +([^ ]+)$@) {
-            $localdirectory = $1;
-            $localfilename = $2;
-            $remotepath = $3;
-            $localpath = "$localdirectory/$localfilename";
-
-            $localtarballs{$localdirectory}{$localfilename} = 1;
+    for $line (@packages) {
+        $localpath  = $$line{"localpath"};
+        $upstream   = $$line{"upstream"};
 
-            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;
+        if ($upstream ne "-") {
+            if (-d $localpath) {
+                darcs ("pull", @_, "--repodir", $localpath, $upstream);
             }
         }
     }
@@ -291,6 +290,12 @@ sub main {
         die "error: darcs-all must be run from the top level of the ghc tree."
     }
 
+    $tags{"-"} = 1;
+    $tags{"dph"} = 1;
+    $tags{"nofib"} = 0;
+    $tags{"testsuite"} = 0;
+    $tags{"extra"} = 0;
+
     while ($#_ ne -1) {
         my $arg = shift;
         # We handle -q here as well as lower down as we need to skip over it
@@ -312,11 +317,35 @@ sub main {
         elsif ($arg eq "--nofib") {
             $tags{"nofib"} = 1;
         }
+        elsif ($arg eq "--no-nofib") {
+            $tags{"nofib"} = 0;
+        }
         # --testsuite tells get to also grab the testsuite repo.
         # It has no effect on the other commands.
         elsif ($arg eq "--testsuite") {
             $tags{"testsuite"} = 1;
         }
+        elsif ($arg eq "--no-testsuite") {
+            $tags{"testsuite"} = 0;
+        }
+        # --dph tells get to also grab the dph repo.
+        # It has no effect on the other commands.
+        elsif ($arg eq "--dph") {
+            $tags{"dph"} = 1;
+        }
+        elsif ($arg eq "--no-dph") {
+            $tags{"dph"} = 0;
+        }
+        # --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 "--no-extra") {
+            $tags{"extra"} = 0;
+        }
+        # Use --checked-out if the remote repos are a checked-out tree,
+        # rather than the master trees.
         elsif ($arg eq "--checked-out") {
             $checked_out_flag = 1;
         }
@@ -333,15 +362,20 @@ sub main {
         die "What do you want to do?";
     }
     my $command = $_[0];
+    parsePackages;
     if ($command eq "get") {
         darcsget @_;
     }
+    elsif ($command eq "upstreampull") {
+        shift;
+        darcsupstreampull @_;
+    }
     else {
         if ($command =~ /^(?:w|wh|wha|what|whats|whatsn|whatsne|whatsnew)$/) {
             # 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 @_;
@@ -349,6 +383,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) {
@@ -364,6 +400,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);