projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disambiguate some names in haddock comments
[ghc-hetmet.git]
/
darcs-all
diff --git
a/darcs-all
b/darcs-all
index
0462930
..
5e78729
100644
(file)
--- a/
darcs-all
+++ b/
darcs-all
@@
-55,13
+55,15
@@
sub darcsall {
my $localpath;
my $path;
my $tag;
my $localpath;
my $path;
my $tag;
-
- darcs @_;
+ my @repos;
open IN, "< packages" or die "Can't open packages file";
open IN, "< packages" or die "Can't open packages file";
- while (<IN>) {
+ @repos = <IN>;
+ close IN;
+
+ foreach (@repos) {
chomp;
chomp;
- if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+)/) {
+ if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
$localpath = $1;
$tag = defined($2) ? $2 : "";
$localpath = $1;
$tag = defined($2) ? $2 : "";
@@
-79,7
+81,6
@@
sub darcsall {
die "Bad line: $_";
}
}
die "Bad line: $_";
}
}
- close IN;
}
sub darcsget {
}
sub darcsget {
@@
-88,6
+89,7
@@
sub darcsget {
my $remotepath;
my $path;
my $tag;
my $remotepath;
my $path;
my $tag;
+ my @repos;
if (! grep /(?:--complete|--partial)/, @_) {
warning("adding --partial, to override use --complete");
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";
}
open IN, "< packages" or die "Can't open packages file";
- while (<IN>) {
+ @repos = <IN>;
+ close IN;
+
+ foreach (@repos) {
chomp;
chomp;
- if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+)/) {
+ if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
$localpath = $1;
$tag = defined($2) ? $2 : "";
$remotepath = $3;
$localpath = $1;
$tag = defined($2) ? $2 : "";
$remotepath = $3;
@@
-109,7
+114,12
@@
sub darcsget {
$path = "$defaultrepo_base/$localpath";
}
else {
$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})) {
}
if (($tag eq "") || defined($tags{$tag})) {
@@
-121,11
+131,10
@@
sub darcsget {
}
}
}
}
}
}
- elsif (! /^$/) {
+ elsif (! /^(#.*)?$/) {
die "Bad line: $_";
}
}
die "Bad line: $_";
}
}
- close IN;
}
sub main {
}
sub main {