[Notes] [Git][BuildStream/buildstream][jmac/cache_artifacts_with_vdir] 13 commits: _stream.py: Fix ugly error when opening a workspace using a relative path

[Jim MacArthur <gitlab mg gitlab com>]

Title: GitLab

Jim MacArthur pushed to branch jmac/cache_artifacts_with_vdir at BuildStream / buildstream

Commits:

• e564251b
  by Jonathan Maw at 2018-12-11T16:15:19Z

  _stream.py: Fix ugly error when opening a workspace using a relative path
  

• 7cf83343
  by Jonathan Maw at 2018-12-11T16:15:19Z

  _context.py: Store the directory buildstream was invoked on
  

• a1dee91e
  by Jonathan Maw at 2018-12-11T16:15:19Z

  Make specifying elements optional in bst commands
  
  Known issues:
  * `bst shell` works, but `bst shell COMMANDS...` doesn't, because click
    has no way of separating optional args from variable-length args.
  * `bst checkout` and `bst source-checkout`'s usage strings mark LOCATION
    as an optional argument. Because click gets confused if there's an
    optional argument before a mandatory argument, I had to mark LOCATION
    as optional internally.
  * `bst workspace open` makes no sense with element being optional, so
    I skipped it.
  * `bst workspace close` will probably need to be revisited when multiple
    projects can own one workspace.
  * `bst workspace reset` will happily delete the directory you're
    currently in, requiring you to `cd $PWD` to see the contents of your
    directory.
    I could exclude the top-level directory of the workspace being
    deleted, but it is entirely valid to run workspace commands from deeper
    in the workspace.
  
  This is a part of #222
  

• 9b192015
  by Jonathan Maw at 2018-12-11T16:15:19Z

  tests: Add tests for guessing element names
  
  This is a part of #222
  

• e340371f
  by Jonathan Maw at 2018-12-11T16:15:19Z

  Add NEWS for guessing the element in commands
  
  This is a part of #222
  

• bbf81c3d
  by Jonathan Maw at 2018-12-11T16:15:19Z

  doc: Point out that element is optional when commands are run from the workspace
  
  This is a part of #222
  

• a5a53ddd
  by Jonathan Maw at 2018-12-12T13:44:09Z

  Merge branch 'jonathan/workspace-fragment-guess-element' into 'master'
  
  Guess the element when running commands in a workspace
  
  See merge request BuildStream/buildstream!954

• 6c47ddac
  by Jim MacArthur at 2018-12-12T15:23:43Z

  _casbaseddirectory.py: Convert absolute symlinks to relative
  

• 5098bd7d
  by Jim MacArthur at 2018-12-12T15:23:43Z

  _casbaseddirectory.py: Correct typo for _get_underlying_directory
  

• e32dcf5b
  by Jim MacArthur at 2018-12-12T15:23:43Z

  cascache.py: Allow _commit_directory with CasBasedDirectory
  

• 2da586fb
  by Jim MacArthur at 2018-12-12T15:23:43Z

  Virtual directory API: Add get_size with implementations
  

• 69ea8955
  by Jim MacArthur at 2018-12-12T15:23:43Z

  Virtual Directory: Add _fast_directory_import
  

• 5c8ab98f
  by Jim MacArthur at 2018-12-12T15:24:07Z

  element.py: Alter _cache_artifact to use CasBasedDirectory.
  

17 changed files:

• NEWS
• buildstream/_artifactcache/cascache.py
• buildstream/_context.py
• buildstream/_frontend/app.py
• buildstream/_frontend/cli.py
• buildstream/_stream.py
• buildstream/element.py
• buildstream/storage/_casbaseddirectory.py
• buildstream/storage/_filebaseddirectory.py
• buildstream/storage/directory.py
• doc/sessions/developing.run
• doc/source/developing/workspaces.rst
• + doc/source/sessions-stored/developing-build-after-changes-workspace.html
• tests/frontend/source_checkout.py
• tests/frontend/workspace.py
• tests/integration/shell.py
• tests/storage/virtual_directory_import.py

Changes:

NEWS

---

...	...	@@ -86,6 +86,11 @@ buildstream 1.3.1
86	86	o Opening a workspace now creates a .bstproject.yaml file that allows buildstream
87	87	commands to be run from a workspace that is not inside a project.
88	88
	89	+ o Specifying an element is now optional for some commands when buildstream is run
	90	+ from inside a workspace - the 'build', 'checkout', 'fetch', 'pull', 'push',
	91	+ 'shell', 'show', 'source-checkout', 'track', 'workspace close' and 'workspace reset'
	92	+ commands are affected.
	93	+
89	94
90	95	=================
91	96	buildstream 1.1.5

buildstream/_artifactcache/cascache.py

---

...	...	@@ -39,6 +39,7 @@ from .. import utils
39	39	from .._exceptions import CASError, LoadError, LoadErrorReason
40	40	from .. import _yaml
41	41
	42	+from ..storage._casbaseddirectory import CasBasedDirectory
42	43
43	44	# The default limit for gRPC messages is 4 MiB.
44	45	# Limit payload to 1 MiB to leave sufficient headroom for metadata.
...	...	@@ -768,6 +769,9 @@ class CASCache():
768	769	# (Digest): Digest object for the directory added.
769	770	#
770	771	def _commit_directory(self, path, *, dir_digest=None):
	772	+ if isinstance(path, CasBasedDirectory):
	773	+ return self.add_object(digest=dir_digest, buffer=path.pb2_directory.SerializeToString())
	774	+
771	775	directory = remote_execution_pb2.Directory()
772	776
773	777	for name in sorted(os.listdir(path)):

buildstream/_context.py

---

...	...	@@ -32,7 +32,7 @@ from ._message import Message, MessageType
32	32	from ._profile import Topics, profile_start, profile_end
33	33	from ._artifactcache import ArtifactCache
34	34	from ._artifactcache.cascache import CASCache
35		-from ._workspaces import Workspaces, WorkspaceProjectCache
	35	+from ._workspaces import Workspaces, WorkspaceProjectCache, WORKSPACE_PROJECT_FILE
36	36	from .plugin import _plugin_lookup
37	37
38	38
...	...	@@ -47,9 +47,12 @@ from .plugin import _plugin_lookup
47	47	# verbosity levels and basically anything pertaining to the context
48	48	# in which BuildStream was invoked.
49	49	#
	50	+# Args:
	51	+# directory (str): The directory that buildstream was invoked in
	52	+#
50	53	class Context():
51	54
52		- def __init__(self):
	55	+ def __init__(self, directory=None):
53	56
54	57	# Filename indicating which configuration file was used, or None for the defaults
55	58	self.config_origin = None
...	...	@@ -148,6 +151,7 @@ class Context():
148	151	self._log_handle = None
149	152	self._log_filename = None
150	153	self._cascache = None
	154	+ self._directory = directory
