X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=9efeab13e9d5f0cbcbd554eb4096c895d897f640;hp=9906495313b76f06204bdb7408eafa59e9b60b70;hb=9da4639011348fb6c318e3cba4b08622f811d9c4;hpb=60d9fc0b9ff51cef0a7895a399410f50dc52b970

diff --git a/darcs-all b/darcs-all
index 9906495..9efeab1 100644
--- a/darcs-all
+++ b/darcs-all
@@ -1,55 +1,94 @@
 #!/bin/sh
 
+set -e
+
 top_dirs="nofib testsuite"
 
-function darcsall()
+default_repo_root="http://darcs.haskell.org/"
+default_lib_repo_root=$default_repo_root/packages
+
+quiet=NO
+
+message()
+{
+  if [ "$quiet" = "NO" ]; then
+     echo $*
+  fi
+}
+
+darcsall()
 {
+  message "== running darcs $* at the top level"
+  darcs $*
   for dir in $top_dirs; do
     if test -d $dir -a -d $dir/_darcs; then
-	echo "== running darcs $* in $dir"
-	(cd $dir && darcs $*)
+	message "== running darcs $* in $dir"
+	darcs $* --repodir $dir
     else
-	echo "== $dir not present or not a repository; skipping"
+	message "== $dir not present or not a repository; skipping"
     fi
   done
-  cd libraries
-  for repo in `cat default-packages`; do
-    dir=`basename $repo`
-    if test -d $dir; then
-	echo "== running darcs $* in libraries/$dir"
-	(cd $dir && darcs $*)
+  for pkg in `cat libraries/core-packages libraries/extra-packages`; do
+    if test -d libraries/$pkg; then
+	message "== running darcs $* in libraries/$pkg"
+	darcs $* --repodir libraries/$pkg
     else
-	echo "warning: $dir doesn't seem to exist, use 'darcs-all get' to get it"
+	echo "warning: $pkg doesn't seem to exist, use 'darcs-all get' to get it"
     fi
   done
 }
 
-function darcsget()
+darcsget()
 {
   case $* in
     *--partial*) ;;
     *) echo "warning: adding --partial, to override use --complete"
   esac
 
+  repo_root=`cat _darcs/prefs/defaultrepo`
+  case $repo_root in
+    /*) lib_repos=$repo_root/libraries;;
+    *)  lib_repos=$default_lib_repo_root;;
+  esac
+
   cd libraries
-  for repo in `cat default-packages`; do
-    if test -d `basename $repo`; then
-	echo "warning: `basename $repo` already present; omitting"
+
+  if test "$extra" = "YES"; then
+      packages=`cat core-packages extra-packages`
+  else
+      packages=`cat core-packages`
+  fi
+
+  for pkg in $packages; do
+    if test -d $pkg; then
+	echo "warning: $pkg already present; omitting"
     else
-	echo "== running darcs get --partial $* $repo"
+	repo=$lib_repos/$pkg
+	message "== running darcs get --partial $* $repo"
 	darcs get --partial $* $repo
     fi
   done
 }
 
-if test ! -d _darcs -o ! -d ghc; then
+if test ! -d _darcs -o ! -d compiler; then
   echo "error: darcs-all must be run from the top level of the ghc tree."
   exit 1;
 fi
 
+case $* in
+  *-q*) quiet=YES;;
+esac
+
+# --extra says we grab the extra libs with 'get'.  It has no effect on
+# the other commands.
+extra=NO;
+case $1 in
+  --extra) shift; extra=YES;
+esac
+
 case $1 in
-  push) darcsall $*;;
-  pull) darcsall $*;;
   get)  shift; darcsget $*;;
-  *)    echo "syntax: ./darcs-all push|pull"; exit 1;;
+  # Hack around whatsnew failing if there are no changes
+  w|wh|wha|what|whats|whatsn|whatsne|whatsnew) set +e; darcsall $*;;
+  *) darcsall $*;;
 esac