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

[PATCH v7 0/3] completion: sparse-checkout updates

From
Lessley Dennington via GitGitGadget <gitgitgadget@gmail.com>
Date
Feb 7, 2022, 17:31 UTC
Message-ID
<pull.1108.v7.git.1644255105.gitgitgadget@gmail.com>
In-Reply-To
<pull.1108.v6.git.1643945198.gitgitgadget@gmail.com>

This change updates custom tab completion for the sparse-checkout command. Specifically, it corrects the following issues with the current method:

 1. git sparse-checkout <TAB> results in an incomplete list of subcommands
    (it is missing reapply and add).
 2. Options for subcommands are not tab-completable.
 3. git sparse-checkout set <TAB> and git sparse-checkout add <TAB> show
    both file names and directory names. While this may be a less surprising
    behavior for non-cone mode, we want to only show directories in cone
    mode.

The first commit in this series is an intermediate step that fixes issues 1 and 2 above and introduces a simple fix for issue 3 with some performance and unusual character-related caveats. The next commit adds a new __gitcomp_directories method that fixes the performance-related caveat from the first commit by completing just a single level of directories. The final commit modifies __gitcomp_directories to handle unusual characters in directory names.

Changes since V6 ================

 * Split tests for unusual characters so that spaces and accents are
   verified on Windows (in addition to macOS and Linux). Tabs and
   backslashes are still excluded on Windows (details on why are included in
   the third commit message).

Changes since V5 ================

 * Fix incorrect conditional that was causing failure of non-cone mode test
   (and causing 'seen' CI to fail).
 * Remove __git_comp_directories indentation changes between the second and
   third commits.

Changes since V4 ================

 * Clarify that completing on files and directories is a less-surprising
   behavior in non-cone mode (rather than definitely the correct behavior)
   in commit message and cover letter.
 * Add explicit --no-cone to non-cone mode sparse-checkout completion test.
 * Replace use of __git_complete_index_file with a new version of
   __gitcomp_directories that is able to handle unusual characters.
 * Ensure that users running git sparse-checkout set --cone get cone
   mode-style completion whether or not they already have the cone mode
   config set.
 * Refactor creation of sparse-checkout test repo into a sparse-checkout
   setup test.

Changes since V3 ================

 * Update commit descriptions to begin with completion instead of
   sparse-checkout.
 * Remove explicit completion of --help, as this is inconsistent with the
   rest of the completion script.
 * Use __gitcomp_builtin to auto-complete subcommand options (and remove
   option completion test from previous iterations, as it is no longer
   necessary).
 * Use __git_complete_index_file helper function in place of __gitcomp
   "$(git ls-tree -d -r HEAD --name-only).
 * If in cone-mode sparse checkout, only show directory completions. If in
   non-cone mode sparse checkout show both files and directories.

Changes since V2 ================

 * Change use of $prev to $subcommand in _git_sparse_checkout() method in
   git-completion.bash.
 * State explicitly that directory completion applies in both cone and
   non-cone mode in 'sparse-checkout: custom tab completion' commit
 * Add new patch with __gitcomp_directories method to improve performance by
   only outputting directories at the current level.

Changes since V1 ================

 * Rebase onto en/sparse-checkout-set.
 * Add subcommand options (including --no-cone) for set and reapply.
 * Extend 'sparse-checkout completes subcommand options' test to validate
   new set/reapply subcommand options.
 * No longer set index.sparse to false in 'sparse-checkout completes
   directory names' test.
 * Refactor creation of sparse-checkout repo into a setup test.
Thanks, Lessley
Lessley Dennington (3):
  completion: address sparse-checkout issues
  completion: improve sparse-checkout cone mode directory completion
  completion: handle unusual characters for sparse-checkout
 contrib/completion/git-completion.bash |  44 ++++++--
 t/t9902-completion.sh                  | 138 +++++++++++++++++++++++++
 2 files changed, 174 insertions(+), 8 deletions(-)
