X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=sync-all;h=a2c6ab91684b81d2572aa5ff248e754f2920702b;hp=37f2d813a9e94f8c756df8be1a635228d47a5547;hb=1844c3c0804cac9b3e7c39500e47d75fbdc3a3ff;hpb=93e7418f729b6f4329d7436efd7108066ca76925 diff --git a/sync-all b/sync-all index 37f2d81..a2c6ab9 100755 --- a/sync-all +++ b/sync-all @@ -59,6 +59,8 @@ use Cwd; # 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 + my $defaultrepo; my @packages; my $verbose = 2; @@ -213,6 +215,8 @@ sub scmall { my $scm; my $upstream; my $line; + my $branch_name; + my $subcommand; my $path; my $wd_before = getcwd; @@ -220,11 +224,45 @@ sub scmall { my @scm_args; my $pwd; + my @args; my ($repo_base, $checked_out_tree) = getrepo(); + my $is_github_repo = $repo_base =~ m/(git@|git:\/\/|https:\/\/)github.com/; + parsePackages; + @args = (); + + if ($command =~ /^remote$/) { + while (@_ > 0 && $_[0] =~ /^-/) { + push(@args,shift); + } + if (@_ < 1) { help(); } + $subcommand = shift; + if ($subcommand ne 'add' && $subcommand ne 'rm' && $subcommand ne 'set-url') { + help(); + } + while (@_ > 0 && $_[0] =~ /^-/) { + push(@args,shift); + } + if (($subcommand eq 'add' || $subcommand eq 'rm') && @_ < 1) { + help(); + } elsif (@_ < 1) { # set-url + $branch_name = 'origin'; + } else { + $branch_name = shift; + } + } elsif ($command eq 'new' || $command eq 'fetch') { + if (@_ < 1) { + $branch_name = 'origin'; + } else { + $branch_name = shift; + } + } + + push(@args, @_); + for $line (@packages) { $localpath = $$line{"localpath"}; @@ -233,6 +271,12 @@ sub scmall { $scm = $$line{"vcs"}; $upstream = $$line{"upstream"}; + # We can't create directories on GitHub, so we translate + # "package/foo" into "package-foo". + if ($is_github_repo) { + $remotepath =~ s/\//-/; + } + # Check the SCM is OK as early as possible die "Unknown SCM: $scm" if (($scm ne "darcs") and ($scm ne "git")); @@ -245,20 +289,23 @@ sub scmall { } # Work out the arguments we should give to the SCM - if ($command =~ /^(?:w|wh|wha|what|whats|whatsn|whatsne|whatsnew)$/) { + if ($command =~ /^(?:w|wh|wha|what|whats|whatsn|whatsne|whatsnew|status)$/) { @scm_args = (($scm eq "darcs" and "whatsnew") or ($scm eq "git" and "status")); # Hack around 'darcs whatsnew' failing if there are no changes $ignore_failure = 1; } + elsif ($command =~ /^commit$/) { + @scm_args = ("commit"); + # git fails if there is nothing to commit, so ignore failures + $ignore_failure = 1; + } 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)$/) { @@ -273,7 +320,7 @@ sub scmall { } # The first time round the loop, default the get-mode - if (not defined($get_mode)) { + if ($scm eq "darcs" && not defined($get_mode)) { warning("adding --partial, to override use --complete"); $get_mode = "--partial"; } @@ -294,14 +341,25 @@ sub scmall { or ($scm eq "git" and "send-email")); $want_remote_repo = 1; } - elsif ($command =~ /^set-origin$/) { - @scm_args = ("remote", "set-url", "origin", $path); - } elsif ($command =~ /^fetch$/) { - @scm_args = ("fetch", "origin"); + @scm_args = ("fetch", "$branch_name"); } elsif ($command =~ /^new$/) { - @scm_args = ("log", "origin.."); + @scm_args = ("log", "$branch_name.."); + } + elsif ($command =~ /^remote$/) { + if ($subcommand eq 'add') { + @scm_args = ("remote", "add", $branch_name, $path); + } elsif ($subcommand eq 'rm') { + @scm_args = ("remote", "rm", $branch_name); + } elsif ($subcommand eq 'set-url') { + @scm_args = ("remote", "set-url", $branch_name, $path); + } + } + elsif ($command =~ /^grep$/) { + @scm_args = ("grep"); + # Hack around 'git grep' failing if there are no matches + $ignore_failure = 1; } else { die "Unknown command: $command"; @@ -311,20 +369,20 @@ sub scmall { if (repoexists ($scm, $localpath)) { if ($want_remote_repo) { if ($scm eq "darcs") { - scm (".", $scm, @scm_args, @_, "--repodir=$localpath", $path); + scm (".", $scm, @scm_args, @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"); + scm ($localpath, $scm, @scm_args, @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, @_); + scm ($localpath, $scm, @scm_args, @args); } } elsif ($local_repo_unnecessary) { # Don't bother to change directory in this case - scm (".", $scm, @scm_args, @_); + scm (".", $scm, @scm_args, @args); } elsif ($tag eq "") { message "== Required repo $localpath is missing! Skipping"; @@ -335,6 +393,55 @@ sub scmall { } } + +sub help() +{ + # Get the built in help + my $help = < + * --complete + * --partial + * fetch + * send + * new + * remote add + * remote rm + * remote set-url [--push] + * grep + +Available package-tags are: +END + + # Collect all the tags in the packages file + my %available_tags; + open IN, "< packages" or die "Can't open packages file"; + while () { + chomp; + if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)/) { + if (defined($2) && $2 ne "-") { + $available_tags{$2} = 1; + } + } + elsif (! /^(#.*)?$/) { + die "Bad line: $_"; + } + } + close IN; + + # Show those tags and the help text + my @available_tags = keys %available_tags; + print "$help@available_tags\n"; + exit 1; +} + sub main { if (! -d ".git" || ! -d "compiler") { die "error: sync-all must be run from the top level of the ghc tree." @@ -383,46 +490,7 @@ sub main { } if ($#_ eq -1) { - # Get the built in help - my $help = < - * --complete - * --partial - * fetch - * send - * set-origin - * new - -Available package-tags are: -END - - # Collect all the tags in the packages file - my %available_tags; - open IN, "< packages" or die "Can't open packages file"; - while () { - chomp; - if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)/) { - if (defined($2) && $2 ne "-") { - $available_tags{$2} = 1; - } - } - elsif (! /^(#.*)?$/) { - die "Bad line: $_"; - } - } - close IN; - - # Show those tags and the help text - my @available_tags = keys %available_tags; - print "$help@available_tags\n"; - exit 1; + help(); } else { # Give the command and rest of the arguments to the main loop