[buildstream] 03/06: Original commit required additional functionality to test

[gi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch issue-21_Caching_build_trees
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit bd113a12517c9f3fc8af0a7d8d96e22ab5a4115a
Author: Phillip Smyth <ph...@codethink.co.uk>
AuthorDate: Mon Mar 26 15:38:26 2018 +0000

    Original commit required additional functionality to test
    
    resolves issue #311
    https://gitlab.com/BuildStream/buildstream/issues/311
    "Opening a workspace with a cached build"
    
    * app.py: modified Open_workspace to allow use of cached build tree
    * cli.py: added additional flag to workspace open
    * element.py: Added function to return cached build tree dir
---
 buildstream/_frontend/app.py | 1 -
 buildstream/_frontend/cli.py | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/buildstream/_frontend/app.py b/buildstream/_frontend/app.py
index 8a14008..05be5f7 100644
--- a/buildstream/_frontend/app.py
+++ b/buildstream/_frontend/app.py
@@ -492,7 +492,6 @@ class App():
 
         self.close_workspace(target.name, True)
         self.open_workspace(target, workspace.path, False, track, False, no_cache)
->>>>>>> Original commit required additional functionality to test
 
     ############################################################
     #                      Local Functions                     #
diff --git a/buildstream/_frontend/cli.py b/buildstream/_frontend/cli.py
index 1d9cafc..d2b86c9 100644
--- a/buildstream/_frontend/cli.py
+++ b/buildstream/_frontend/cli.py
@@ -690,7 +690,13 @@ def workspace_reset(app, track_, all_, elements, no_cache):
         if all_:
             elements = tuple(element_name for element_name, _ in app.project.workspaces.list())
 
+<<<<<<< HEAD
         app.stream.workspace_reset(elements, track_first=track_, no_cache)
+=======
+    with app.initialized(elements):
+        for target in app.pipeline.targets:
+            app.reset_workspace(target, track_, no_cache)
+>>>>>>> Original commit required additional functionality to test
 
 
 ##################################################################