Prepare the removal of workspace and system branches code

Change-Id: Id470c7a77a47c89118a5d9d0d23b2206d8a839e4

5 files changed, 9 insertions, 14 deletions

diff --git a/morphlib/plugins/build_plugin.py b/morphlib/plugins/build_plugin.py
index 226a2c85..0da5d7cf 100644
--- a/morphlib/plugins/build_plugin.py
+++ b/morphlib/plugins/build_plugin.py
@@ -55,7 +55,7 @@ class BuildPlugin(cliapp.Plugin):
         return 'usage: morph %s %s' % (cmd, self.app.cmd_synopsis[cmd])
 
     def distbuild_morphology(self, args):
-        '''Distbuild a system, outside of a system branch.
+        '''Distbuild a system without having to clone a definitions repo.
 
         Command line arguments:
 
@@ -80,7 +80,7 @@ class BuildPlugin(cliapp.Plugin):
         self._distbuild(repo, ref, filename, component_names=component_names)
 
     def distbuild(self, args):
-        '''Distbuild a system image in the current system branch
+        '''Distbuild a system image in the current definitions repo
 
         Command line arguments:
 
@@ -114,7 +114,7 @@ class BuildPlugin(cliapp.Plugin):
             raise cliapp.AppException(self._cmd_usage('distbuild'))
 
         definitions_repo = morphlib.definitions_repo.open(
-            '.', search_for_root=True, search_workspace=True, app=self.app)
+            '.', search_for_root=True, app=self.app)
 
         filename = args[0]
         filename = morphlib.util.sanitise_morphology_path(filename)
@@ -180,7 +180,7 @@ class BuildPlugin(cliapp.Plugin):
             component_names=component_names)
 
     def build_morphology(self, args):
-        '''Build a system, outside of a system branch.
+        '''Build a system without having to clone a definitions repo.
 
         Command line arguments:
 
@@ -190,11 +190,6 @@ class BuildPlugin(cliapp.Plugin):
         * `COMPONENT...` is the names of one or more chunks or strata to
           build. If none are given then the system at FILENAME is built.
 
-        You probably want `morph build` instead. However, in some
-        cases it is more convenient to not have to create a Morph
-        workspace and check out the relevant system branch, and only
-        just run the build. For those times, this command exists.
-
         This subcommand does not automatically commit changes to a
         temporary branch, so you can only build from properly committed
         sources that have been pushed to the git server.
@@ -272,7 +267,7 @@ class BuildPlugin(cliapp.Plugin):
             raise cliapp.AppException(self._cmd_usage('build'))
 
         definitions_repo = morphlib.definitions_repo.open(
-            '.', search_for_root=True, search_workspace=True, app=self.app)
+            '.', search_for_root=True, app=self.app)
 
         filename = args[0]
         filename = morphlib.util.sanitise_morphology_path(filename)
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py
index 89b88373..189222a8 100644
--- a/morphlib/plugins/deploy_plugin.py
+++ b/morphlib/plugins/deploy_plugin.py
@@ -335,7 +335,7 @@ class DeployPlugin(cliapp.Plugin):
             '/', 0)
 
         definitions_repo = morphlib.definitions_repo.open(
-            '.', search_for_root=True, search_workspace=True, app=self.app)
+            '.', search_for_root=True, app=self.app)
 
         cluster_filename = morphlib.util.sanitise_morphology_path(args[0])
         cluster_filename = definitions_repo.relative_path(cluster_filename)
diff --git a/morphlib/plugins/get_chunk_details_plugin.py b/morphlib/plugins/get_chunk_details_plugin.py
index 90e71c52..e3b9220c 100644
--- a/morphlib/plugins/get_chunk_details_plugin.py
+++ b/morphlib/plugins/get_chunk_details_plugin.py
@@ -48,7 +48,7 @@ class GetChunkDetailsPlugin(cliapp.Plugin):
                 '(see help)')
 
         definitions_repo = morphlib.definitions_repo.open(
-            '.', search_for_root=True, search_workspace=True, app=self.app)
+            '.', search_for_root=True, app=self.app)
 
         aliases = self.app.settings['repo-alias']
         self.resolver = morphlib.repoaliasresolver.RepoAliasResolver(aliases)
diff --git a/morphlib/plugins/get_repo_plugin.py b/morphlib/plugins/get_repo_plugin.py
index c1cb6d0e..e8ebf229 100644
--- a/morphlib/plugins/get_repo_plugin.py
+++ b/morphlib/plugins/get_repo_plugin.py
@@ -125,7 +125,7 @@ class GetRepoPlugin(cliapp.Plugin):
         found = 0
 
         definitions_repo = morphlib.definitions_repo.open(
-            '.', search_for_root=True, search_workspace=True, app=self.app)
+            '.', search_for_root=True, app=self.app)
 
         self.app.status(msg='Loading in all morphologies')
         for morph in definitions_repo.load_all_morphologies():
diff --git a/morphlib/plugins/show_build_log_plugin.py b/morphlib/plugins/show_build_log_plugin.py
index f2a975c1..e6dbee96 100644
--- a/morphlib/plugins/show_build_log_plugin.py
+++ b/morphlib/plugins/show_build_log_plugin.py
@@ -59,7 +59,7 @@ class ShowBuildLog(cliapp.Plugin):
         morphlib.buildcommand.BuildCommand._validate_architecture = validate
 
         definitions_repo = morphlib.definitions_repo.open(
-            '.', search_for_root=True, search_workspace=True, app=self.app)
+            '.', search_for_root=True, app=self.app)
         source_pool_context = definitions_repo.source_pool(
             ref=definitions_repo.HEAD, system_filename=system)
         with source_pool_context as source_pool: