git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 1/2] builtin/sparse-checkout: remove NEED_WORK_TREE flag

From
SZEDER Gábor <szeder.dev@gmail.com>
Date
Apr 7, 2023, 16:16 UTC
Message-ID
<20230407161655.GB3117@szeder.dev>
In-Reply-To
<xmqqr0taaxrr.fsf@gitster.g>
On Mon, Mar 27, 2023 at 10:51:04AM -0700, Junio C Hamano wrote:
Show 50 quoted lines
> "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.

Previous: Junio C HamanoNext: Junio C Hamano
Message 14 of 18 in “builtin/sparse-checkout: add check-rules command”
  1. 0/2 builtin/sparse-checkout: add check-rules commandWilliam Sprent via GitGitGadget, Mar 8, 2023
  2. 1/2 builtin/sparse-checkout: remove NEED_WORK_TREE flagWilliam Sprent via GitGitGadget, Mar 8, 2023
  3. Junio C HamanoMar 8, 2023
  4. Junio C HamanoMar 8, 2023
  5. Elijah NewrenMar 9, 2023
  6. Junio C HamanoMar 9, 2023
  7. 2/2 builtin/sparse-checkout: add check-rules commandWilliam Sprent via GitGitGadget, Mar 8, 2023
  8. Elijah NewrenMar 19, 2023
  9. William SprentMar 20, 2023
  10. Elijah NewrenMar 19, 2023
  11. 0/2 builtin/sparse-checkout: add check-rules commandWilliam Sprent via GitGitGadget, Mar 27, 2023
  12. 1/2 builtin/sparse-checkout: remove NEED_WORK_TREE flagWilliam Sprent via GitGitGadget, Mar 27, 2023
  13. Junio C HamanoMar 27, 2023
  14. SZEDER GáborApr 7, 2023
  15. Junio C HamanoApr 7, 2023
  16. 2/2 builtin/sparse-checkout: add check-rules commandWilliam Sprent via GitGitGadget, Mar 27, 2023
  17. Elijah NewrenApr 1, 2023
  18. Junio C HamanoApr 3, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.