[Notes] [Git][BuildStream/buildstream][bst-1.2] 2 commits: complete.py: Ensure paths get completed from 'element-path'

[Valentin David <gitlab mg gitlab com>]

Title: GitLab

Valentin David pushed to branch bst-1.2 at BuildStream / buildstream

Commits:

• 83710050
  by Martin Blanchard at 2018-08-13T21:37:28Z

  complete.py: Ensure paths get completed from 'element-path'
  
  Element paths should always be completed from the root element folder
  defined by the element-path key in project.conf. Fix complete_path() to
  always search into its given base_directory argument.
  
  See issue BuildStream/buildstream#448
  

• d6714dc2
  by Valentin David at 2018-08-13T22:51:26Z

  Merge branch 'valentindavid/448-autocompletion-broken-defaults' into 'bst-1.2'
  
  Fix autocompletion for elements in sub-folders
  
  See merge request BuildStream/buildstream!652

7 changed files:

• buildstream/_frontend/complete.py
• tests/completions/completions.py
• + tests/completions/sub-folders/base/unwanted.bst
• + tests/completions/sub-folders/elements/base.bst
• + tests/completions/sub-folders/elements/base/wanted.bst
• + tests/completions/sub-folders/elements/hello.bst
• + tests/completions/sub-folders/project.conf

Changes:

buildstream/_frontend/complete.py

---

...	...	@@ -68,9 +68,10 @@ def complete_path(path_type, incomplete, base_directory='.'):
68	68	# If there was nothing on the left of the last separator,
69	69	# we are completing files in the filesystem root
70	70	base_path = os.path.join(base_directory, base_path)
71		-
72		- elif os.path.isdir(incomplete):
73		- base_path = incomplete
	71	+ else:
	72	+ incomplete_base_path = os.path.join(base_directory, incomplete)
	73	+ if os.path.isdir(incomplete_base_path):
	74	+ base_path = incomplete_base_path
74	75
75	76	try:
76	77	if base_path:

tests/completions/completions.py

---

...	...	@@ -212,6 +212,10 @@ def test_option_directory(datafiles, cli, cmd, word_idx, expected, subdir):
212	212	# Also try multi arguments together
213	213	('no-element-path', 'bst --directory ../ checkout t ', 4, ['target.bst '], 'files'),
214	214	('no-element-path', 'bst --directory ../ checkout target.bst ', 5, ['bin-files/', 'dev-files/'], 'files'),
	215	+
	216	+ # When element-path have sub-folders
	217	+ ('sub-folders', 'bst show base', 2, ['base/wanted.bst '], None),
	218	+ ('sub-folders', 'bst show base/', 2, ['base/wanted.bst '], None),
215	219	])
216	220	def test_argument_element(datafiles, cli, project, cmd, word_idx, expected, subdir):
217	221	cwd = os.path.join(str(datafiles), project)

tests/completions/sub-folders/base/unwanted.bst

---

	1	+kind: autotools
	2	+description: |
	3	+
	4	+ Not auto-completed element

tests/completions/sub-folders/elements/base.bst

---

	1	+kind: stack
	2	+description: Base stack
	3	+
	4	+depends:
	5	+- base/wanted.bst

tests/completions/sub-folders/elements/base/wanted.bst

---

	1	+kind: autotools
	2	+description: |
	3	+
	4	+ Auto-completed element

tests/completions/sub-folders/elements/hello.bst

---

	1	+kind: autotools
	2	+description: |
	3	+
	4	+ Hello world

tests/completions/sub-folders/project.conf

---

	1	+# Project config for frontend build test
	2	+name: test
	3	+
	4	+element-path: elements

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.