X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=darcs-all;h=5e7872946835ce2b1a3c540c24cb2f6fd31f4a50;hb=7cc35327fd1acde88f3474d4e4727f8d8185ff67;hp=0462930a0785a4a4d78f71520888144d551989d0;hpb=0055054b55e26c70f316073e319722cd3737dcdc;p=ghc-hetmet.git

diff --git a/darcs-all b/darcs-all
index 0462930..5e78729 100644
--- a/darcs-all
+++ b/darcs-all
@@ -55,13 +55,15 @@ sub darcsall {
     my $localpath;
     my $path;
     my $tag;
-
-    darcs @_;
+    my @repos;
 
     open IN, "< packages" or die "Can't open packages file";
-    while (<IN>) {
+    @repos = <IN>;
+    close IN;
+
+    foreach (@repos) {
         chomp;
-        if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+)/) {
+        if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
             $localpath = $1;
             $tag = defined($2) ? $2 : "";
 
@@ -79,7 +81,6 @@ sub darcsall {
             die "Bad line: $_";
         }
     }
-    close IN;
 }
 
 sub darcsget {
@@ -88,6 +89,7 @@ sub darcsget {
     my $remotepath;
     my $path;
     my $tag;
+    my @repos;
 
     if (! grep /(?:--complete|--partial)/, @_) {
         warning("adding --partial, to override use --complete");
@@ -98,9 +100,12 @@ sub darcsget {
     }
 
     open IN, "< packages" or die "Can't open packages file";
-    while (<IN>) {
+    @repos = <IN>;
+    close IN;
+
+    foreach (@repos) {
         chomp;
-        if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+)/) {
+        if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
             $localpath = $1;
             $tag = defined($2) ? $2 : "";
             $remotepath = $3;
@@ -109,7 +114,12 @@ sub darcsget {
                 $path = "$defaultrepo_base/$localpath";
             }
             else {
-                $path = "$defaultrepo_base/$remotepath";
+                if ($remotepath =~ /^http:/) {
+                    $path = $remotepath;
+                }
+                else {
+                    $path = "$defaultrepo_base/$remotepath";
+                }
             }
 
             if (($tag eq "") || defined($tags{$tag})) {
@@ -121,11 +131,10 @@ sub darcsget {
                 }
             }
         }
-        elsif (! /^$/) {
+        elsif (! /^(#.*)?$/) {
             die "Bad line: $_";
         }
     }
-    close IN;
 }
 
 sub main {