151	155
152	156	# load()
153	157	#
...	...	@@ -645,6 +649,20 @@ class Context():
645	649	self._cascache = CASCache(self.artifactdir)
646	650	return self._cascache
647	651
	652	+ # guess_element()
	653	+ #
	654	+ # Attempts to interpret which element the user intended to run commands on
	655	+ #
	656	+ # Returns:
	657	+ # (str) The name of the element, or None if no element can be guessed
	658	+ def guess_element(self):
	659	+ workspace_project_dir, _ = utils._search_upward_for_files(self._directory, [WORKSPACE_PROJECT_FILE])
	660	+ if workspace_project_dir:
	661	+ workspace_project = self._workspace_project_cache.get(workspace_project_dir)
	662	+ return workspace_project.get_default_element()
	663	+ else:
	664	+ return None
	665	+
648	666
649	667	# _node_get_option_str()
650	668	#

buildstream/_frontend/app.py

---

...	...	@@ -164,7 +164,7 @@ class App():
164	164	# Load the Context
165	165	#
166	166	try:
167		- self.context = Context()
	167	+ self.context = Context(directory)
168	168	self.context.load(config)
169	169	except BstError as e:
170	170	self._error_exit(e, "Error loading user configuration")

buildstream/_frontend/cli.py

---

...	...	@@ -316,10 +316,15 @@ def build(app, elements, all_, track_, track_save, track_all, track_except, trac
316	316	if track_save:
317	317	click.echo("WARNING: --track-save is deprecated, saving is now unconditional", err=True)
318	318
319		- if track_all:
320		- track_ = elements
321		-
322	319	with app.initialized(session_name="Build"):
	320	+ if not all_ and not elements:
	321	+ guessed_target = app.context.guess_element()
	322	+ if guessed_target:
	323	+ elements = (guessed_target,)
	324	+
	325	+ if track_all:
	326	+ track_ = elements
	327	+
323	328	app.stream.build(elements,
324	329	track_targets=track_,
325	330	track_except=track_except,
...	...	@@ -371,6 +376,11 @@ def fetch(app, elements, deps, track_, except_, track_cross_junctions):
371	376	deps = PipelineSelection.ALL
372	377
373	378	with app.initialized(session_name="Fetch"):
	379	+ if not elements:
	380	+ guessed_target = app.context.guess_element()
	381	+ if guessed_target:
	382	+ elements = (guessed_target,)
	383	+
374	384	app.stream.fetch(elements,
375	385	selection=deps,
376	386	except_targets=except_,
...	...	@@ -407,6 +417,11 @@ def track(app, elements, deps, except_, cross_junctions):
407	417	all: All dependencies of all specified elements
408	418	"""
409	419	with app.initialized(session_name="Track"):
	420	+ if not elements:
	421	+ guessed_target = app.context.guess_element()
	422	+ if guessed_target:
	423	+ elements = (guessed_target,)
	424	+
410	425	# Substitute 'none' for 'redirect' so that element redirections
411	426	# will be done
412	427	if deps == 'none':
...	...	@@ -442,7 +457,13 @@ def pull(app, elements, deps, remote):
442	457	none: No dependencies, just the element itself
443	458	all: All dependencies
444	459	"""
	460	+
445	461	with app.initialized(session_name="Pull"):
	462	+ if not elements:
	463	+ guessed_target = app.context.guess_element()
	464	+ if guessed_target:
	465	+ elements = (guessed_target,)
	466	+
446	467	app.stream.pull(elements, selection=deps, remote=remote)
447	468
448	469
...	...	@@ -475,6 +496,11 @@ def push(app, elements, deps, remote):
475	496	all: All dependencies
476	497	"""
477	498	with app.initialized(session_name="Push"):
	499	+ if not elements:
	500	+ guessed_target = app.context.guess_element()
	501	+ if guessed_target:
	502	+ elements = (guessed_target,)
	503	+
478	504	app.stream.push(elements, selection=deps, remote=remote)
479	505
480	506
...	...	@@ -545,6 +571,11 @@ def show(app, elements, deps, except_, order, format_):
545	571	$'---------- %{name} ----------\\n%{vars}'
546	572	"""
547	573	with app.initialized():
	574	+ if not elements:
	575	+ guessed_target = app.context.guess_element()
	576	+ if guessed_target:
	577	+ elements = (guessed_target,)
	578	+
548	579	dependencies = app.stream.load_selection(elements,
549	580	selection=deps,
550	581	except_targets=except_)
...	...	@@ -573,7 +604,7 @@ def show(app, elements, deps, except_, order, format_):
573	604	help="Mount a file or directory into the sandbox")
574	605	@click.option('--isolate', is_flag=True, default=False,
575	606	help='Create an isolated build sandbox')
576		-@click.argument('element',
	607	+@click.argument('element', required=False,
577	608	type=click.Path(readable=False))
578	609	@click.argument('command', type=click.STRING, nargs=-1)
579	610	@click.pass_obj
...	...	@@ -604,6 +635,11 @@ def shell(app, element, sysroot, mount, isolate, build_, command):
604	635	scope = Scope.RUN
605	636
606	637	with app.initialized():
	638	+ if not element:
	639	+ element = app.context.guess_element()
	640	+ if not element:
	641	+ raise AppError('Missing argument "ELEMENT".')
	642	+
607	643	dependencies = app.stream.load_selection((element,), selection=PipelineSelection.NONE)
608	644	element = dependencies[0]
609	645	prompt = app.shell_prompt(element)
...	...	@@ -641,15 +677,24 @@ def shell(app, element, sysroot, mount, isolate, build_, command):
641	677	help="Create a tarball from the artifact contents instead "
642	678	"of a file tree. If LOCATION is '-', the tarball "
643	679	"will be dumped to the standard output.")
644		-@click.argument('element',
	680	+@click.argument('element', required=False,
645	681	type=click.Path(readable=False))
646		-@click.argument('location', type=click.Path())
	682	+@click.argument('location', type=click.Path(), required=False)
647	683	@click.pass_obj
648	684	def checkout(app, element, location, force, deps, integrate, hardlinks, tar):
649	685	"""Checkout a built artifact to the specified location
650	686	"""
651	687	from ..element import Scope
652	688
	689	+ if not element and not location:
	690	+ click.echo("ERROR: LOCATION is not specified", err=True)
	691	+ sys.exit(-1)
	692	+
	693	+ if element and not location:
	694	+ # Nasty hack to get around click's optional args
	695	+ location = element
	696	+ element = None
	697	+
653	698	if hardlinks and tar:
654	699	click.echo("ERROR: options --hardlinks and --tar conflict", err=True)
655	700	sys.exit(-1)
...	...	@@ -662,6 +707,11 @@ def checkout(app, element, location, force, deps, integrate, hardlinks, tar):
662	707	scope = Scope.NONE
663	708
664	709	with app.initialized():
	710	+ if not element:
	711	+ element = app.context.guess_element()
	712	+ if not element:
	713	+ raise AppError('Missing argument "ELEMENT".')
	714	+
665	715	app.stream.checkout(element,
666	716	location=location,
667	717	force=force,
...	...	@@ -683,14 +733,28 @@ def checkout(app, element, location, force, deps, integrate, hardlinks, tar):
683	733	help='The dependencies whose sources to checkout (default: none)')
684	734	@click.option('--fetch', 'fetch_', default=False, is_flag=True,
685	735	help='Fetch elements if they are not fetched')
686		-@click.argument('element',
	736	+@click.argument('element', required=False,
687	737	type=click.Path(readable=False))
688		-@click.argument('location', type=click.Path())
	738	+@click.argument('location', type=click.Path(), required=False)
689	739	@click.pass_obj
690	740	def source_checkout(app, element, location, deps, fetch_, except_):
691	741	"""Checkout sources of an element to the specified location
692	742	"""
	743	+ if not element and not location:
	744	+ click.echo("ERROR: LOCATION is not specified", err=True)
	745	+ sys.exit(-1)
	746	+
	747	+ if element and not location:
	748	+ # Nasty hack to get around click's optional args
	749	+ location = element
	750	+ element = None
	751	+
693	752	with app.initialized():
	753	+ if not element:
	754	+ element = app.context.guess_element()
	755	+ if not element:
	756	+ raise AppError('Missing argument "ELEMENT".')
	757	+
694	758	app.stream.source_checkout(element,
695	759	location=location,
696	760	deps=deps,
...	...	@@ -747,11 +811,15 @@ def workspace_open(app, no_checkout, force, track_, directory, elements):
747	811	def workspace_close(app, remove_dir, all_, elements):
748	812	"""Close a workspace"""
749	813
750		- if not (all_ or elements):
751		- click.echo('ERROR: no elements specified', err=True)
752		- sys.exit(-1)
753		-
754	814	with app.initialized():
	815	+ if not (all_ or elements):
	816	+ # NOTE: I may need to revisit this when implementing multiple projects
	817	+ # opening one workspace.
	818	+ element = app.context.guess_element()
	819	+ if element:
	820	+ elements = (element,)
	821	+ else:
	822	+ raise AppError('No elements specified')
755	823
756	824	# Early exit if we specified `all` and there are no workspaces
757	825	if all_ and not app.stream.workspace_exists():
...	...	@@ -808,7 +876,11 @@ def workspace_reset(app, soft, track_, all_, elements):
808	876	with app.initialized():
809	877
810	878	if not (all_ or elements):
811		- raise AppError('No elements specified to reset')
	879	+ element = app.context.guess_element()
	880	+ if element:
	881	+ elements = (element,)
	882	+ else:
	883	+ raise AppError('No elements specified to reset')
812	884
813	885	if all_ and not app.stream.workspace_exists():
814	886	raise AppError("No open workspaces to reset")

buildstream/_stream.py

---

...	...	@@ -544,7 +544,8 @@ class Stream():
544	544	if len(elements) != 1:
545	545	raise StreamError("Exactly one element can be given if --directory is used",
546	546	reason='directory-with-multiple-elements')
547		- expanded_directories = [custom_dir, ]
	547	+ directory = os.path.abspath(custom_dir)
	548	+ expanded_directories = [directory, ]
548	549	else:
549	550	# If this fails it is a bug in what ever calls this, usually cli.py and so can not be tested for via the
550	551	# run bst test mechanism.

buildstream/element.py

---

...	...	@@ -102,6 +102,7 @@ from .types import _KeyStrength, CoreWarnings
102	102
103	103	from .storage.directory import Directory
104	104	from .storage._filebaseddirectory import FileBasedDirectory
	105	+from .storage._casbaseddirectory import CasBasedDirectory
105	106	from .storage.directory import VirtualDirectoryError
106	107
107	108
...	...	@@ -1634,35 +1635,38 @@ class Element(Plugin):
1634	1635	# No collect directory existed
1635	1636	collectvdir = None
1636	1637
	1638	+ assemblevdir = CasBasedDirectory(cas_cache=self._get_context().artifactcache.cas, ref=None)
	1639	+ logsvdir = assemblevdir.descend("logs", create=True)
	1640	+ metavdir = assemblevdir.descend("meta", create=True)
	1641	+
1637	1642	# Create artifact directory structure
1638	1643	assembledir = os.path.join(rootdir, 'artifact')
1639		- filesdir = os.path.join(assembledir, 'files')
1640	1644	logsdir = os.path.join(assembledir, 'logs')
1641	1645	metadir = os.path.join(assembledir, 'meta')
1642		- buildtreedir = os.path.join(assembledir, 'buildtree')
1643	1646	os.mkdir(assembledir)
1644		- if collect is not None and collectvdir is not None:
1645		- os.mkdir(filesdir)
1646	1647	os.mkdir(logsdir)
1647	1648	os.mkdir(metadir)
1648		- os.mkdir(buildtreedir)
1649	1649
1650		- # Hard link files from collect dir to files directory
1651	1650	if collect is not None and collectvdir is not None:
1652		- collectvdir.export_files(filesdir, can_link=True)
	1651	+ if isinstance(collectvdir, CasBasedDirectory):
	1652	+ assemblevdir._fast_directory_import("files", collectvdir)
	1653	+ else:
	1654	+ filesvdir = assemblevdir.descend("files", create=True)
	1655	+ filesvdir.import_files(collectvdir, can_link=True)
1653	1656
	1657	+ sandbox_vroot = sandbox.get_virtual_directory()
1654	1658	try:
1655		- sandbox_vroot = sandbox.get_virtual_directory()
1656	1659	sandbox_build_dir = sandbox_vroot.descend(
1657	1660	self.get_variable('build-root').lstrip(os.sep).split(os.sep))
1658		- # Hard link files from build-root dir to buildtreedir directory
1659		- sandbox_build_dir.export_files(buildtreedir)
	1661	+ assemblevdir._fast_directory_import("buildtree", sandbox_build_dir)
1660	1662	except VirtualDirectoryError:
1661	1663	# Directory could not be found. Pre-virtual
1662	1664	# directory behaviour was to continue silently
1663		- # if the directory could not be found.
1664		- pass
	1665	+ # if the directory could not be found, but we must create
	1666	+ # the directory.
	1667	+ assemblevdir.descend("buildtree", create=True)
1665	1668
	1669	+ # Write some logs out to normal directories: logsdir and metadir
1666	1670	# Copy build log
1667	1671	log_filename = self._get_context().get_log_filename()
1668	1672	self._build_log_path = os.path.join(logsdir, 'build.log')
...	...	@@ -1705,9 +1709,12 @@ class Element(Plugin):
1705	1709	]
1706	1710	}), os.path.join(metadir, 'workspaced-dependencies.yaml'))
1707	1711
1708		- with self.timed_activity("Caching artifact"):
1709		- artifact_size = utils._get_dir_size(assembledir)
1710		- self.__artifacts.commit(self, assembledir, self.__get_cache_keys_for_commit())
	1712	+ metavdir.import_files(metadir)
	1713	+ logsvdir.import_files(logsdir)
	1714	+
	1715	+ artifact_size = assemblevdir.get_size()
	1716	+ with self.timed_activity("Caching artifact of size {}".format(artifact_size)):
	1717	+ self.__artifacts.commit(self, assemblevdir, self.__get_cache_keys_for_commit())
1711	1718
1712	1719	if collect is not None and collectvdir is None:
1713	1720	raise ElementError(

buildstream/storage/_casbaseddirectory.py

---

...	...	@@ -350,10 +350,13 @@ class CasBasedDirectory(Directory):
350	350	filenode.is_executable = is_executable
351	351	self.index[filename] = IndexEntry(filenode, modified=modified or filename in self.index)
352	352
353		- def _copy_link_from_filesystem(self, basename, filename):
354		- self._add_new_link_direct(filename, os.readlink(os.path.join(basename, filename)))
	353	+ def _copy_link_from_filesystem(self, filesystem_path, relative_path, destination_name):
	354	+ # filesystem_path should be a full path point to the source symlink.
	355	+ # relative_path should be the path we're importing to, which is used to turn absolute paths into relative ones.
	356	+ # destination_name should be the destination name in this directory.
	357	+ self._add_new_link_direct(relative_path, destination_name, os.readlink(filesystem_path))
355	358
356		- def _add_new_link_direct(self, name, target):
	359	+ def _add_new_link_direct(self, relative_path, name, target):
357	360	existing_link = self._find_pb2_entry(name)
358	361	if existing_link:
359	362	symlinknode = existing_link
...	...	@@ -361,8 +364,15 @@ class CasBasedDirectory(Directory):
361	364	symlinknode = self.pb2_directory.symlinks.add()
362	365	assert isinstance(symlinknode, remote_execution_pb2.SymlinkNode)
363	366	symlinknode.name = name
364		- # A symlink node has no digest.
	367	+
	368	+ absolute = target.startswith(CasBasedDirectory._pb2_absolute_path_prefix)
	369	+ if absolute:
	370	+ distance_to_root = len(relative_path.split(CasBasedDirectory._pb2_path_sep))
	371	+ target = CasBasedDirectory._pb2_path_sep.join([".."] * distance_to_root + [target[1:]])
365	372	symlinknode.target = target
	373	+
	374	+ # A symlink node has no digest.
	375	+
366	376	self.index[name] = IndexEntry(symlinknode, modified=(existing_link is not None))
367	377
368	378	def delete_entry(self, name):
...	...	@@ -527,7 +537,7 @@ class CasBasedDirectory(Directory):
527	537	result.combine(subdir_result)
528	538	elif os.path.islink(import_file):
529	539	if self._check_replacement(entry, path_prefix, result):
530		- self._copy_link_from_filesystem(source_directory, entry)
	540	+ self._copy_link_from_filesystem(os.path.join(source_directory, entry), path_prefix, entry)
531	541	result.files_written.append(relative_pathname)
532	542	elif os.path.isdir(import_file):
533	543	# A plain directory which already exists isn't a problem; just ignore it.
...	...	@@ -602,7 +612,7 @@ class CasBasedDirectory(Directory):
602	612	self.index[f] = IndexEntry(filenode, modified=True)
603	613	else:
604	614	assert isinstance(item, remote_execution_pb2.SymlinkNode)
605		- self._add_new_link_direct(name=f, target=item.target)
	615	+ self._add_new_link_direct(path_prefix, name=f, target=item.target)
606	616	else:
607	617	result.ignored.append(os.path.join(path_prefix, f))
608	618	return result
...	...	@@ -637,7 +647,7 @@ class CasBasedDirectory(Directory):
637	647	files = external_pathspec.list_relative_paths()
638	648
639	649	if isinstance(external_pathspec, FileBasedDirectory):
640		- source_directory = external_pathspec.get_underlying_directory()
	650	+ source_directory = external_pathspec._get_underlying_directory()
641	651	result = self._import_files_from_directory(source_directory, files=files)
642	652	elif isinstance(external_pathspec, str):
643	653	source_directory = external_pathspec
...	...	@@ -836,6 +846,42 @@ class CasBasedDirectory(Directory):
836	846	self._recalculate_recursing_up()
837	847	self._recalculate_recursing_down()
838	848
	849	+ def get_size(self):
	850	+ total = len(self.pb2_directory.SerializeToString())
	851	+ for i in self.index.values():
	852	+ if isinstance(i.buildstream_object, CasBasedDirectory):
	853	+ total += i.buildstream_object.get_size()
	854	+ elif isinstance(i.pb_object, remote_execution_pb2.FileNode):
	855	+ src_name = self.cas_cache.objpath(i.pb_object.digest)
	856	+ filesize = os.stat(src_name).st_size
	857	+ total += filesize
	858	+ # Symlink nodes are encoded as part of the directory serialization.
	859	+ return total
	860	+
	861	+ def _fast_directory_import(self, dirname, other_directory):
	862	+ # Import other_directory as a new directory in this one.
	863	+
	864	+ # This is a potentially faster method than import_directory with
	865	+ # fewer options. dirname must not already exist, and all files
	866	+ # are imported unconditionally. It is assumed that it is
	867	+ # acceptable to use filesystem hard links to files in
	868	+ # other_directory. You cannot update utimes or get a
	869	+ # FileListResult.
	870	+
	871	+ # This only provides a benefit if other_directory
	872	+ # is a CAS-based directories. In other cases, it will fall back
	873	+ # to import_directory. The order of files, symlinks and
	874	+ # directories will be the same as the source for CAS-to-CAS, and
	875	+ # will follow normal import_directory rules in other cases.
	876	+
	877	+ assert dirname not in self.index
	878	+ if isinstance(other_directory, CasBasedDirectory):
	879	+ self.index[dirname] = IndexEntry(other_directory.pb_object,
	880	+ buildstream_object=other_directory.buildstream_object)
	881	+ else:
	882	+ subdir = self.descend(dirname, create=True)
	883	+ subdir.import_files(other_directory, can_link=True)
	884	+
839	885	def _get_identifier(self):
840	886	path = ""
841	887	if self.parent:

buildstream/storage/_filebaseddirectory.py

---

...	...	@@ -30,6 +30,7 @@ See also: :ref:`sandboxing`.
30	30	import os
31	31	import time
32	32	from .directory import Directory, VirtualDirectoryError
	33	+from .. import utils
33	34	from ..utils import link_files, copy_files, list_relative_paths, _get_link_mtime, _magic_timestamp
34	35	from ..utils import _set_deterministic_user, _set_deterministic_mtime
35	36
...	...	@@ -125,6 +126,13 @@ class FileBasedDirectory(Directory):
125	126	self._mark_changed()
126	127	return import_result
127	128
	129	+ def _fast_directory_import(self, dirname, other_directory):
	130	+ # We can't do a fast import into a FileBasedDirectory, so this
	131	+ # falls back to import_files.
	132	+ assert dirname not in self.index
	133	+ subdir = self.descend(dirname, create=True)
	134	+ subdir.import_files(other_directory, can_link=True)
	135	+
128	136	def _mark_changed(self):
129	137	self._directory_read = False
130	138
...	...	@@ -201,6 +209,9 @@ class FileBasedDirectory(Directory):
201	209
202	210	return list_relative_paths(self.external_directory)
203	211
	212	+ def get_size(self):
	213	+ return utils._get_dir_size(self.external_directory)
	214	+
204	215	def __str__(self):
205	216	# This returns the whole path (since we don't know where the directory started)
206	217	# which exposes the sandbox directory; we will have to assume for the time being

buildstream/storage/directory.py

---

...	...	@@ -75,6 +75,10 @@ class Directory():
75	75	can_link=False):
76	76	"""Imports some or all files from external_path into this directory.
77	77
	78	+ The order of import will be in the order listed in the 'files'
	79	+ parameter if it is supplied, and otherwise the same as
	80	+ utils._process_list().
	81	+
78	82	Args:
79	83	external_pathspec: Either a string containing a pathname, or a
80	84	Directory object, to use as the source.
...	...	@@ -176,3 +180,9 @@ class Directory():
176	180
177	181	"""
178	182	raise NotImplementedError()
	183	+
	184	+ def get_size(self):
	185	+ """ Get an approximation of the storage space in bytes used by this directory
	186	+ and all files and subdirectories in it. Storage space varies by implementation
	187	+ and effective space used may be lower than this number due to deduplication. """
	188	+ raise NotImplementedError()

doc/sessions/developing.run

---

...	...	@@ -24,6 +24,11 @@ commands:
24	24	output: ../source/sessions/developing-build-after-changes.html
25	25	command: build hello.bst
26	26
	27	+# Rebuild, from the workspace
	28	+- directory: ../examples/developing/workspace_hello
	29	+ output: ../source/sessions/developing-build-after-changes-workspace.html
	30	+ command: build
	31	+
27	32	# Capture shell output with changes
28	33	- directory: ../examples/developing/
29	34	output: ../source/sessions/developing-shell-after-changes.html

doc/source/developing/workspaces.rst

---

...	...	@@ -50,11 +50,16 @@ We can open workspace_hello/hello.c and make the following change:
50	50	.. literalinclude:: ../../examples/developing/update.patch
51	51	:language: diff
52	52
53		-Now, rebuild the hello.bst element
	53	+Now, rebuild the hello.bst element.
54	54
55	55	.. raw:: html
56	56	:file: ../sessions/developing-build-after-changes.html
57	57
	58	+Note that if you run the command from inside the workspace, the element name is optional.
	59	+
	60	+.. raw:: html
	61	+ :file: ../sessions/developing-build-after-changes-workspace.html
	62	+
58	63	Now running the hello command using bst shell:
59	64
60	65	.. raw:: html

doc/source/sessions-stored/developing-build-after-changes-workspace.html

---

	1	+<!--
	2	+ WARNING: This file was generated with bst2html.py
	3	+-->
	4	+<div class="highlight" style="font-size:x-small"><pre>
	5	+<span style="color:#C4A000;font-weight:bold">user@host</span>:<span style="color:#3456A4;font-weight:bold">~/workspace_hello</span>$ bst build
	6	+
	7	+<span style="color:#06989A"><span style="opacity:0.5">[</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">] </span></span><span style="color:#3465A4"><span style=""><span style="opacity:0.5">START </span></span></span><span style="color:#06989A"><span style="opacity:0.5"> </span></span>Build
	8	+<span style="color:#06989A"><span style="opacity:0.5">[</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">] </span></span><span style="color:#3465A4"><span style=""><span style="opacity:0.5">START </span></span></span><span style="color:#06989A"><span style="opacity:0.5"> </span></span>Loading elements
	9	+<span style="color:#06989A"><span style="opacity:0.5">[</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">] </span></span><span style="color:#4E9A06"><span style=""><span style="opacity:0.5">SUCCESS</span></span></span><span style="color:#06989A"><span style="opacity:0.5"> </span></span>Loading elements
	10	+<span style="color:#06989A"><span style="opacity:0.5">[</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">] </span></span><span style="color:#3465A4"><span style=""><span style="opacity:0.5">START </span></span></span><span style="color:#06989A"><span style="opacity:0.5"> </span></span>Resolving elements
	11	+<span style="color:#06989A"><span style="opacity:0.5">[</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">] </span></span><span style="color:#4E9A06"><span style=""><span style="opacity:0.5">SUCCESS</span></span></span><span style="color:#06989A"><span style="opacity:0.5"> </span></span>Resolving elements
	12	+<span style="color:#06989A"><span style="opacity:0.5">[</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">] </span></span><span style="color:#3465A4"><span style=""><span style="opacity:0.5">START </span></span></span><span style="color:#06989A"><span style="opacity:0.5"> </span></span>Resolving cached state
	13	+<span style="color:#06989A"><span style="opacity:0.5">[</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">] </span></span><span style="color:#4E9A06"><span style=""><span style="opacity:0.5">SUCCESS</span></span></span><span style="color:#06989A"><span style="opacity:0.5"> </span></span>Resolving cached state
	14	+<span style="color:#06989A"><span style="opacity:0.5">[</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">--</span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">] </span></span><span style="color:#3465A4"><span style=""><span style="opacity:0.5">START </span></span></span><span style="color:#06989A"><span style="opacity:0.5"> </span></span>Checking sources
	15	+<span style="color:#06989A"><span style="opacity:0.5">[</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">] </span></span><span style="color:#4E9A06"><span style=""><span style="opacity:0.5">SUCCESS</span></span></span><span style="color:#06989A"><span style="opacity:0.5"> </span></span>Checking sources
	16	+
	17	+<span style="color:#C4A000"><span style="">BuildStream Version 1.3.0+1032.g41813d3a.dirty
	18	+</span></span><span style="color:#06989A"><span style="opacity:0.5"> Session Start: </span></span><span style="color:#C4A000">Wednesday, 05-12-2018 at 16:47:38</span>
	19	+<span style="color:#06989A"><span style="opacity:0.5"> Project: </span></span><span style="color:#C4A000">developing (/home/user/workspace/buildstream/buildstream/doc/examples/developing)</span>
	20	+<span style="color:#06989A"><span style="opacity:0.5"> Targets: </span></span><span style="color:#C4A000">hello.bst</span>
	21	+
	22	+<span style="color:#C4A000"><span style="">User Configuration
	23	+</span></span><span style="color:#06989A"><span style="opacity:0.5"> Configuration File: </span></span><span style="color:#C4A000">/home/user/workspace/buildstream/buildstream/doc/run-bst-7ocq4_a7/buildstream.conf</span>
	24	+<span style="color:#06989A"><span style="opacity:0.5"> Log Files: </span></span><span style="color:#C4A000">/home/user/workspace/buildstream/buildstream/doc/run-bst-7ocq4_a7/logs</span>
	25	+<span style="color:#06989A"><span style="opacity:0.5"> Source Mirrors: </span></span><span style="color:#C4A000">/home/user/workspace/buildstream/buildstream/doc/run-bst-7ocq4_a7/sources</span>
	26	+<span style="color:#06989A"><span style="opacity:0.5"> Build Area: </span></span><span style="color:#C4A000">/home/user/workspace/buildstream/buildstream/doc/run-bst-7ocq4_a7/build</span>
	27	+<span style="color:#06989A"><span style="opacity:0.5"> Artifact Cache: </span></span><span style="color:#C4A000">/home/user/workspace/buildstream/buildstream/doc/run-bst-7ocq4_a7/artifacts</span>
	28	+<span style="color:#06989A"><span style="opacity:0.5"> Strict Build Plan: </span></span><span style="color:#C4A000">Yes</span>
	29	+<span style="color:#06989A"><span style="opacity:0.5"> Maximum Fetch Tasks: </span></span><span style="color:#C4A000">10</span>
	30	+<span style="color:#06989A"><span style="opacity:0.5"> Maximum Build Tasks: </span></span><span style="color:#C4A000">4</span>
	31	+<span style="color:#06989A"><span style="opacity:0.5"> Maximum Push Tasks: </span></span><span style="color:#C4A000">4</span>
	32	+<span style="color:#06989A"><span style="opacity:0.5"> Maximum Network Retries: </span></span><span style="color:#C4A000">2</span>
	33	+
	34	+<span style="color:#C4A000"><span style="">Pipeline
	35	+</span></span><span style="color:#75507B"> cached</span> <span style="color:#C4A000">9afe69d645f0bee106749bc2101aae16ef437bb51e1b343ef1f16f04f0572efb</span> <span style="color:#3465A4"><span style="">base/alpine.bst</span></span>
	36	+<span style="color:#75507B"> cached</span> <span style="color:#C4A000">19f7c50c7a1db9ae4babe9d1f34f4cdbbf2428827d48673861fd1452d6c7e16b</span> <span style="color:#3465A4"><span style="">base.bst</span></span>
	37	+<span style="color:#75507B"> cached</span> <span style="color:#C4A000">faa419610e7309d36d15926a81a8d75bbc113443c23c8162e63843dd86b5f56a</span> <span style="color:#3465A4"><span style="">hello.bst</span></span> Workspace: /home/user/workspace/buildstream/buildstream/doc/examples/developing/workspace_hello
	38	+<span style="color:#06989A"><span style="opacity:0.5">===============================================================================
	39	+</span></span><span style="color:#06989A"><span style="opacity:0.5">[</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">:</span></span><span style="color:#C4A000">00</span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">][</span></span><span style="color:#06989A"><span style="opacity:0.5">] </span></span><span style="color:#4E9A06"><span style=""><span style="opacity:0.5">SUCCESS</span></span></span><span style="color:#06989A"><span style="opacity:0.5"> </span></span>Build
	40	+
	41	+<span style="color:#C4A000"><span style="">Pipeline Summary
	42	+</span></span><span style="color:#06989A"><span style="opacity:0.5"> Total: </span></span><span style="color:#C4A000">3</span>
	43	+<span style="color:#06989A"><span style="opacity:0.5"> Session: </span></span><span style="color:#C4A000">0</span>
	44	+<span style="color:#06989A"><span style="opacity:0.5"> Fetch Queue: </span></span><span style="color:#C4A000">processed </span><span style="color:#4E9A06">0</span><span style="color:#06989A"><span style="opacity:0.5">, </span></span><span style="color:#C4A000">skipped </span><span style="color:#C4A000">0</span><span style="color:#06989A"><span style="opacity:0.5">, </span></span><span style="color:#C4A000">failed </span><span style="color:#CC0000"><span style="opacity:0.5">0</span></span>
	45	+<span style="color:#06989A"><span style="opacity:0.5"> Build Queue: </span></span><span style="color:#C4A000">processed </span><span style="color:#4E9A06">0</span><span style="color:#06989A"><span style="opacity:0.5">, </span></span><span style="color:#C4A000">skipped </span><span style="color:#C4A000">0</span><span style="color:#06989A"><span style="opacity:0.5">, </span></span><span style="color:#C4A000">failed </span><span style="color:#CC0000"><span style="opacity:0.5">0</span></span>
	46	+</pre></div>

tests/frontend/source_checkout.py

---

...	...	@@ -28,19 +28,28 @@ def generate_remote_import_element(input_path, output_path):
28	28
29	29
30	30	@pytest.mark.datafiles(DATA_DIR)
31		-@pytest.mark.parametrize('with_workspace', [('workspace'), ('no-workspace')])
32		-def test_source_checkout(datafiles, tmpdir_factory, cli, with_workspace):
	31	+@pytest.mark.parametrize(
	32	+ "with_workspace,guess_element",
	33	+ [(True, True), (True, False), (False, False)],
	34	+ ids=["workspace-guess", "workspace-no-guess", "no-workspace-no-guess"]
	35	+)
	36	+def test_source_checkout(datafiles, cli, tmpdir_factory, with_workspace, guess_element):
33	37	tmpdir = tmpdir_factory.mktemp("")
34	38	project = os.path.join(datafiles.dirname, datafiles.basename)
35	39	checkout = os.path.join(cli.directory, 'source-checkout')
36	40	target = 'checkout-deps.bst'
37	41	workspace = os.path.join(str(tmpdir), 'workspace')
	42	+ elm_cmd = [target] if not guess_element else []
38	43
39		- if with_workspace == "workspace":
40		- result = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, target])
	44	+ if with_workspace:
	45	+ ws_cmd = ['-C', workspace]
	46	+ result = cli.run(project=project, args=["workspace", "open", "--directory", workspace, target])
41	47	result.assert_success()
	48	+ else:
	49	+ ws_cmd = []
42	50
43		- result = cli.run(project=project, args=['source-checkout', target, '--deps', 'none', checkout])
	51	+ args = ws_cmd + ['source-checkout', '--deps', 'none'] + elm_cmd + [checkout]
	52	+ result = cli.run(project=project, args=args)
44	53	result.assert_success()
45	54
46	55	assert os.path.exists(os.path.join(checkout, 'checkout-deps', 'etc', 'buildstream', 'config'))

tests/frontend/workspace.py

---

...	...	@@ -616,12 +616,16 @@ def test_list(cli, tmpdir, datafiles):
616	616	@pytest.mark.datafiles(DATA_DIR)
617	617	@pytest.mark.parametrize("kind", repo_kinds)
618	618	@pytest.mark.parametrize("strict", [("strict"), ("non-strict")])
619		-@pytest.mark.parametrize("call_from", [("project"), ("workspace")])
620		-def test_build(cli, tmpdir_factory, datafiles, kind, strict, call_from):
	619	+@pytest.mark.parametrize(
	620	+ "from_workspace,guess_element",
	621	+ [(False, False), (True, True), (True, False)],
	622	+ ids=["project-no-guess", "workspace-guess", "workspace-no-guess"])
	623	+def test_build(cli, tmpdir_factory, datafiles, kind, strict, from_workspace, guess_element):
621	624	tmpdir = tmpdir_factory.mktemp('')
622	625	element_name, project, workspace = open_workspace(cli, tmpdir, datafiles, kind, False)
623	626	checkout = os.path.join(str(tmpdir), 'checkout')
624		- args_pre = ['-C', workspace] if call_from == "workspace" else []
	627	+ args_dir = ['-C', workspace] if from_workspace else []
	628	+ args_elm = [element_name] if not guess_element else []
625	629
626	630	# Modify workspace
627	631	shutil.rmtree(os.path.join(workspace, 'usr', 'bin'))
...	...	@@ -644,14 +648,14 @@ def test_build(cli, tmpdir_factory, datafiles, kind, strict, call_from):
644	648	# Build modified workspace
645	649	assert cli.get_element_state(project, element_name) == 'buildable'
646	650	assert cli.get_element_key(project, element_name) == "{:?<64}".format('')
647		- result = cli.run(project=project, args=args_pre + ['build', element_name])
	651	+ result = cli.run(project=project, args=args_dir + ['build'] + args_elm)
648	652	result.assert_success()
649	653	assert cli.get_element_state(project, element_name) == 'cached'
650	654	assert cli.get_element_key(project, element_name) != "{:?<64}".format('')
651	655
652	656	# Checkout the result
653	657	result = cli.run(project=project,
654		- args=args_pre + ['checkout', element_name, checkout])
	658	+ args=args_dir + ['checkout'] + args_elm + [checkout])
655	659	result.assert_success()
656	660
657	661	# Check that the pony.conf from the modified workspace exists
...	...	@@ -1062,29 +1066,36 @@ def test_multiple_failed_builds(cli, tmpdir, datafiles):
1062	1066
1063	1067	@pytest.mark.datafiles(DATA_DIR)
1064	1068	@pytest.mark.parametrize('subdir', [True, False], ids=["subdir", "no-subdir"])
1065		-def test_external_fetch(cli, datafiles, tmpdir_factory, subdir):
	1069	+@pytest.mark.parametrize("guess_element", [True, False], ids=["guess", "no-guess"])
	1070	+def test_external_fetch(cli, datafiles, tmpdir_factory, subdir, guess_element):
1066	1071	# Fetching from a workspace outside a project doesn't fail horribly
1067	1072	tmpdir = tmpdir_factory.mktemp('')
1068	1073	element_name, project, workspace = open_workspace(cli, tmpdir, datafiles, "git", False)
	1074	+ arg_elm = [element_name] if not guess_element else []
1069	1075
1070	1076	if subdir:
1071	1077	call_dir = os.path.join(workspace, 'usr')
1072	1078	else:
1073	1079	call_dir = workspace
1074	1080
1075		- result = cli.run(project=project, args=['-C', call_dir, 'fetch', element_name])
	1081	+ result = cli.run(project=project, args=['-C', call_dir, 'fetch'] + arg_elm)
1076	1082	result.assert_success()
1077	1083
1078	1084	# We already fetched it by opening the workspace, but we're also checking
1079	1085	# `bst show` works here
1080		- assert cli.get_element_state(project, element_name) == 'buildable'
	1086	+ result = cli.run(project=project,
	1087	+ args=['-C', call_dir, 'show', '--deps', 'none', '--format', '%{state}'] + arg_elm)
	1088	+ result.assert_success()
	1089	+ assert result.output.strip() == 'buildable'
1081	1090
1082	1091
1083	1092	@pytest.mark.datafiles(DATA_DIR)
1084		-def test_external_push_pull(cli, datafiles, tmpdir_factory):
	1093	+@pytest.mark.parametrize("guess_element", [True, False], ids=["guess", "no-guess"])
	1094	+def test_external_push_pull(cli, datafiles, tmpdir_factory, guess_element):
1085	1095	# Pushing and pulling to/from an artifact cache works from an external workspace
1086	1096	tmpdir = tmpdir_factory.mktemp('')
1087	1097	element_name, project, workspace = open_workspace(cli, tmpdir, datafiles, "git", False)
	1098	+ arg_elm = [element_name] if not guess_element else []
1088	1099
1089	1100	with create_artifact_share(os.path.join(str(tmpdir), 'artifactshare')) as share:
1090	1101	result = cli.run(project=project, args=['-C', workspace, 'build', element_name])
...	...	@@ -1094,22 +1105,24 @@ def test_external_push_pull(cli, datafiles, tmpdir_factory):
1094	1105	'artifacts': {'url': share.repo, 'push': True}
1095	1106	})
1096	1107
1097		- result = cli.run(project=project, args=['-C', workspace, 'push', element_name])
	1108	+ result = cli.run(project=project, args=['-C', workspace, 'push'] + arg_elm)
1098	1109	result.assert_success()
1099	1110
1100		- result = cli.run(project=project, args=['-C', workspace, 'pull', '--deps', 'all', element_name])
	1111	+ result = cli.run(project=project, args=['-C', workspace, 'pull', '--deps', 'all'] + arg_elm)
1101	1112	result.assert_success()
1102	1113
1103	1114
1104	1115	@pytest.mark.datafiles(DATA_DIR)
1105		-def test_external_track(cli, datafiles, tmpdir_factory):
	1116	+@pytest.mark.parametrize("guess_element", [True, False], ids=["guess", "no-guess"])
	1117	+def test_external_track(cli, datafiles, tmpdir_factory, guess_element):
1106	1118	# Tracking does not get horribly confused
1107	1119	tmpdir = tmpdir_factory.mktemp('')
1108	1120	element_name, project, workspace = open_workspace(cli, tmpdir, datafiles, "git", True)
	1121	+ arg_elm = [element_name] if not guess_element else []
1109	1122
1110	1123	# The workspace is necessarily already tracked, so we only care that
1111	1124	# there's no weird errors.
1112		- result = cli.run(project=project, args=['-C', workspace, 'track', element_name])
	1125	+ result = cli.run(project=project, args=['-C', workspace, 'track'] + arg_elm)
1113	1126	result.assert_success()
1114	1127
1115	1128
...	...	@@ -1147,15 +1160,17 @@ def test_external_close_other(cli, datafiles, tmpdir_factory):
1147	1160
1148	1161
1149	1162	@pytest.mark.datafiles(DATA_DIR)
1150		-def test_external_close_self(cli, datafiles, tmpdir_factory):
	1163	+@pytest.mark.parametrize("guess_element", [True, False], ids=["guess", "no-guess"])
	1164	+def test_external_close_self(cli, datafiles, tmpdir_factory, guess_element):
1151	1165	# >From inside an external workspace, close it
1152	1166	tmpdir1 = tmpdir_factory.mktemp('')
1153	1167	tmpdir2 = tmpdir_factory.mktemp('')
1154	1168	# Making use of the assumption that it's the same project in both invocations of open_workspace
1155	1169	alpha_element, project, alpha_workspace = open_workspace(cli, tmpdir1, datafiles, "git", False, suffix="-alpha")
1156	1170	beta_element, _, beta_workspace = open_workspace(cli, tmpdir2, datafiles, "git", False, suffix="-beta")
	1171	+ arg_elm = [alpha_element] if not guess_element else []
1157	1172
1158		- result = cli.run(project=project, args=['-C', alpha_workspace, 'workspace', 'close', alpha_element])
	1173	+ result = cli.run(project=project, args=['-C', alpha_workspace, 'workspace', 'close'] + arg_elm)
1159	1174	result.assert_success()
1160	1175
1161	1176
...	...	@@ -1172,11 +1187,13 @@ def test_external_reset_other(cli, datafiles, tmpdir_factory):
1172	1187
1173	1188
1174	1189	@pytest.mark.datafiles(DATA_DIR)
1175		-def test_external_reset_self(cli, datafiles, tmpdir):
	1190	+@pytest.mark.parametrize("guess_element", [True, False], ids=["guess", "no-guess"])
	1191	+def test_external_reset_self(cli, datafiles, tmpdir, guess_element):
1176	1192	element, project, workspace = open_workspace(cli, tmpdir, datafiles, "git", False)
	1193	+ arg_elm = [element] if not guess_element else []
1177	1194
1178	1195	# Command succeeds
1179		- result = cli.run(project=project, args=['-C', workspace, 'workspace', 'reset', element])
	1196	+ result = cli.run(project=project, args=['-C', workspace, 'workspace', 'reset'] + arg_elm)
1180	1197	result.assert_success()
1181	1198
1182	1199	# Successive commands still work (i.e. .bstproject.yaml hasn't been deleted)

tests/integration/shell.py

---

...	...	@@ -358,13 +358,22 @@ def test_integration_devices(cli, tmpdir, datafiles):
358	358	# Test that a shell can be opened from an external workspace
359	359	@pytest.mark.datafiles(DATA_DIR)
360	360	@pytest.mark.parametrize("build_shell", [("build"), ("nobuild")])
	361	+@pytest.mark.parametrize("guess_element", [True, False], ids=["guess", "no-guess"])
361	362	@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
362		-def test_integration_external_workspace(cli, tmpdir_factory, datafiles, build_shell):
	363	+def test_integration_external_workspace(cli, tmpdir_factory, datafiles, build_shell, guess_element):
363	364	tmpdir = tmpdir_factory.mktemp("")
364	365	project = os.path.join(datafiles.dirname, datafiles.basename)
365	366	element_name = 'autotools/amhello.bst'
366	367	workspace_dir = os.path.join(str(tmpdir), 'workspace')
367	368
	369	+ if guess_element:
	370	+ # Mutate the project.conf to use a default shell command
	371	+ project_file = os.path.join(project, 'project.conf')
	372	+ config_text = "shell:\n"\
	373	+ " command: ['true']\n"
	374	+ with open(project_file, 'a') as f:
	375	+ f.write(config_text)
	376	+
368	377	result = cli.run(project=project, args=[
369	378	'workspace', 'open', '--directory', workspace_dir, element_name
370	379	])
...	...	@@ -373,9 +382,10 @@ def test_integration_external_workspace(cli, tmpdir_factory, datafiles, build_sh
373	382	result = cli.run(project=project, args=['-C', workspace_dir, 'build', element_name])
374	383	result.assert_success()
375	384
376		- command = ['shell']
	385	+ command = ['-C', workspace_dir, 'shell']
377	386	if build_shell == 'build':
378	387	command.append('--build')
379		- command.extend([element_name, '--', 'true'])
	388	+ if not guess_element:
	389	+ command.extend([element_name, '--', 'true'])
380	390	result = cli.run(project=project, cwd=workspace_dir, args=command)
381	391	result.assert_success()

tests/storage/virtual_directory_import.py

---

...	...	@@ -149,10 +149,10 @@ def resolve_symlinks(path, root):
149	149	if target.startswith(os.path.sep):
150	150	# Absolute link - relative to root
151	151	location = os.path.join(root, target, tail)
	152	+ return resolve_symlinks(location, root)
152	153	else:
153		- # Relative link - relative to symlink location
154		- location = os.path.join(location, target)
155		- return resolve_symlinks(location, root)
	154	+ return resolve_symlinks(os.path.join(os.path.join(*components[:i]), target, tail), root)
	155	+
156	156	# If we got here, no symlinks were found. Add on the final component and return.
157	157	location = os.path.join(location, components[-1])
158	158	return location
...	...	@@ -199,7 +199,13 @@ def _import_test(tmpdir, original, overlay, generator_function, verify_contents=
199	199	pass
200	200	else:
201	201	assert os.path.islink(realpath)
202		- assert os.readlink(realpath) == content
	202	+ # We expect all storage to normalise absolute symlinks.
	203	+ depth = len(path.split(os.path.sep)) - 1
	204	+ if content.startswith(os.path.sep):
	205	+ assert os.readlink(realpath) == os.path.sep.join([".."] * depth + [content[1:]])
	206	+ else:
	207	+ assert os.readlink(realpath) == content
	208	+
203	209	elif typename == 'D':
204	210	# We can't do any more tests than this because it
205	211	# depends on things present in the original. Blank

—
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.