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

[PATCH v2 11/45] test: completion: add run_func() helper

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Jun 18, 2021, 18:24 UTC
Message-ID
<20210618182518.697912-12-felipe.contreras@gmail.com>
In-Reply-To
<20210618182518.697912-1-felipe.contreras@gmail.com>
Pretty straightforward: runs functions.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 t/t9902-completion.sh | 58 ++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 34 deletions(-)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index d21dca4abd..bb3eebffb7 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -78,6 +78,12 @@ run_completion ()
 	__git_wrap__git_main && print_comp
 }
 
+run_func ()
+{
+	local -a COMPREPLY &&
+	"$@" && print_comp
+}
+
 # Test high-level completion
 # Arguments are:
 # 1: typed text so far (cur)
@@ -455,8 +461,7 @@ test_expect_success '__gitcomp_direct - puts everything into COMPREPLY as-is' '
 	EOF
 	(
 		cur=should_be_ignored &&
-		__gitcomp_direct "$(cat expected)" &&
-		print_comp
+		run_func __gitcomp_direct "$(cat expected)"
 	) &&
 	test_cmp expected out
 '
@@ -550,7 +555,7 @@ test_expect_success '__gitcomp - equal skip' '
 '
 
 test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '
-	__gitcomp "$invalid_variable_name"
+	run_func __gitcomp "$invalid_variable_name"
 '
 
 read -r -d "" refs <<-\EOF
@@ -589,7 +594,7 @@ test_expect_success '__gitcomp_nl - no suffix' '
 '
 
 test_expect_success '__gitcomp_nl - doesnt fail because of invalid variable name' '
-	__gitcomp_nl "$invalid_variable_name"
+	run_func __gitcomp_nl "$invalid_variable_name"
 '
 
 test_expect_success '__git_remotes - list remotes from $GIT_DIR/remotes and from config file' '
@@ -1090,8 +1095,7 @@ test_expect_success '__git_complete_refs - simple' '
 	EOF
 	(
 		cur= &&
-		__git_complete_refs &&
-		print_comp
+		run_func __git_complete_refs
 	) &&
 	test_cmp expected out
 '
@@ -1103,8 +1107,7 @@ test_expect_success '__git_complete_refs - matching' '
 	EOF
 	(
 		cur=mat &&
-		__git_complete_refs &&
-		print_comp
+		run_func __git_complete_refs
 	) &&
 	test_cmp expected out
 '
@@ -1117,8 +1120,7 @@ test_expect_success '__git_complete_refs - remote' '
 	EOF
 	(
 		cur= &&
-		__git_complete_refs --remote=other &&
-		print_comp
+		run_func __git_complete_refs --remote=other
 	) &&
 	test_cmp expected out
 '
@@ -1136,8 +1138,7 @@ test_expect_success '__git_complete_refs - track' '
 	EOF
 	(
 		cur= &&
-		__git_complete_refs --track &&
-		print_comp
+		run_func __git_complete_refs --track
 	) &&
 	test_cmp expected out
 '
@@ -1149,8 +1150,7 @@ test_expect_success '__git_complete_refs - current word' '
 	EOF
 	(
 		cur="--option=mat" &&
-		__git_complete_refs --cur="${cur#*=}" &&
-		print_comp
+		run_func __git_complete_refs --cur="${cur#*=}"
 	) &&
 	test_cmp expected out
 '
@@ -1162,8 +1162,7 @@ test_expect_success '__git_complete_refs - prefix' '
 	EOF
 	(
 		cur=v1.0..mat &&
-		__git_complete_refs --pfx=v1.0.. --cur=mat &&
-		print_comp
+		run_func __git_complete_refs --pfx=v1.0.. --cur=mat
 	) &&
 	test_cmp expected out
 '
@@ -1179,8 +1178,7 @@ test_expect_success '__git_complete_refs - suffix' '
 	EOF
 	(
 		cur= &&
-		__git_complete_refs --sfx=. &&
-		print_comp
+		run_func __git_complete_refs --sfx=.
 	) &&
 	test_cmp expected out
 '