base-commit: dfac9b609f86cd4f6ce896df9e1172d2a02cde48
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1108%2Fldennington%2Fsparse-checkout-bash-completion-v7
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1108/ldennington/sparse-checkout-bash-completion-v7
Pull-Request: https://github.com/gitgitgadget/git/pull/1108
Range-diff vs v6:
 1:  23390000dd3 ! 1:  26422c759a0 completion: address sparse-checkout issues
     @@ Commit message
          These caveats will be fixed by subsequent commits in this series.
      
          Signed-off-by: Lessley Dennington <lessleydennington@gmail.com>
     +    Reviewed-by: Elijah Newren <newren@gmail.com>
      
       ## contrib/completion/git-completion.bash ##
      @@ contrib/completion/git-completion.bash: _git_show_branch ()
 2:  10a190ce6a1 ! 2:  2c20830b4ce completion: improve sparse-checkout cone mode directory completion
     @@ Commit message
          Co-authored-by: Elijah Newren <newren@gmail.com>
          Co-authored-by: Lessley Dennington <lessleydennington@gmail.com>
          Signed-off-by: Lessley Dennington <lessleydennington@gmail.com>
     +    Reviewed-by: Elijah Newren <newren@gmail.com>
      
       ## contrib/completion/git-completion.bash ##
      @@ contrib/completion/git-completion.bash: _git_show_branch ()
 3:  e805dbb58cc ! 3:  996cbe7dfb7 completion: handle unusual characters for sparse-checkout
     @@ Commit message
          subdirectories (e.g. folder1/0/ became folder1/), so instead new custom
          logic was placed directly in the __gitcomp_directories method.
      
     +    Note there are two tests for this new functionality - one for spaces and
     +    accents and one for backslashes and tabs. The backslashes and tabs test
     +    uses FUNNYNAMES to avoid running on Windows. This is because:
     +
     +    1. Backslashes are explicitly not allowed in Windows file paths.
     +    2. Although tabs appear to be allowed when creating a file in a Windows
     +    bash shell, they actually are not renderable (and appear as empty boxes
     +    in the shell).
     +
          Co-authored-by: Johannes Schindelin <johannes.schindelin@gmx.de>
          Co-authored-by: Lessley Dennington <lessleydennington@gmail.com>
     +    Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
          Signed-off-by: Lessley Dennington <lessleydennington@gmail.com>
     +    Reviewed-by: Elijah Newren <newren@gmail.com>
      
       ## contrib/completion/git-completion.bash ##
      @@ contrib/completion/git-completion.bash: _git_show_branch ()
     @@ t/t9902-completion.sh: test_expect_success 'cone mode sparse-checkout completes
       	)
       '
       
     -+# use FUNNYNAMES to avoid running on Windows, which doesn't permit backslashes in paths
     -+test_expect_success FUNNYNAMES 'cone mode sparse-checkout completes directory names with special characters' '
     ++test_expect_success 'cone mode sparse-checkout completes directory names with spaces and accents' '
      +	# reset sparse-checkout
      +	git -C sparse-checkout sparse-checkout disable &&
      +	(
      +		cd sparse-checkout &&
      +		mkdir "directory with spaces" &&
     -+		mkdir "$(printf "directory\twith\ttabs")" &&
     -+		mkdir "directory\with\backslashes" &&
      +		mkdir "directory-with-áccent" &&
      +		>"directory with spaces/randomfile" &&
     -+		>"$(printf "directory\twith\ttabs")/randomfile" &&
     -+		>"directory\with\backslashes/randomfile" &&
      +		>"directory-with-áccent/randomfile" &&
      +		git add . &&
     -+		git commit -m "Add directories containing unusual characters" &&
     ++		git commit -m "Add directory with spaces and directory with accent" &&
      +		git sparse-checkout set --cone "directory with spaces" \
     -+			"$(printf "directory\twith\ttabs")" "directory\with\backslashes" \
      +			"directory-with-áccent" &&
     -+		test_completion "git sparse-checkout add dir" <<-\EOF
     ++		test_completion "git sparse-checkout add dir" <<-\EOF &&
      +		directory with spaces/
     -+		directory	with	tabs/
     -+		directory\with\backslashes/
      +		directory-with-áccent/
      +		EOF
     ++		rm -rf "directory with spaces" &&
     ++		rm -rf "directory-with-áccent" &&
     ++		git add . &&
     ++		git commit -m "Remove directory with spaces and directory with accent"
     ++	)
     ++'
     ++
     ++# use FUNNYNAMES to avoid running on Windows, which doesn't permit backslashes or tabs in paths
     ++test_expect_success FUNNYNAMES 'cone mode sparse-checkout completes directory names with backslashes and tabs' '
     ++	# reset sparse-checkout
     ++	git -C sparse-checkout sparse-checkout disable &&
     ++	(
     ++		cd sparse-checkout &&
     ++		mkdir "directory\with\backslashes" &&
     ++		mkdir "$(printf "directory\twith\ttabs")" &&
     ++		>"directory\with\backslashes/randomfile" &&
     ++		>"$(printf "directory\twith\ttabs")/randomfile" &&
     ++		git add . &&
     ++		git commit -m "Add directory with backslashes and directory with tabs" &&
     ++		git sparse-checkout set --cone "directory\with\backslashes" \
     ++			"$(printf "directory\twith\ttabs")" &&
     ++		test_completion "git sparse-checkout add dir" <<-\EOF &&
     ++		directory\with\backslashes/
     ++		directory	with	tabs/
     ++		EOF
     ++		rm -rf "directory\with\backslashes" &&
     ++		rm -rf "$(printf "directory\twith\ttabs")" &&
     ++		git add . &&
     ++		git commit -m "Remove directory with backslashes and directory with tabs"
      +	)
      +'
      +
-- 
gitgitgadget
Previous: Junio C HamanoNext: Lessley Dennington via GitGitGadget
Message 90 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.