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

Re: [PATCH v4 2/3] completion: sparse-checkout updates

From
Lessley Dennington <lessleydennington@gmail.com>
Date
Jan 31, 2022, 20:03 UTC
Message-ID
<82bb12d0-0505-1997-21ba-b9863bfdf2c8@gmail.com>
In-Reply-To
<CABPp-BFG6fD3hDTrG_HZP9qv0qYaHBFxV3idik6YHE53cnFt6Q@mail.gmail.com>
On 1/27/22 5:21 PM, Elijah Newren wrote:
Show 73 quoted lines
> On Thu, Jan 27, 2022 at 1:21 PM Lessley Dennington via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>>
>> From: Lessley Dennington <lessleydennington@gmail.com>
>>
>> Fix custom tab completion for the sparse-checkout command. This will
>> ensure:
>>
>> 1. The full list of subcommands is provided when users enter git
>> sparse-checkout <TAB>.
>> 2. Subcommand options are tab-completable.
>> 3. A list of directories (but not files) is provided when users enter git
>> sparse-checkout add <TAB> or git sparse-checkout set <TAB> in cone mode
>> only. In non-cone mode, these commands will continue to complete both
>> directory and file names.
>>
>> Failing tests that were added in the previous commit to verify these
>> scenarios are now passing with these updates.
>>
>> Signed-off-by: Lessley Dennington <lessleydennington@gmail.com>
>> ---
>>   contrib/completion/git-completion.bash | 15 ++++++++-------
>>   t/t9902-completion.sh                  |  4 ++--
>>   2 files changed, 10 insertions(+), 9 deletions(-)
>>
>> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
>> index c82ccaebcc7..a920cdab201 100644
>> --- a/contrib/completion/git-completion.bash
>> +++ b/contrib/completion/git-completion.bash
>> @@ -2988,21 +2988,22 @@ _git_show_branch ()
>>
>>   _git_sparse_checkout ()
>>   {
>> -       local subcommands="list init set disable"
>> +       local subcommands="list init set disable add reapply"
>>          local subcommand="$(__git_find_on_cmdline "$subcommands")"
>> +
>>          if [ -z "$subcommand" ]; then
>>                  __gitcomp "$subcommands"
>>                  return
>>          fi
>>
>>          case "$subcommand,$cur" in
>> -       init,--*)
>> -               __gitcomp "--cone"
>> -               ;;
>> -       set,--*)
>> -               __gitcomp "--stdin"
>> +               *,--*)
>> +                       __gitcomp_builtin sparse-checkout_$subcommand "" "--"
>>                  ;;
>> -       *)
>> +               set,*|add,*)
>> +                       if [ $(__git config core.sparseCheckoutCone) ]; then
>> +                               __git_complete_index_file "--directory"
>> +                       fi
> 
> --directory only affects how untracked files are presented in `git
> ls-files` (which _git_complete_index_file uses), and you're not asking
> for untracked paths at all here.  So you've got a useless flag.
> 
> Testing this commit out, I can verify that it completes on all tracked
> paths in the index.  Perhaps that was an intended intermediate step,
> but if so the commit message needs to be changed since it claims this
> commit is doing something else.
> 
> There's also a problem in that `git sparse-checkout --cone path<TAB>`
> is not using this codepath.  If the user specifies --cone, then we
> should give them cone-mode-style completion the same as if they
> already have the config setting set.  Or, we at least need to mention
> in the commit message that we don't yet correctly check for the
> `--cone` option to get the right style of completion and are leaving
> it for future work.
> 

Thank you for your feedback, it is very helpful. As I've been thinking about this, it feels like this commit should perhaps be dropped in favor of the __gitcomp_directories commit (with some modifications per [1]). I know you initially said to add the __gitcomp_directories commit in addition to what I had, though, so I wanted to confirm whether removing this is the right course of action.

[1]: https://lore.kernel.org/git/CABPp-BEq9pTqsy_R_SR1DSgUK58ubNR1Gk4G1RoL8wkadyo6zw@mail.gmail.com/