@@ -1193,8 +1191,7 @@ test_expect_success '__git_complete_fetch_refspecs - simple' '
 	EOF
 	(
 		cur= &&
-		__git_complete_fetch_refspecs other &&
-		print_comp
+		run_func __git_complete_fetch_refspecs other
 	) &&
 	test_cmp expected out
 '
@@ -1205,8 +1202,7 @@ test_expect_success '__git_complete_fetch_refspecs - matching' '
 	EOF
 	(
 		cur=br &&
-		__git_complete_fetch_refspecs other "" br &&
-		print_comp
+		run_func __git_complete_fetch_refspecs other "" br
 	) &&
 	test_cmp expected out
 '
@@ -1219,8 +1215,7 @@ test_expect_success '__git_complete_fetch_refspecs - prefix' '
 	EOF
 	(
 		cur="+" &&
-		__git_complete_fetch_refspecs other "+" ""  &&
-		print_comp
+		run_func __git_complete_fetch_refspecs other "+" ""
 	) &&
 	test_cmp expected out
 '
@@ -1233,8 +1228,7 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified' '
 	EOF
 	(
 		cur=refs/ &&
-		__git_complete_fetch_refspecs other "" refs/ &&
-		print_comp
+		run_func __git_complete_fetch_refspecs other "" refs/
 	) &&
 	test_cmp expected out
 '
@@ -1247,8 +1241,7 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified & prefix' '
 	EOF
 	(
 		cur=+refs/ &&
-		__git_complete_fetch_refspecs other + refs/ &&
-		print_comp
+		run_func __git_complete_fetch_refspecs other + refs/
 	) &&
 	test_cmp expected out
 '
@@ -1779,8 +1772,7 @@ test_path_completion ()
 		# unusual characters in path names.  By requesting only
 		# untracked files we do not have to bother adding any
 		# paths to the index in those tests.
-		__git_complete_index_file --others &&
-		print_comp
+		run_func __git_complete_index_file --others
 	) &&
 	test_cmp expected out
 }
@@ -2302,8 +2294,7 @@ do
 			words=(git push '$flag' other ma) &&
 			cword=${#words[@]} cur=${words[cword-1]} &&
 			__git_cmd_idx=1 &&
-			__git_complete_remote_or_refspec &&
-			print_comp
+			run_func __git_complete_remote_or_refspec
 		) &&
 		test_cmp expected out
 	'
@@ -2316,8 +2307,7 @@ do
 			words=(git push other '$flag' ma) &&
 			cword=${#words[@]} cur=${words[cword-1]} &&
 			__git_cmd_idx=1 &&
-			__git_complete_remote_or_refspec &&
-			print_comp
+			run_func __git_complete_remote_or_refspec
 		) &&
 		test_cmp expected out
 	'

