From: "SZEDER Gábor" <szeder.dev@gmail•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: William Sprent via GitGitGadget <gitgitgadget@gmail•com>,
git@vger•kernel.org, Victoria Dye <vdye@github•com>,
Elijah Newren <newren@gmail•com>,
William Sprent <williams@unity3d•com>
Subject: Re: [PATCH v2 1/2] builtin/sparse-checkout: remove NEED_WORK_TREE flag
Date: Fri, 7 Apr 2023 18:16:55 +0200 [thread overview]
Message-ID: <20230407161655.GB3117@szeder.dev> (raw)
In-Reply-To: <xmqqr0taaxrr.fsf@gitster.g>
On Mon, Mar 27, 2023 at 10:51:04AM -0700, Junio C Hamano wrote:
> "William Sprent via GitGitGadget" <gitgitgadget@gmail•com> writes:
>
> > diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
> > index c3738154918..5fdc3d9aab5 100644
> > --- a/builtin/sparse-checkout.c
> > +++ b/builtin/sparse-checkout.c
> > @@ -57,6 +57,7 @@ static int sparse_checkout_list(int argc, const char **argv, const char *prefix)
> > char *sparse_filename;
> > int res;
> >
> > + setup_work_tree();
> > if (!core_apply_sparse_checkout)
> > die(_("this worktree is not sparse"));
> > ...
> > @@ -898,6 +903,7 @@ static int sparse_checkout_disable(int argc, const char **argv,
> > * forcibly return to a dense checkout regardless of initial state.
> > */
> >
> > + setup_work_tree();
> > argc = parse_options(argc, argv, prefix,
> > builtin_sparse_checkout_disable_options,
> > builtin_sparse_checkout_disable_usage, 0);
>
> I am throwing this out not as "we must tackle this ugliness before
> this patch can proceed" but as "this is ugly, I wish somebody can
> figure it out in a cleaner way", so do not take this as a blocking
> comment or objection, but more as something to think about improving
> if possible as a bonus point.
>
> It really is a shame that we have a nice "dispatch" table at the
> beginning of the single caller:
>
> int cmd_sparse_checkout(int argc, const char **argv, const char *prefix)
> {
> parse_opt_subcommand_fn *fn = NULL;
> struct option builtin_sparse_checkout_options[] = {
> OPT_SUBCOMMAND("list", &fn, sparse_checkout_list),
> OPT_SUBCOMMAND("init", &fn, sparse_checkout_init),
> OPT_SUBCOMMAND("set", &fn, sparse_checkout_set),
> OPT_SUBCOMMAND("add", &fn, sparse_checkout_add),
> OPT_SUBCOMMAND("reapply", &fn, sparse_checkout_reapply),
> OPT_SUBCOMMAND("disable", &fn, sparse_checkout_disable),
> OPT_END(),
> };
>
> yet we have to sprinkle setup_work_tree() to all of these functions'
> implementation. If we were able to describe which selected ones do
> not need the setup call, we could let the parse-options API to look
> up the function and then before calling "fn" we could make the setup
> call. That would allow us to maintain the subcommands much nicely.
It's easy enough to do in this particular case: there is an
OPT_SUBCOMMAND_F() variant which takes an additional flags parameter,
so we could add a PARSE_OPT_SETUP_WORK_TREE flag, check it in e.g.
parse_subcommand(), and act accordingly if it's set.
However, this wouldn't work when the command has a default operation
mode and is invoked without any subcommands. And I'm not sure about
doing this in parse-options, because it's about, well, parsing
options, not about doing fancy setup stuff.
next prev parent reply other threads:[~2023-04-07 16:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 13:49 [PATCH 0/2] builtin/sparse-checkout: add check-rules command William Sprent via GitGitGadget
2023-03-08 13:49 ` [PATCH 1/2] builtin/sparse-checkout: remove NEED_WORK_TREE flag William Sprent via GitGitGadget
2023-03-08 18:14 ` Junio C Hamano
2023-03-08 19:27 ` Junio C Hamano
2023-03-09 15:31 ` Elijah Newren
2023-03-09 22:19 ` Junio C Hamano
2023-03-08 13:49 ` [PATCH 2/2] builtin/sparse-checkout: add check-rules command William Sprent via GitGitGadget
2023-03-19 4:26 ` Elijah Newren
2023-03-20 15:49 ` William Sprent
2023-03-19 4:28 ` [PATCH 0/2] " Elijah Newren
2023-03-27 7:55 ` [PATCH v2 " William Sprent via GitGitGadget
2023-03-27 7:55 ` [PATCH v2 1/2] builtin/sparse-checkout: remove NEED_WORK_TREE flag William Sprent via GitGitGadget
2023-03-27 17:51 ` Junio C Hamano
2023-04-07 16:16 ` SZEDER Gábor [this message]
2023-04-07 16:38 ` Junio C Hamano
2023-03-27 7:55 ` [PATCH v2 2/2] builtin/sparse-checkout: add check-rules command William Sprent via GitGitGadget
2023-04-01 18:49 ` [PATCH v2 0/2] " Elijah Newren
2023-04-03 17:07 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230407161655.GB3117@szeder.dev \
--to=szeder.dev@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=gitster@pobox$(echo .)com \
--cc=newren@gmail$(echo .)com \
--cc=vdye@github$(echo .)com \
--cc=williams@unity3d$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox