X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=sync-all;h=0be0a719d34992d10b3713d6daffe92973ede7f8;hp=5dc6a40953d7b78a7323d34635ffbcf3d53f6ea1;hb=HEAD;hpb=64f0f4dd1dab7eb44be0ebf929b0fcc44aee6ce0

diff --git a/sync-all b/sync-all
index 5dc6a40..0be0a71 100755
--- a/sync-all
+++ b/sync-all
@@ -12,7 +12,7 @@ use Cwd;
 # sync-all will try to do the right thing for both git and darcs repositories.
 #
 # e.g.
-#      ./sync-all -r http://darcs.haskell.org/ghc get
+#      ./sync-all -r http://git.haskell.org/ghc get
 #          To get any repos which do not exist in the local tree
 #
 #      ./sync-all pull
@@ -51,7 +51,7 @@ use Cwd;
 #    otherwise sync-all works on repos of form
 #          $repo_base/<remote-path>
 #    This logic lets you say
-#      both    sync-all -r http://darcs.haskell.org/ghc-6.12 pull
+#      both    sync-all -r http://git.haskell.org/ghc-6.12 pull
 #      and     sync-all -r ../HEAD pull
 #    The latter is called a "checked-out tree".
 
@@ -106,11 +106,11 @@ sub getrepo {
         # Don't drop the last part of the path if specified with -r, as
         # it expects repos of the form:
         #
-        #   http://darcs.haskell.org
+        #   http://git.haskell.org
         #
         # rather than
         #   
-        #   http://darcs.haskell.org/ghc
+        #   http://git.haskell.org/ghc
         #
         if (!$defaultrepo) {
             $repo_base =~ s#/[^/]+/?$##;
@@ -142,13 +142,12 @@ sub parsePackages {
     foreach (@repos) {
         chomp;
         $lineNum++;
-        if (/^([^# ]+) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
+        if (/^([^# ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
             my %line;
             $line{"localpath"}  = $1;
             $line{"tag"}        = $2;
             $line{"remotepath"} = $3;
             $line{"vcs"}        = $4;
-            $line{"upstream"}   = $5;
             push @packages, \%line;
         }
         elsif (! /^(#.*)?$/) {
@@ -198,7 +197,6 @@ sub scmall {
     my $tag;
     my $remotepath;
     my $scm;
-    my $upstream;
     my $line;
     my $branch_name;
     my $subcommand;
@@ -252,7 +250,6 @@ sub scmall {
         $tag        = $$line{"tag"};
         $remotepath = $$line{"remotepath"};
         $scm        = $$line{"vcs"};
-        $upstream   = $$line{"upstream"};
 
         # Check the SCM is OK as early as possible
         die "Unknown SCM: $scm" if (($scm ne "darcs") and ($scm ne "git"));
@@ -366,6 +363,9 @@ sub scmall {
             my @scm_args = ("log", "$branch_name..");
             scm ($localpath, $scm, @scm_args, @args);
         }
+        elsif ($command =~ /^log$/) {
+            scm ($localpath, $scm, "log", @args);
+        }
         elsif ($command =~ /^remote$/) {
             my @scm_args;
             if ($subcommand eq 'add') {
@@ -434,6 +434,7 @@ Supported commands:
  * clean
  * reset
  * config
+ * log
 
 Available package-tags are:
 END