X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=sync-all;h=9b0706eb03101711f533e490b7389f6d9787c958;hp=1de4fe3dcb7b7cb0ea6eb866a9c2f4960ea8b711;hb=aaafc986f2175958bcadd4af6b3c9889bfc89009;hpb=c5a514d1d44d46f59b6255c3e432b1bbe384c937

diff --git a/sync-all b/sync-all
old mode 100644
new mode 100755
index 1de4fe3..9b0706e
--- a/sync-all
+++ b/sync-all
@@ -3,43 +3,163 @@
 use strict;
 use Cwd;
 
-# Figure out where to get the other repositories from,
-# based on where this GHC repo came from.
-my $branch = `git branch | grep "\* " | sed "s/^\* //"`; chomp $branch;
-my $remote = `git config branch.$branch.remote`;         chomp $remote;
-my $defaultrepo = `git config remote.$remote.url`;       chomp $defaultrepo;
-
-my $defaultrepo_base;
-my $checked_out_tree;
-
-if ($defaultrepo =~ /^...*:/) {
-    # HTTP or SSH
-    # Above regex says "at least two chars before the :", to avoid
-    # catching Win32 drives ("C:\").
-    $defaultrepo_base = $defaultrepo;
-    $defaultrepo_base =~ s#/[^/]+/?$##;
-    $checked_out_tree = 0;
-}
-elsif ($defaultrepo =~ /^\/|\.\.\/|.:(\/|\\)/) {
-    # Local filesystem, either absolute or relative path
-    # (assumes a checked-out tree):
-    $defaultrepo_base = $defaultrepo;
-    $checked_out_tree = 1;
-}
-else {
-    die "Couldn't work out defaultrepo";
-}
+# Usage:
+#
+# ./sync-all [-q] [-s] [--ignore-failure] [-r repo]
+#            [--nofib] [--testsuite] [--checked-out] cmd [git flags]
+#
+# Applies the command "cmd" to each repository in the tree.
+# 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
+#          To get any repos which do not exist in the local tree
+#
+#      ./sync-all pull
+#          To pull everything from the default repos
+#
+# -------------- Flags -------------------
+#   -q says to be quite, and -s to be silent.
+#
+#   --ignore-failure says to ignore errors and move on to the next repository
+#
+#   -r repo says to use repo as the location of package repositories
+#
+#   --checked-out says that the remote repo is in checked-out layout, as
+#   opposed to the layout used for the main repo.  By default a repo on
+#   the local filesystem is assumed to be checked-out, and repos accessed
+#   via HTTP or SSH are assumed to be in the main repo layout; use
+#   --checked-out to override the latter.
+#
+#   --nofib, --testsuite also get the nofib and testsuite repos respectively
+#
+# ------------ Which repos to use -------------
+# sync-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
+#    otherwise $repo_base is set by asking git where the ghc repo came
+#    from, and removing the last component (e.g. /ghc.git/ of /ghc/).
+#
+#  Then sync-all iterates over the package found in the file
+#  ./packages; see that file for a description of the contents.
+# 
+#    If $repo_base looks like a local filesystem path, or if you give
+#    the --checked-out flag, sync-all works on repos of form
+#          $repo_base/<local-path>
+#    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
+#      and     sync-all -r ../HEAD pull
+#    The latter is called a "checked-out tree".
+
+# NB: sync-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 <local-path> and <remote-path> in the file 'packages'.
 
+$| = 1; # autoflush stdout after each print, to avoid output after die
+
+my $defaultrepo;
+my @packages;
 my $verbose = 2;
+my $ignore_failure = 0;
+my $want_remote_repo = 0;
+my $checked_out_flag = 0;
 my $get_mode;
 
 # Flags specific to a particular command
-my $ignore_failure = 0;
 my $local_repo_unnecessary = 0;
 
-# Always define the empty tag so that we fetch the /required/ packages
 my %tags;