Previous: Elijah NewrenNext: Elijah Newren
Message 59 of 95 in “sparse checkout: custom bash completion updates”
  1. 0/2 sparse checkout: custom bash completion updatesLessley Dennington via GitGitGadget, Dec 30, 2021
  2. 2/2 sparse-checkout: custom tab completionLessley Dennington via GitGitGadget, Dec 30, 2021
  3. Derrick StoleeDec 30, 2021
  4. Lessley DenningtonDec 30, 2021
  5. 1/2 sparse-checkout: custom tab completion testsLessley Dennington via GitGitGadget, Dec 30, 2021
  6. Derrick StoleeDec 30, 2021
  7. Lessley DenningtonDec 30, 2021
  8. Derrick StoleeDec 30, 2021
  9. Elijah NewrenDec 31, 2021
  10. Lessley DenningtonJan 4, 2022
  11. 0/2 sparse checkout: custom bash completion updatesLessley Dennington via GitGitGadget, Dec 30, 2021
  12. 1/2 sparse-checkout: custom tab completion testsLessley Dennington via GitGitGadget, Dec 30, 2021
  13. Elijah NewrenDec 31, 2021
  14. Junio C HamanoDec 31, 2021
  15. Elijah NewrenDec 31, 2021
  16. Lessley DenningtonJan 4, 2022
  17. Elijah NewrenJan 4, 2022
  18. Lessley DenningtonJan 5, 2022
  19. Lessley DenningtonJan 4, 2022
  20. 2/2 sparse-checkout: custom tab completionLessley Dennington via GitGitGadget, Dec 30, 2021
  21. Elijah NewrenDec 31, 2021
  22. Lessley DenningtonJan 4, 2022
  23. Elijah NewrenJan 4, 2022
  24. Lessley DenningtonJan 5, 2022
  25. Elijah NewrenJan 5, 2022
  26. 0/3 sparse checkout: custom bash completion updatesLessley Dennington via GitGitGadget, Jan 10, 2022
  27. 2/3 sparse-checkout: custom tab completionLessley Dennington via GitGitGadget, Jan 10, 2022
  28. SZEDER GáborJan 15, 2022
  29. Elijah NewrenJan 16, 2022
  30. Junio C HamanoJan 16, 2022
  31. Elijah NewrenJan 17, 2022
  32. Junio C HamanoJan 17, 2022
  33. Lessley DenningtonJan 18, 2022
  34. Lessley DenningtonJan 22, 2022
  35. Lessley DenningtonJan 22, 2022
  36. Lessley DenningtonJan 22, 2022
  37. SZEDER GáborJan 18, 2022
  38. Elijah NewrenJan 18, 2022
  39. Lessley DenningtonJan 18, 2022
  40. SZEDER GáborJan 18, 2022
  41. Elijah NewrenJan 18, 2022
  42. 1/3 sparse-checkout: custom tab completion testsLessley Dennington via GitGitGadget, Jan 10, 2022
  43. 3/3 sparse-checkout: limit tab completion to a single levelLessley Dennington via GitGitGadget, Jan 10, 2022
  44. Lessley DenningtonJan 12, 2022
  45. Junio C HamanoJan 13, 2022
  46. Elijah NewrenJan 13, 2022
  47. Lessley DenningtonJan 13, 2022
  48. Elijah NewrenJan 10, 2022
  49. Lessley DenningtonJan 11, 2022
  50. Taylor BlauJan 11, 2022
  51. Lessley DenningtonJan 12, 2022
  52. 0/3 completion: sparse-checkout updatesLessley Dennington via GitGitGadget, Jan 27, 2022
  53. 1/3 completion: add sparse-checkout testsLessley Dennington via GitGitGadget, Jan 27, 2022
  54. Elijah NewrenJan 28, 2022
  55. Junio C HamanoJan 28, 2022
  56. Elijah NewrenJan 28, 2022
  57. 2/3 completion: sparse-checkout updatesLessley Dennington via GitGitGadget, Jan 27, 2022
  58. Elijah NewrenJan 28, 2022
  59. Lessley DenningtonJan 31, 2022
  60. Elijah NewrenJan 31, 2022
  61. 3/3 completion: ensure cone mode completion with multiple <TAB>sLessley Dennington via GitGitGadget, Jan 27, 2022
  62. Elijah NewrenJan 28, 2022
  63. 0/3 completion: sparse-checkout updatesLessley Dennington via GitGitGadget, Feb 3, 2022
  64. 1/3 completion: address sparse-checkout issuesLessley Dennington via GitGitGadget, Feb 3, 2022
  65. Elijah NewrenFeb 3, 2022
  66. Lessley DenningtonFeb 4, 2022
  67. 2/3 completion: improve sparse-checkout cone mode directory completionLessley Dennington via GitGitGadget, Feb 3, 2022
  68. 3/3 completion: handle unusual characters for sparse-checkoutLessley Dennington via GitGitGadget, Feb 3, 2022
  69. Elijah NewrenFeb 3, 2022
  70. Lessley DenningtonFeb 4, 2022
  71. Ævar Arnfjörð BjarmasonFeb 4, 2022
  72. Junio C HamanoFeb 4, 2022
  73. Junio C HamanoFeb 3, 2022
  74. Lessley DenningtonFeb 3, 2022
  75. Junio C HamanoFeb 3, 2022
  76. Lessley DenningtonFeb 3, 2022
  77. Lessley DenningtonFeb 4, 2022
  78. Lessley DenningtonFeb 4, 2022
  79. Ævar Arnfjörð BjarmasonFeb 4, 2022
  80. 0/3 completion: sparse-checkout updatesLessley Dennington via GitGitGadget, Feb 4, 2022
  81. 1/3 completion: address sparse-checkout issuesLessley Dennington via GitGitGadget, Feb 4, 2022
  82. 2/3 completion: improve sparse-checkout cone mode directory completionLessley Dennington via GitGitGadget, Feb 4, 2022
  83. 3/3 completion: handle unusual characters for sparse-checkoutLessley Dennington via GitGitGadget, Feb 4, 2022
  84. Elijah NewrenFeb 4, 2022
  85. Junio C HamanoFeb 4, 2022
  86. Elijah NewrenFeb 4, 2022
  87. Junio C HamanoFeb 4, 2022
  88. Elijah NewrenFeb 4, 2022
  89. Junio C HamanoFeb 4, 2022
  90. 0/3 completion: sparse-checkout updatesLessley Dennington via GitGitGadget, Feb 7, 2022
  91. 2/3 completion: improve sparse-checkout cone mode directory completionLessley Dennington via GitGitGadget, Feb 7, 2022
  92. 3/3 completion: handle unusual characters for sparse-checkoutLessley Dennington via GitGitGadget, Feb 7, 2022
  93. Adam DinwoodieApr 6, 2022
  94. 1/3 completion: address sparse-checkout issuesLessley Dennington via GitGitGadget, Feb 7, 2022
  95. Elijah NewrenFeb 8, 2022

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.