From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com, pclouds@gmail.com
Cc: git@vger.kernel.org, jrnieder@gmail.com, Jens.Lehmann@web.de,
peff@peff.net, sunshine@sunshineco.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCHv20 00/12] Expose submodule parallelism to the user
Date: Mon, 29 Feb 2016 11:13:58 -0800 [thread overview]
Message-ID: <1456773250-5510-1-git-send-email-sbeller@google.com> (raw)
Thanks Duy for reviewing!
I added your suggestions as amending and as a new patch.
Thanks,
Stefan
Interdiff to v19 (current origin/sb/submodule-parallel-update):
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 0272c98..1b0b13a 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -299,10 +299,10 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
if (ce_stage(ce)) {
if (suc->recursive_prefix) {
- strbuf_addf(out, "Skipping unmerged submodule %s/%s\n",
+ strbuf_addf(out,_("Skipping unmerged submodule %s/%s\n"),
suc->recursive_prefix, ce->name);
} else {
- strbuf_addf(out, "Skipping unmerged submodule %s\n",
+ strbuf_addf(out, _("Skipping unmerged submodule %s\n"),
ce->name);
}
goto cleanup;
@@ -319,7 +319,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
if (suc->update.type == SM_UPDATE_NONE
|| (suc->update.type == SM_UPDATE_UNSPECIFIED
&& sub->update_strategy.type == SM_UPDATE_NONE)) {
- strbuf_addf(out, "Skipping submodule '%s'\n",
+ strbuf_addf(out, _("Skipping submodule '%s'\n"),
displaypath);
goto cleanup;
}
@@ -525,13 +525,13 @@ int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
{
int i;
if (argc < 2)
- die(_("fatal: submodule--helper subcommand must be "
+ die(_("submodule--helper subcommand must be "
"called with a subcommand"));
for (i = 0; i < ARRAY_SIZE(commands); i++)
if (!strcmp(argv[1], commands[i].cmd))
return commands[i].fn(argc - 1, argv + 1, prefix);
- die(_("fatal: '%s' is not a valid submodule--helper "
+ die(_("'%s' is not a valid submodule--helper "
"subcommand"), argv[1]);
}
Stefan Beller (12):
submodule-config: keep update strategy around
submodule-config: drop check against NULL
fetching submodules: respect `submodule.fetchJobs` config option
submodule update: direct error message to stderr
run_processes_parallel: treat output of children as byte array
run-command: expose default_{start_failure, task_finished}
run_processes_parallel: rename parameters for the callbacks
run_processes_parallel: correctly terminate callbacks with an LF
git submodule update: have a dedicated helper for cloning
submodule helper: remove double 'fatal: ' prefix
submodule update: expose parallelism to the user
clone: allow an explicit argument for parallel submodule clones
Documentation/config.txt | 6 +
Documentation/git-clone.txt | 6 +-
Documentation/git-submodule.txt | 7 +-
builtin/clone.c | 19 ++-
builtin/fetch.c | 2 +-
builtin/submodule--helper.c | 259 +++++++++++++++++++++++++++++++++++++++-
git-submodule.sh | 56 ++++-----
run-command.c | 36 +++---
run-command.h | 29 ++++-
strbuf.c | 6 +
strbuf.h | 6 +
submodule-config.c | 19 ++-
submodule-config.h | 2 +
submodule.c | 37 +++++-
submodule.h | 18 +++
t/t5526-fetch-submodules.sh | 14 +++
t/t7400-submodule-basic.sh | 4 +-
t/t7406-submodule-update.sh | 27 +++++
18 files changed, 480 insertions(+), 73 deletions(-)
--
2.7.0.rc0.37.gb7b9e8e
next reply other threads:[~2016-02-29 19:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 19:13 Stefan Beller [this message]
2016-02-29 19:13 ` [PATCHv20 01/12] submodule-config: keep update strategy around Stefan Beller
2016-02-29 19:14 ` [PATCHv20 02/12] submodule-config: drop check against NULL Stefan Beller
2016-02-29 19:14 ` [PATCHv20 03/12] fetching submodules: respect `submodule.fetchJobs` config option Stefan Beller
2016-02-29 19:14 ` [PATCHv20 04/12] submodule update: direct error message to stderr Stefan Beller
2016-02-29 19:14 ` [PATCHv20 05/12] run_processes_parallel: treat output of children as byte array Stefan Beller
2016-02-29 19:14 ` [PATCHv20 06/12] run-command: expose default_{start_failure, task_finished} Stefan Beller
2016-02-29 19:14 ` [PATCHv20 07/12] run_processes_parallel: rename parameters for the callbacks Stefan Beller
2016-02-29 19:14 ` [PATCHv20 08/12] run_processes_parallel: correctly terminate callbacks with an LF Stefan Beller
2016-02-29 19:14 ` [PATCHv20 09/12] git submodule update: have a dedicated helper for cloning Stefan Beller
2016-02-29 19:14 ` [PATCHv20 10/12] submodule helper: remove double 'fatal: ' prefix Stefan Beller
2016-02-29 19:14 ` [PATCHv20 11/12] submodule update: expose parallelism to the user Stefan Beller
2016-02-29 19:14 ` [PATCHv20 12/12] clone: allow an explicit argument for parallel submodule clones Stefan Beller
2016-02-29 19:32 ` [PATCHv20 00/12] Expose submodule parallelism to the user Jonathan Nieder
2016-02-29 20:40 ` Stefan Beller
2016-02-29 20:50 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456773250-5510-1-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).