From: Derrick Stolee <stolee@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 2/4] bundle API: change "flags" to be "extra_index_pack_args"
Date: Tue, 24 Aug 2021 13:09:02 -0400 [thread overview]
Message-ID: <30620e13-4509-1905-7644-9962b6adf9c5@gmail.com> (raw)
In-Reply-To: <patch-v2-2.4-3d7bd9c33be-20210823T110136Z-avarab@gmail.com>
On 8/23/2021 7:02 AM, Ævar Arnfjörð Bjarmason wrote:
...
> --- a/builtin/bundle.c
> +++ b/builtin/bundle.c
> @@ -165,7 +165,8 @@ static int cmd_bundle_unbundle(int argc, const char **argv, const char *prefix)
> struct option options[] = {
> OPT_END()
> };
> - char *bundle_file;
> + char* bundle_file;
nit: errant movement of "*" here.
> + struct strvec extra_args = STRVEC_INIT;
...
> - ret = !!unbundle(the_repository, &header, bundle_fd, 0) ||
> + ret = !!unbundle(the_repository, &header, bundle_fd, &extra_args) ||
I'm assuming that you will be adding something that adds to extra_args
in a future commit. It might be better to just convert the "0" to "NULL"
here and add extra_args when you actually use it.
> int unbundle(struct repository *r, struct bundle_header *header,
> - int bundle_fd, int flags)
> + int bundle_fd, struct strvec *extra_index_pack_args)
> {
> - const char *argv_index_pack[] = {"index-pack",
> - "--fix-thin", "--stdin", NULL, NULL};
> struct child_process ip = CHILD_PROCESS_INIT;
> + int i;
>
> - if (flags & BUNDLE_VERBOSE)
> - argv_index_pack[3] = "-v";
> + strvec_push(&ip.args, "index-pack");
> + strvec_push(&ip.args, "--fix-thin");
> + strvec_push(&ip.args, "--stdin");
> + if (extra_index_pack_args) {
> + struct strvec *extra = extra_index_pack_args;
Creating a shorter variable name seems unnecessary.
> + for (i = 0; i < extra->nr; i++)
> + strvec_push(&ip.args, extra->v[i]);
This seems like a good opportunity to create and use a
strvec_concat() method.
> + strvec_clear(extra_index_pack_args);
Why is it the responsibility of this method to clear these args?
I suppose it is convenient. It just seems a bit wrong to me.
> /**
> * Unbundle after reading the header with read_bundle_header().
> *
> * We'll invoke "git index-pack --stdin --fix-thin" for you on the
> * provided `bundle_fd` from read_bundle_header().
> + *
> + * Provide extra_index_pack_args to pass any extra arguments
> + * (e.g. "-v" for verbose/progress), NULL otherwise. The provided
> + * extra_index_pack_args (if any) will be strvec_clear()'d for you
> + * (like the run-command.h API itself does).
> */
> int unbundle(struct repository *r, struct bundle_header *header,
> - int bundle_fd, int flags);
> + int bundle_fd, struct strvec *extra_index_pack_args);
> int list_bundle_refs(struct bundle_header *header,
> int argc, const char **argv);
>
> diff --git a/transport.c b/transport.c
> index 17e9629710a..8bc4b5fcd3c 100644
> --- a/transport.c
> +++ b/transport.c
> @@ -162,12 +162,15 @@ static int fetch_refs_from_bundle(struct transport *transport,
> int nr_heads, struct ref **to_fetch)
> {
> struct bundle_transport_data *data = transport->data;
> + struct strvec extra_index_pack_args = STRVEC_INIT;
> int ret;
>
> + strvec_push(&extra_index_pack_args, "-v");
> +
> if (!data->get_refs_from_bundle_called)
> get_refs_from_bundle(transport, 0, NULL);
> ret = unbundle(the_repository, &data->header, data->fd,
> - transport->progress ? BUNDLE_VERBOSE : 0);
Previously, this was conditioned on 'transport->progress', but above
you unconditionally add the "-v" option. Seems like a bug.
> + &extra_index_pack_args);
Thanks,
-Stolee
next prev parent reply other threads:[~2021-08-24 17:49 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 0:41 [PATCH 0/4] bundle: show progress on "unbundle" Ævar Arnfjörð Bjarmason
2021-07-27 0:41 ` [PATCH 1/4] bundle API: start writing API documentation Ævar Arnfjörð Bjarmason
2021-07-27 0:41 ` [PATCH 2/4] bundle API: change "flags" to be "extra_index_pack_args" Ævar Arnfjörð Bjarmason
2021-07-27 0:41 ` [PATCH 3/4] index-pack: add --progress-title option Ævar Arnfjörð Bjarmason
2021-07-27 0:41 ` [PATCH 4/4] bundle: show progress on "unbundle" Ævar Arnfjörð Bjarmason
2021-08-23 11:02 ` [PATCH v2 0/4] " Ævar Arnfjörð Bjarmason
2021-08-23 11:02 ` [PATCH v2 1/4] bundle API: start writing API documentation Ævar Arnfjörð Bjarmason
2021-08-24 17:01 ` Derrick Stolee
2021-08-24 21:48 ` Ævar Arnfjörð Bjarmason
2021-08-23 11:02 ` [PATCH v2 2/4] bundle API: change "flags" to be "extra_index_pack_args" Ævar Arnfjörð Bjarmason
2021-08-24 17:09 ` Derrick Stolee [this message]
2021-08-24 21:41 ` Ævar Arnfjörð Bjarmason
2021-08-24 21:48 ` Derrick Stolee
2021-08-23 11:02 ` [PATCH v2 3/4] index-pack: add --progress-title option Ævar Arnfjörð Bjarmason
2021-08-24 17:18 ` Derrick Stolee
2021-08-24 21:40 ` Ævar Arnfjörð Bjarmason
2021-08-23 11:02 ` [PATCH v2 4/4] bundle: show progress on "unbundle" Ævar Arnfjörð Bjarmason
2021-08-24 17:23 ` Derrick Stolee
2021-08-24 21:39 ` Ævar Arnfjörð Bjarmason
2021-08-26 14:05 ` [PATCH v3 0/5] " Ævar Arnfjörð Bjarmason
2021-08-26 14:05 ` [PATCH v3 1/5] bundle API: start writing API documentation Ævar Arnfjörð Bjarmason
2021-08-26 14:05 ` [PATCH v3 2/5] strvec: add a strvec_pushvec() Ævar Arnfjörð Bjarmason
2021-08-28 1:23 ` Junio C Hamano
2021-08-28 1:29 ` Junio C Hamano
2021-08-28 4:12 ` Jeff King
2021-08-29 23:54 ` Junio C Hamano
2021-08-30 17:30 ` Derrick Stolee
2021-09-02 23:19 ` Ævar Arnfjörð Bjarmason
2021-09-03 5:05 ` Junio C Hamano
2021-09-03 11:06 ` Jeff King
2021-08-26 14:05 ` [PATCH v3 3/5] bundle API: change "flags" to be "extra_index_pack_args" Ævar Arnfjörð Bjarmason
2021-08-28 1:44 ` Junio C Hamano
2021-08-26 14:05 ` [PATCH v3 4/5] index-pack: add --progress-title option Ævar Arnfjörð Bjarmason
2021-08-28 1:50 ` Junio C Hamano
2021-08-26 14:05 ` [PATCH v3 5/5] bundle: show progress on "unbundle" Ævar Arnfjörð Bjarmason
2021-08-28 1:54 ` Junio C Hamano
2021-09-02 22:47 ` Ævar Arnfjörð Bjarmason
2021-09-05 7:34 ` [PATCH v4 0/4] " Ævar Arnfjörð Bjarmason
2021-09-05 7:34 ` [PATCH v4 1/4] bundle API: start writing API documentation Ævar Arnfjörð Bjarmason
2021-09-05 7:34 ` [PATCH v4 2/4] bundle API: change "flags" to be "extra_index_pack_args" Ævar Arnfjörð Bjarmason
2021-09-05 7:34 ` [PATCH v4 3/4] index-pack: add --progress-title option Ævar Arnfjörð Bjarmason
2021-09-05 7:34 ` [PATCH v4 4/4] bundle: show progress on "unbundle" Ævar Arnfjörð Bjarmason
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=30620e13-4509-1905-7644-9962b6adf9c5@gmail.com \
--to=stolee@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).