X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=7743e8a857eddd2a51457d36e6238319a19bfced;hp=59e29e1c9d8e5f6df21523ffcc9481c05b71bf7d;hb=f83010b119096699d1efef2f7bb45460719c48f9;hpb=63cddb36f1dd2e3e41274f494873a62921d3f787

diff --git a/darcs-all b/darcs-all
index 59e29e1..7743e8a 100644
--- a/darcs-all
+++ b/darcs-all
@@ -14,11 +14,16 @@ my $defaultrepo_lib;
 if ($defaultrepo =~ /:/) {
     # HTTP or SSH
     $defaultrepo_base = $defaultrepo;
-    $defaultrepo_base =~ s#/ghc$##;
+    $defaultrepo_base =~ s#/[^/]+/?$##;
     $defaultrepo_lib = "$defaultrepo_base/packages";
 }
 elsif ($defaultrepo =~ /^\//) {
-    # Local filesystem (assumes a checked-out tree):
+    # Local filesystem, absolute path (assumes a checked-out tree):
+    $defaultrepo_base = $defaultrepo;
+    $defaultrepo_lib = "$defaultrepo/libraries";
+}
+elsif ($defaultrepo =~ /^..\//) {
+    # Local filesystem, relative path (assumes a checked-out tree):
     $defaultrepo_base = $defaultrepo;
     $defaultrepo_lib = "$defaultrepo/libraries";
 }
@@ -32,8 +37,6 @@ my $ignore_failure = 0;
 # --extra says we grab the extra libs with 'get'.  It has no effect on
 # the other commands.
 my $extra = 0;
-# --complete gets passed onto darcs get
-my $complete = 0;
 # --nofib/--testsuite tell get to also grab the respective repos.
 # They have no effect on the other commands.
 my $nofib = 0;
@@ -92,7 +95,7 @@ sub darcsgetpackage {
 
 sub darcsget {
     my $r_flags;
-    if (! $complete && ! grep /(?:--complete|--partial)/, @_) {
+    if (! grep /(?:--complete|--partial)/, @_) {
         warning("adding --partial, to override use --complete");
         $r_flags = [@_, "--partial"];
     }
@@ -131,9 +134,6 @@ sub main {
         if ($arg eq "-q") {
             $verbose = 0;
         }
-        elsif ($arg eq "--complete") {
-            $complete = 1;
-        }
         elsif ($arg eq "--extra") {
             $extra = 1;
         }