Rename --only-deps to --fetch-deps-only, make it only populate MOVE_HOME

Closes: #475

Author: sahithiacn

language/tools/move-cli/src/base/build.rs

@@ -14,6 +14,14 @@ pub struct Build;
 impl Build {
     pub fn execute(self, path: Option<PathBuf>, config: BuildConfig) -> anyhow::Result<()> {
         let rerooted_path = reroot_path(path)?;
+        if config.fetch_deps_only {
+            let mut config = config;
+            if config.test_mode {
+                config.dev_mode = true;
+            }
+            config.download_deps_for_package(&rerooted_path)?;
+            return Ok(());
+        }
         let architecture = config.architecture.unwrap_or(Architecture::Move);
 
         match architecture {

language/tools/move-cli/tests/build_tests/only_deps/Move.toml

@@ -533,14 +533,9 @@ impl CompiledPackage {
             Flags::empty()
         };
         // invoke the compiler
-        let paths = {
-            let mut v = deps_package_paths.clone();
-            // Skip project files in the compilation process. Used in external IDE integrations.
-            if !resolution_graph.build_options.only_deps {
-                v.push(sources_package_paths.clone());
-            }
-            v
-        };
+        let mut paths = deps_package_paths.clone();
+        paths.push(sources_package_paths.clone());
+
         let compiler = Compiler::from_package_paths(paths, vec![]).set_flags(flags);
         let (file_map, all_compiled_units) = compiler_driver(compiler)?;
         let mut root_compiled_units = vec![];

language/tools/move-cli/tests/build_tests/only_deps/args.exp

@@ -26,7 +26,7 @@ use crate::{
     },
     package_lock::PackageLock,
     resolution::resolution_graph::{ResolutionGraph, ResolvedGraph},
-    source_package::{layout, manifest_parser},
+    source_package::manifest_parser,
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
@@ -125,9 +125,9 @@ pub struct BuildConfig {
     #[clap(long = "arch", global = true, parse(try_from_str = Architecture::try_parse_from_str))]
     pub architecture: Option<Architecture>,
 
-    /// Only compile dependencies
-    #[clap(long = "only-deps", global = true)]
-    pub only_deps: bool,
+    /// Only fetch dependency repos to MOVE_HOME
+    #[clap(long = "fetch-deps-only", global = true)]
+    pub fetch_deps_only: bool,
 }
 
 impl Default for BuildConfig {
@@ -141,7 +141,7 @@ impl Default for BuildConfig {
             force_recompilation: false,
             additional_named_addresses: BTreeMap::new(),
             architecture: None,
-            only_deps: false,
+            fetch_deps_only: false,
         }
     }
 }
@@ -206,14 +206,26 @@ impl BuildConfig {
         ret
     }
 
+    pub fn download_deps_for_package(&self, path: &Path) -> Result<()> {
+        let path = SourcePackageLayout::try_find_root(path)?;
+        let toml_manifest =
+            self.parse_toml_manifest(path.join(SourcePackageLayout::Manifest.path()))?;
+        let mutx = PackageLock::lock();
+        // This should be locked as it inspects the environment for `MOVE_HOME` which could
+        // possibly be set by a different process in parallel.
+        let manifest = manifest_parser::parse_source_manifest(toml_manifest)?;
+        ResolutionGraph::download_dependency_repos(&manifest, self, &path)?;
+        mutx.unlock();
+        Ok(())
+    }
+
     pub fn resolution_graph_for_package(mut self, path: &Path) -> Result<ResolvedGraph> {
         if self.test_mode {
             self.dev_mode = true;
         }
         let path = SourcePackageLayout::try_find_root(path)?;
-        let manifest_string =
-            std::fs::read_to_string(path.join(layout::SourcePackageLayout::Manifest.path()))?;
-        let toml_manifest = manifest_parser::parse_move_manifest_string(manifest_string)?;
+        let toml_manifest =
+            self.parse_toml_manifest(path.join(SourcePackageLayout::Manifest.path()))?;
         let mutx = PackageLock::lock();
         // This should be locked as it inspects the environment for `MOVE_HOME` which could
         // possibly be set by a different process in parallel.
@@ -223,4 +235,9 @@ impl BuildConfig {
         mutx.unlock();
         ret
     }
+
+    fn parse_toml_manifest(&self, path: PathBuf) -> Result<toml::Value> {
+        let manifest_string = std::fs::read_to_string(path)?;
+        manifest_parser::parse_move_manifest_string(manifest_string)
+    }
 }

language/tools/move-cli/tests/build_tests/only_deps/args.txt

@@ -7,8 +7,8 @@ use crate::{
         layout::SourcePackageLayout,
         manifest_parser::{parse_move_manifest_string, parse_source_manifest},
         parsed_manifest::{
-            Dependency, FileName, NamedAddress, PackageDigest, PackageName, SourceManifest,
-            SubstOrRename,
+            Dependencies, Dependency, FileName, NamedAddress, PackageDigest, PackageName,
+            SourceManifest, SubstOrRename,
         },
     },
     BuildConfig,
@@ -514,6 +514,32 @@ impl ResolvingGraph {
         }
     }
 
+    pub fn download_dependency_repos(
+        manifest: &SourceManifest,
+        build_options: &BuildConfig,
+        root_path: &Path,
+    ) -> Result<()> {
+        // include dev dependencies if in dev mode
+        let empty_deps;
+        let additional_deps = if build_options.dev_mode {
+            &manifest.dev_dependencies
+        } else {
+            empty_deps = Dependencies::new();
+            &empty_deps
+        };
+
+        for (dep_name, dep) in manifest.dependencies.iter().chain(additional_deps.iter()) {
+            Self::download_and_update_if_repo(*dep_name, dep)?;
+
+            let (dep_manifest, _) =
+                Self::parse_package_manifest(dep, dep_name, root_path.to_path_buf())
+                    .with_context(|| format!("While processing dependency '{}'", *dep_name))?;
+            // download dependencies of dependencies
+            Self::download_dependency_repos(&dep_manifest, &build_options, root_path)?;
+        }
+        Ok(())
+    }
+
     fn download_and_update_if_repo(dep_name: PackageName, dep: &Dependency) -> Result<()> {
         if let Some(git_info) = &dep.git_info {
             if !git_info.download_to.exists() {

language/tools/move-cli/tests/build_tests/only_deps/sources/A.move

@@ -15,6 +15,6 @@ CompiledPackageInfo {
         force_recompilation: false,
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
     },
 }

language/tools/move-package/src/compilation/compiled_package.rs

@@ -17,6 +17,6 @@ CompiledPackageInfo {
         force_recompilation: false,
         additional_named_addresses: {},
         architecture: None,
-        only_deps: false,
+        fetch_deps_only: false,
     },
 }