projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rts/Linker.c tidyups and debug belches
[ghc-hetmet.git]
/
sync-all
diff --git
a/sync-all
b/sync-all
index
0d0af67
..
a2c6ab9
100755
(executable)
--- a/
sync-all
+++ b/
sync-all
@@
-228,6
+228,8
@@
sub scmall {
my ($repo_base, $checked_out_tree) = getrepo();
my ($repo_base, $checked_out_tree) = getrepo();
+ my $is_github_repo = $repo_base =~ m/(git@|git:\/\/|https:\/\/)github.com/;
+
parsePackages;
@args = ();
parsePackages;
@args = ();
@@
-260,7
+262,6
@@
sub scmall {
}
push(@args, @_);
}
push(@args, @_);
- print "args: @args\n";
for $line (@packages) {
for $line (@packages) {
@@
-270,6
+271,12
@@
sub scmall {
$scm = $$line{"vcs"};
$upstream = $$line{"upstream"};
$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"));
# Check the SCM is OK as early as possible
die "Unknown SCM: $scm" if (($scm ne "darcs") and ($scm ne "git"));
@@
-282,20
+289,23
@@
sub scmall {
}
# Work out the arguments we should give to the SCM
}
# 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;
}
@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";
elsif ($command =~ /^(?:pus|push)$/) {
@scm_args = "push";
- $want_remote_repo = 1;
}
elsif ($command =~ /^(?:pul|pull)$/) {
@scm_args = "pull";
}
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)$/) {
# Q: should we append the -a argument for darcs repos?
}
elsif ($command =~ /^(?:g|ge|get)$/) {
@@
-346,6
+356,11
@@
sub scmall {
@scm_args = ("remote", "set-url", $branch_name, $path);
}
}
@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";
}
else {
die "Unknown command: $command";
}
@@
-387,6
+402,7
@@
What do you want to do?
Supported commands:
* whatsnew
Supported commands:
* whatsnew
+ * commit
* push
* pull
* get, with options:
* push
* pull
* get, with options:
@@
-399,6
+415,7
@@
Supported commands:
* remote add <branch-name>
* remote rm <branch-name>
* remote set-url [--push] <branch-name>
* remote add <branch-name>
* remote rm <branch-name>
* remote set-url [--push] <branch-name>
+ * grep
Available package-tags are:
END
Available package-tags are:
END