Tweak darcs-all

diff --git a/darcs-all b/darcs-all
index f936bde..106eb8f 100644 (file)
--- a/darcs-all
+++ b/darcs-all
@@ -257,7 +257,7 @@ sub darcsget {
             $path = "$repo_base/$remotepath";
         }
 
             $path = "$repo_base/$remotepath";
         }
 

-        if (($tag eq "-") || defined($tags{$tag})) {
+        if ($tags{$tag} eq 1) {

             if (-d $localpath) {
                 warning("$localpath already present; omitting");
             }
             if (-d $localpath) {
                 warning("$localpath already present; omitting");
             }

@@ -290,6 +290,12 @@ sub main {
         die "error: darcs-all must be run from the top level of the ghc tree."
     }
 
         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
     while ($#_ ne -1) {
         my $arg = shift;
         # We handle -q here as well as lower down as we need to skip over it

@@ -311,16 +317,35 @@ sub main {
         elsif ($arg eq "--nofib") {
             $tags{"nofib"} = 1;
         }
         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;
         }
         # --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;
         }
         # --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;
         }
         elsif ($arg eq "--checked-out") {
             $checked_out_flag = 1;
         }

diff --git a/packages b/packages
index fe9326c..1055120 100644 (file)
--- a/packages
+++ b/packages
@@ -47,7 +47,7 @@ libraries/bytestring            -           packages/bytestring             darc
 libraries/Cabal                 -           packages/Cabal                  darcs   http://darcs.haskell.org/cabal/
 libraries/containers            -           packages/containers             darcs   -
 libraries/directory             -           packages/directory              darcs   -
 libraries/Cabal                 -           packages/Cabal                  darcs   http://darcs.haskell.org/cabal/
 libraries/containers            -           packages/containers             darcs   -
 libraries/directory             -           packages/directory              darcs   -

-libraries/dph                   -           packages/dph                    darcs   -
+libraries/dph                   dph         packages/dph                    darcs   -

 libraries/extensible-exceptions -           packages/extensible-exceptions  darcs   -
 libraries/filepath              -           packages/filepath               darcs   -
 libraries/ghc-prim              -           packages/ghc-prim               darcs   -
 libraries/extensible-exceptions -           packages/extensible-exceptions  darcs   -
 libraries/filepath              -           packages/filepath               darcs   -
 libraries/ghc-prim              -           packages/ghc-prim               darcs   -