-$tags{""} = 1;
+
+# Figure out where to get the other repositories from.
+sub getrepo {
+    my $basedir = ".";
+    my $repo;
+
+    if (defined($defaultrepo)) {
+        $repo = $defaultrepo;
+        chomp $repo;
+    } else {
+        # Figure out where to get the other repositories from,
+        # based on where this GHC repo came from.
+        my $branch = `git branch | grep "\* " | sed "s/^\* //"`; chomp $branch;
+        my $remote = `git config branch.$branch.remote`;         chomp $remote;
+        $repo = `git config remote.$remote.url`;       chomp $repo;
+    }
+
+    my $repo_base;
+    my $checked_out_tree;
+
+    if ($repo =~ /^...*:/) {
+        # HTTP or SSH
+        # Above regex says "at least two chars before the :", to avoid
+        # catching Win32 drives ("C:\").
+        $repo_base = $repo;
+
+        # --checked-out is needed if you want to use a checked-out repo
+        # over SSH or HTTP
+        if ($checked_out_flag) {
+            $checked_out_tree = 1;
+        } else {
+            $checked_out_tree = 0;
+        }
+
+        # Don't drop the last part of the path if specified with -r, as
+        # it expects repos of the form:
+        #
+        #   http://darcs.haskell.org
+        #
+        # rather than
+        #   
+        #   http://darcs.haskell.org/ghc
+        #
+        if (!$defaultrepo) {
+            $repo_base =~ s#/[^/]+/?$##;
+        }
+    }
+    elsif ($repo =~ /^\/|\.\.\/|.:(\/|\\)/) {
+        # Local filesystem, either absolute or relative path
+        # (assumes a checked-out tree):
+        $repo_base = $repo;
+        $checked_out_tree = 1;
+    }
+    else {
+        die "Couldn't work out repo";
+    }
+
+    return $repo_base, $checked_out_tree;
+}
+
+sub parsePackages {
+    my @repos;
+    my $lineNum;
+
+    open IN, "< packages" or die "Can't open packages file";
+    @repos = <IN>;
+    close IN;
+
+    @packages = ();
+    $lineNum = 0;
+    foreach (@repos) {
+        chomp;
+        $lineNum++;
+        if (/^([^# ]+) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
+            my %line;
+            $line{"localpath"}  = $1;
+            $line{"tag"}        = $2;
+            $line{"remotepath"} = $3;
+            $line{"vcs"}        = $4;
+            $line{"upstream"}   = $5;
+            push @packages, \%line;
+        }
+        elsif (! /^(#.*)?$/) {
+            die "Bad content on line $lineNum of packages file: $_";
+        }
+    }
+}
 
 sub message {
     if ($verbose >= 2) {
@@ -54,12 +174,25 @@ sub warning {
 }
 
 sub scm {
+    my $dir = shift;
     my $scm = shift;
-    
-    message "== running $scm @_";
+    my $pwd;
+
+    if ($dir eq '.') {
+        message "== running $scm @_";
+    } else {
+        message "== $dir: running $scm @_";
+        $pwd = getcwd();
+        chdir($dir);
+    }
+
     system ($scm, @_) == 0
         or $ignore_failure
         or die "$scm failed: $?";
+
+    if ($dir ne '.') {
+        chdir($pwd);
+    }
 }
 
 sub repoexists {
@@ -80,32 +213,39 @@ sub scmall {
     my $tag;
     my $remotepath;
     my $scm;
+    my $upstream;
+    my $line;
 
     my $path;
     my $wd_before = getcwd;
 
     my @scm_args;
 
-    open IN, "< packages" or die "Can't open packages file";
-    while (<IN>) {
-        chomp;
-        if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
-            $localpath = $1;
-            $tag = defined($2) ? $2 : "";
-            $remotepath = $3;
-            $scm = $4;
+    my $pwd;
+
+    my ($repo_base, $checked_out_tree) = getrepo();
+
+    parsePackages;
+
+    for $line (@packages) {
+
+            $localpath  = $$line{"localpath"};
+            $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"));
 
             # Work out the path for this package in the repo we pulled from
             if ($checked_out_tree) {
-                $path = "$defaultrepo_base/$localpath";
+                $path = "$repo_base/$localpath";
             }
             else {
-                $path = "$defaultrepo_base/$remotepath";
+                $path = "$repo_base/$remotepath";
             }
-            
+
             # Work out the arguments we should give to the SCM
             if ($command =~ /^(?:w|wh|wha|what|whats|whatsn|whatsne|whatsnew)$/) {
                 @scm_args = (($scm eq "darcs" and "whatsnew")
@@ -116,9 +256,11 @@ sub scmall {
             }
             elsif ($command =~ /^(?:pus|push)$/) {
                 @scm_args = "push";
+                $want_remote_repo = 1;
             }
             elsif ($command =~ /^(?:pul|pull)$/) {
                 @scm_args = "pull";
+                $want_remote_repo = 1;
                 # Q: should we append the -a argument for darcs repos?
             }
             elsif ($command =~ /^(?:g|ge|get)$/) {
@@ -152,20 +294,43 @@ sub scmall {
             elsif ($command =~ /^(?:s|se|sen|send)$/) {
                 @scm_args = (($scm eq "darcs" and "send")
                           or ($scm eq "git" and "send-email"));
+                $want_remote_repo = 1;
+            }
+            elsif ($command =~ /^set-origin$/) {
+                @scm_args = ("remote", "set-url", "origin", $path);
+            }
+            elsif ($command =~ /^set-push$/) {
+                @scm_args = ("remote", "set-url", "--push", "origin", $path);
+                print "foo\n", @scm_args;
+            }
+            elsif ($command =~ /^fetch$/) {
+                @scm_args = ("fetch", "origin");
+            }
+            elsif ($command =~ /^new$/) {
+                @scm_args = ("log", "origin..");
             }
             else {
                 die "Unknown command: $command";
             }
             
             # Actually execute the command
-            chdir $wd_before or die "Could not change to $wd_before";
             if (repoexists ($scm, $localpath)) {
-                chdir $localpath or die "Could not change to $localpath";
-                scm ($scm, @scm_args, @_);
+                if ($want_remote_repo) {
+                    if ($scm eq "darcs") {
+                        scm (".", $scm, @scm_args, @_, "--repodir=$localpath", $path);
+                    } else {
+                        # git pull doesn't like to be used with --work-dir
+                        # I couldn't find an alternative to chdir() here
+                        scm ($localpath, $scm, @scm_args, @_, $path, "master");
+                    }
+                } else {
+                    # git status *must* be used with --work-dir, if we don't chdir() to the dir
+                    scm ($localpath, $scm, @scm_args, @_);
+                }
             }
             elsif ($local_repo_unnecessary) {
                 # Don't bother to change directory in this case
-                scm ($scm, @scm_args, @_);
+                scm (".", $scm, @scm_args, @_);
             }
             elsif ($tag eq "") {
                 message "== Required repo $localpath is missing! Skipping";
@@ -173,12 +338,7 @@ sub scmall {
             else {
                 message "== $localpath repo not present; skipping";
             }
-        }
-        elsif (! /^(#.*)?$/) {
-            die "Bad line: $_";
-        }
     }
-    close IN;
 }
 
 sub main {
@@ -186,6 +346,9 @@ sub main {
         die "error: sync-all must be run from the top level of the ghc tree."
     }
 
+    $tags{"-"} = 1;
+    $tags{"dph"} = 1;
+
     while ($#_ ne -1) {
         my $arg = shift;
         # We handle -q here as well as lower down as we need to skip over it
@@ -196,12 +359,20 @@ sub main {
         elsif ($arg eq "-s") {
             $verbose = 0;
         }
+        elsif ($arg eq "-r") {
+            $defaultrepo = shift;
+        }
         elsif ($arg eq "--ignore-failure") {
             $ignore_failure = 1;
         }
         elsif ($arg eq "--complete" || $arg eq "--partial") {
             $get_mode = $arg;
         }
+        # Use --checked-out if the remote repos are a checked-out tree,
+        # rather than the master trees.
+        elsif ($arg eq "--checked-out") {
+            $checked_out_flag = 1;
+        }
         # --<tag> says we grab the libs tagged 'tag' with
         # 'get'. It has no effect on the other commands.
         elsif ($arg =~ m/^--/) {
@@ -230,7 +401,11 @@ Supported commands:
   * --<package-tag>
   * --complete
   * --partial
+ * fetch
  * send
+ * set-origin
+ * set-push
+ * new
 
 Available package-tags are:
 END
@@ -241,7 +416,7 @@ END
         while (<IN>) {
             chomp;
             if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)/) {
-                if (defined($2)) {
+                if (defined($2) && $2 ne "-") {
                     $available_tags{$2} = 1;
                 }
             }
@@ -253,7 +428,7 @@ END
         
         # Show those tags and the help text
         my @available_tags = keys %available_tags;
-        print "$help@available_tags";
+        print "$help@available_tags\n";
         exit 1;
     }
     else {