X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=9eee3c6a408d3d4fbbe0f544c6fdaac207ebb265;hp=a80e6f86ac7d018a2da98f0914828eb3d0c57667;hb=0e17d4498cc037d5c18d33fcc4a4885778d266c0;hpb=b8bea68cd642bf4455892e4fbac8ad398b694ec9 diff --git a/darcs-all b/darcs-all index a80e6f8..9eee3c6 100644 --- a/darcs-all +++ b/darcs-all @@ -22,6 +22,7 @@ use strict; # ./darc-all push --dry-run # To see what local patches you have relative to the main repos # +# -------------- Flags ------------------- # -q says to be quite, and -s to be silent. # # -i says to ignore darcs errors and move on to the next repository @@ -39,6 +40,36 @@ use strict; # The darcs get flag you are most likely to want is --complete. By # default we pass darcs the --partial flag. # +# ------------ Which repos to use ------------- +# darcs-all uses the following algorithm to decide which remote repos to use +# +# It always computes the remote repos from a single base, $repo_base +# How is $repo_base set? +# If you say "-r repo", then that's $repo_base +# othewise $repo_base is set thus: +# look in _darcs/prefs/defaultrepo, +# and remove the trailing 'ghc' +# +# Then darcs-all iterates over the package found in the file +# ./packages, which has entries like: +# libraries/array packages/array darcs +# or, in general +# +# +# If $repo_base looks like a local filesystem path, or if you give +# the --checked-out flag, darcs-all works on repos of form +# $repo_base/ +# otherwise darcs-all works on repos of form +# $repo_base/ +# This logic lets you say +# both darcs-all -r http://darcs.haskell.org/ghc-6.12 pull +# and darcs-all -r ../HEAD pull +# The latter is called a "checked-out tree". + +# NB: darcs-all *ignores* the defaultrepo of all repos other than the +# root one. So the remote repos must be laid out in one of the two +# formats given by and in the file 'packages'. + $| = 1; # autoflush stdout after each print, to avoid output after die @@ -112,20 +143,6 @@ sub warning { } } -sub download { - my ($from, $to) = @_; - - my @cmd = ("wget", $from, "-O", $to); - message "== running @cmd"; - system @cmd; - if ($? == -1) { - die "Failed to execute wget: $!\n"; - } - elsif ($? != 0) { - die "wget failed: $?\n"; - } -} - sub darcs { message "== running darcs @_"; system ("darcs", @_) == 0 @@ -139,6 +156,7 @@ sub darcsall { my $path; my $tag; my @repos; + my $command = $_[0]; my ($repo_base, $checked_out_tree) = getrepo(); @@ -148,9 +166,9 @@ sub darcsall { foreach (@repos) { chomp; - if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) { + if (/^([^# ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) { $localpath = $1; - $tag = defined($2) ? $2 : ""; + $tag = $2; $remotepath = $3; if ($checked_out_tree) { @@ -162,12 +180,17 @@ sub darcsall { if (-d "$localpath/_darcs") { if ($want_remote_repo) { - darcs (@_, "--repodir", $localpath, $path); + if ($command =~ /^opt/) { + # Allows ./darcs-all optimize --relink + darcs (@_, "--repodir", $localpath, "--sibling=$path"); + } else { + darcs (@_, "--repodir", $localpath, $path); + } } else { darcs (@_, "--repodir", $localpath); } } - elsif ($tag eq "") { + elsif ($tag eq "-") { message "== Required repo $localpath is missing! Skipping"; } else { @@ -178,10 +201,6 @@ sub darcsall { die "Bad line: $_"; } } - - if ($_[0] eq "pull" || $_[0] eq "pul") { - &sync_tarballs(); - } } sub darcsget { @@ -194,7 +213,7 @@ sub darcsget { my ($repo_base, $checked_out_tree) = getrepo(); - if (! grep /(?:--complete|--partial)/, @_) { + if (! grep /(?:--complete|--partial|--lazy)/, @_) { warning("adding --partial, to override use --complete"); $r_flags = [@_, "--partial"]; } @@ -208,9 +227,9 @@ sub darcsget { foreach (@repos) { chomp; - if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) { + if (/^([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) { $localpath = $1; - $tag = defined($2) ? $2 : ""; + $tag = $2; $remotepath = $3; if ($checked_out_tree) { @@ -220,7 +239,7 @@ sub darcsget { $path = "$repo_base/$remotepath"; } - if (($tag eq "") || defined($tags{$tag})) { + if (($tag eq "-") || defined($tags{$tag})) { if (-d $localpath) { warning("$localpath already present; omitting"); } @@ -233,63 +252,6 @@ sub darcsget { die "Bad line: $_"; } } - - &sync_tarballs(); -} - -sub sync_tarballs { - my $localpath; - my $localdirectory; - my $localfilename; - my $actualpath; - my $actualfilename; - my $remotepath; - my $path; - my @tarballs; - my %localtarballs; - my ($repo_base, $checked_out_tree) = getrepo(); - - message "== Syncing tarballs"; - - open IN, "< tarballs" or die "Can't open packages file"; - @tarballs = ; - close IN; - - foreach (@tarballs) { - chomp; - if (m@^([^# ]+)/([^#/ ]+) +([^ ]+)$@) { - $localdirectory = $1; - $localfilename = $2; - $remotepath = $3; - $localpath = "$localdirectory/$localfilename"; - - $localtarballs{$localdirectory}{$localfilename} = 1; - - if (! -e $localpath) { - if ($checked_out_tree) { - $path = "$repo_base/$localpath"; - } - else { - $path = "$repo_base/$remotepath"; - } - &download($path, $localpath); - } - } - elsif (! /^(#.*)?$/) { - die "Bad line: $_"; - } - } - - foreach $localdirectory (keys %localtarballs) { - FILE: foreach $actualpath (glob "$localdirectory/*.tar.gz $localdirectory/*.tar.bz2") { - $actualfilename = $actualpath; - $actualfilename =~ s#.*/##; - if (! defined($localtarballs{$localdirectory}{$actualfilename})) { - message "== Deleting $actualpath"; - unlink $actualpath; - } - } - } } sub main { @@ -323,6 +285,11 @@ sub main { elsif ($arg eq "--testsuite") { $tags{"testsuite"} = 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 "--checked-out") { $checked_out_flag = 1; } @@ -347,7 +314,7 @@ sub main { # Hack around whatsnew failing if there are no changes $ignore_failure = 1; } - if ($command =~ /^(pul|pus|sen|put)/) { + if ($command =~ /^(pul|pus|sen|put|opt)/) { $want_remote_repo = 1; } darcsall @_; @@ -355,6 +322,8 @@ sub main { } END { + my $ec = $?; + message "== Checking for old bytestring repo"; if (-d "libraries/bytestring/_darcs") { if ((system "darcs annotate --repodir libraries/bytestring --match 'hash 20080118173113-3fd76-d5b74c04372a297b585ebea4e16d524551ce5035' > /dev/null 2> /dev/null") == 0) { @@ -370,6 +339,37 @@ version of bytestring will be used from a tarball instead. EOF } } + + message "== Checking for bytestring tarball"; + if (-d "libraries/bytestring" && not -d "libraries/bytestring/_darcs") { + print < /dev/null 2> /dev/null") == 0) { + print <