X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=darcs-all;h=1a0e639a4789661e2e733d235af496aa63ac2ceb;hb=2bb3a439c106935d97fae7f7a0b60c21493d1bef;hp=e8a113915ab5d15a88112df7d19c9d69cd4b2d2f;hpb=e86d72733e4eeda752a1b0b2874dd58090eae197;p=ghc-hetmet.git

diff --git a/darcs-all b/darcs-all
index e8a1139..1a0e639 100644
--- a/darcs-all
+++ b/darcs-all
@@ -4,14 +4,16 @@ use strict;
 
 # Usage:
 #
-# ./darcs-all [-q] [-s] [--nofib] [--testsuite] get [darcs get flags]
+# ./darcs-all [-q] [-s] [-i] [-r repo] [--nofib] [--testsuite] get [darcs get flags]
 #   This gets the GHC core repos, if they do not already exist.
 #   -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
 #   --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.
 #
-# ./darcs-all [-q] [-s] cmd [darcs cmd flags]
+# ./darcs-all [-q] [-s] [-i] [-r repo] cmd [darcs cmd flags]
 #   This runs the darcs "cmd" command, with any flags you give, in all
 #   of the repos you have checked out. e.g.
 #       ./darcs-all pull
@@ -20,36 +22,56 @@ use strict;
 
 $| = 1; # autoflush stdout after each print, to avoid output after die
 
-# Figure out where to get the other repositories from,
-# based on where this GHC repo came from.
-my $defaultrepo = `cat _darcs/prefs/defaultrepo`;
-chomp $defaultrepo;
-my $defaultrepo_base;
-my $checked_out_tree;
-
-if ($defaultrepo =~ /^...*:/) {
-    # HTTP or SSH
-    # Above regex says "at least two chars before the :", to avoid
-    # catching Win32 drives ("C:\").
-    $defaultrepo_base = $defaultrepo;
-    $defaultrepo_base =~ s#/[^/]+/?$##;
-    $checked_out_tree = 0;
-}
-elsif ($defaultrepo =~ /^\/|\.\.\/|.:(\/|\\)/) {
-    # Local filesystem, either absolute or relative path
-    # (assumes a checked-out tree):
-    $defaultrepo_base = $defaultrepo;
-    $checked_out_tree = 1;
-}
-else {
-    die "Couldn't work out defaultrepo";
-}
+my $defaultrepo;
 
 my $verbose = 2;
 my $ignore_failure = 0;
+my $want_remote_repo = 0;
 
 my %tags;
 
+# Figure out where to get the other repositories from.
+sub getrepo {
+    my $basedir = ".";
+    my $repo = $defaultrepo || `cat $basedir/_darcs/prefs/defaultrepo`;
+    chomp $repo;
+
+    my $repo_base;
+    my $checked_out_tree;
+
+    if ($repo =~ /^...*:/) {
+        # HTTP or SSH
+        # Above regex says "at least two chars before the :", to avoid
+        # catching Win32 drives ("C:\").
+        $repo_base = $repo;
+        $checked_out_tree = 0;
+
+        # Don't drop the last part of the path if specified with -r, as
+        # it expects repos of the form:
+        #
+        #   http://darcs.haskell.org
+        #
+        # rather than
+        #   
+        #   http://darcs.haskell.org/ghc
+        #
+        if (!$defaultrepo) {
+            $repo_base =~ s#/[^/]+/?$##;
+        }
+    }
+    elsif ($repo =~ /^\/|\.\.\/|.:(\/|\\)/) {
+        # Local filesystem, either absolute or relative path
+        # (assumes a checked-out tree):
+        $repo_base = $repo;
+        $checked_out_tree = 1;
+    }
+    else {
+        die "Couldn't work out repo";
+    }
+
+    return $repo_base, $checked_out_tree;
+}
+
 sub message {
     if ($verbose >= 2) {
         print "@_\n";
@@ -65,28 +87,43 @@ sub warning {
 sub darcs {
     message "== running darcs @_";
     system ("darcs", @_) == 0
-        or $ignore_failure
-        or die "darcs failed: $?";
+       or $ignore_failure
+       or die "darcs failed: $?";
 }
 
 sub darcsall {
     my $localpath;
+    my $remotepath;
     my $path;
     my $tag;
     my @repos;
 
+    my ($repo_base, $checked_out_tree) = getrepo();
+
     open IN, "< packages" or die "Can't open packages file";
     @repos = <IN>;
     close IN;
 
-    foreach (@repos) {
+    REPO: 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 (-d "$localpath/_darcs") {
-                darcs (@_, "--repodir", $localpath);
+                if ($want_remote_repo) {
+                    darcs (@_, "--repodir", $localpath, $path);
+                } else {
+                    darcs (@_, "--repodir", $localpath);
+                }
             }
             elsif ($tag eq "") {
                 message "== Required repo $localpath is missing! Skipping";
@@ -109,6 +146,8 @@ sub darcsget {
     my $tag;
     my @repos;
 
+    my ($repo_base, $checked_out_tree) = getrepo();
+
     if (! grep /(?:--complete|--partial)/, @_) {
         warning("adding --partial, to override use --complete");
         $r_flags = [@_, "--partial"];
@@ -129,15 +168,10 @@ sub darcsget {
             $remotepath = $3;
 
             if ($checked_out_tree) {
-                $path = "$defaultrepo_base/$localpath";
+                $path = "$repo_base/$localpath";
             }
             else {
-                if ($remotepath =~ /^http:/) {
-                    $path = $remotepath;
-                }
-                else {
-                    $path = "$defaultrepo_base/$remotepath";
-                }
+                $path = "$repo_base/$remotepath";
             }
 
             if (($tag eq "") || defined($tags{$tag})) {
@@ -156,7 +190,7 @@ sub darcsget {
 }
 
 sub main {
-    if (! -d "_darcs" || ! -d "compiler") {
+    if (! -d "compiler") {
         die "error: darcs-all must be run from the top level of the ghc tree."
     }
 
@@ -170,6 +204,12 @@ sub main {
         elsif ($arg eq "-s") {
             $verbose = 0;
         }
+        elsif ($arg eq "-r") {
+            $defaultrepo = shift;
+        }
+        elsif ($arg eq "-i") {
+            $ignore_failure = 1;
+        }
         # --nofib tells get to also grab the nofib repo.
         # It has no effect on the other commands.
         elsif ($arg eq "--nofib") {
@@ -201,6 +241,9 @@ sub main {
             # Hack around whatsnew failing if there are no changes
             $ignore_failure = 1;
         }
+        if ($command =~ /^(pul|pus|sen|put)/) {
+            $want_remote_repo = 1;
+        }
         darcsall @_;
     }
 }