-- 
2.32.0
Previous: Felipe ContrerasNext: Felipe Contreras
Message 14 of 48 in “completion: git-completion 1.3.3 patches”
  1. 00/45 completion: git-completion 1.3.3 patchesFelipe Contreras, Jun 18, 2021
  2. 01/45 completion: fix __git_cmd_idx regressionFelipe Contreras, Jun 18, 2021
  3. completion: fix __git_cmd_idx regressionFelipe Contreras, Jun 18, 2021
  4. Felipe ContrerasJun 18, 2021
  5. 02/45 completion: bash: fix prefix detection in branch.*Felipe Contreras, Jun 18, 2021
  6. 03/45 completion: fix for suboptions with valueFelipe Contreras, Jun 18, 2021
  7. 04/45 completion: bash: fix for multiple dash commandsFelipe Contreras, Jun 18, 2021
  8. 05/45 completion: bash: add correct suffix in variablesFelipe Contreras, Jun 18, 2021
  9. 06/45 completion: zsh: add higher-priority locationFelipe Contreras, Jun 18, 2021
  10. 07/45 completion: zsh: trivial improvementFelipe Contreras, Jun 18, 2021
  11. 08/45 completion: bash: do not modify COMP_WORDBREAKSFelipe Contreras, Jun 18, 2021
  12. 09/45 test: completion: fix currently typed wordsFelipe Contreras, Jun 18, 2021
  13. 10/45 test: completion: switch __gitcomp_nl prefix testFelipe Contreras, Jun 18, 2021
  14. 11/45 test: completion: add run_func() helperFelipe Contreras, Jun 18, 2021
  15. 12/45 completion: bash: remove non-append functionalityFelipe Contreras, Jun 18, 2021
  16. 13/45 completion: bash: get rid of _append() functionsFelipe Contreras, Jun 18, 2021
  17. 14/45 completion: bash: get rid of any non-append codeFelipe Contreras, Jun 18, 2021
  18. 15/45 completion: zsh: fix options with argumentsFelipe Contreras, Jun 18, 2021
  19. 16/45 completion: zsh: expand --git-dir file argumentFelipe Contreras, Jun 18, 2021
  20. 17/45 completion: zsh: add support for general -C optsFelipe Contreras, Jun 18, 2021
  21. 18/45 completion: zsh: fix for undefined completionsFelipe Contreras, Jun 18, 2021
  22. 19/45 completion: zsh: add support for general -c optsFelipe Contreras, Jun 18, 2021
  23. 20/45 completion: zsh: fix extra space on foo=Felipe Contreras, Jun 18, 2021
  24. 22/45 completion: zsh: always set compsetFelipe Contreras, Jun 18, 2021
  25. 21/45 completion: zsh: add excluded optionsFelipe Contreras, Jun 18, 2021
  26. 23/45 completion: factor out check in __gitcompFelipe Contreras, Jun 18, 2021
  27. 24/45 completion: simplify equal suffix checkFelipe Contreras, Jun 18, 2021
  28. 25/45 completion: refactor __gitcompFelipe Contreras, Jun 18, 2021
  29. 26/45 completion: simplify __gitcompFelipe Contreras, Jun 18, 2021
  30. 27/45 completion: bash: change suffix check in __gitcompFelipe Contreras, Jun 18, 2021
  31. 28/45 completion: improve __gitcomp suffix codeFelipe Contreras, Jun 18, 2021
  32. 29/45 completion: bash: simplify config_variable_nameFelipe Contreras, Jun 18, 2021
  33. 30/45 test: completion: add missing testFelipe Contreras, Jun 18, 2021
  34. 31/45 completion: bash: improve __gitcomp descriptionFelipe Contreras, Jun 18, 2021
  35. 32/45 completion: add __gitcomp_optsFelipe Contreras, Jun 18, 2021
  36. 33/45 completion: bash: cleanup __gitcomp* invocationsFelipe Contreras, Jun 18, 2021
  37. 34/45 completion: bash: shuffle __gitcomp functionsFelipe Contreras, Jun 18, 2021
  38. 35/45 completion: zsh: simplify __gitcomp_directFelipe Contreras, Jun 18, 2021
  39. 36/45 completion: zsh: shuffle __gitcomp* functionsFelipe Contreras, Jun 18, 2021
  40. 37/45 completion: zsh: fix direct quotingFelipe Contreras, Jun 18, 2021
  41. 38/45 completion: zsh: add elements individually in __gitcomp_optsFelipe Contreras, Jun 18, 2021
  42. 39/45 completion: zsh: add __gitcompadd helperFelipe Contreras, Jun 18, 2021
  43. 40/45 completion: zsh: add correct removable suffixFelipe Contreras, Jun 18, 2021
  44. 42/45 completion: bash: refactor _get_comp_words_by_ref()Felipe Contreras, Jun 18, 2021
  45. 41/45 completion: bash: simplify _get_comp_words_by_ref()Felipe Contreras, Jun 18, 2021
  46. 43/45 completion: bash: cleanup _get_comp_words_by_ref()Felipe Contreras, Jun 18, 2021
  47. 44/45 completion: bash: trivial cleanupFelipe Contreras, Jun 18, 2021
  48. 45/45 completion: bash: rename _get_comp_words_by_ref()Felipe Contreras, Jun 18, 2021

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.