From 0e913dd3eee248bccf2b26161ca0a715d039e716 Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Fri, 23 Feb 2024 16:35:34 +0100 Subject: just-mr setup archive: Local roots require the archive blob to be local too For archive repositories we need to ensure that a non-absent root is backed by an archive content blob in the local CAS, in order to also keep the proper root tree file associations. This change also simplifies the content_cas_map logic by removing the previous separation of implementation logic between fetching and setting up the workspace root. --- src/other_tools/repo_map/repos_to_setup_map.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/other_tools/repo_map') diff --git a/src/other_tools/repo_map/repos_to_setup_map.cpp b/src/other_tools/repo_map/repos_to_setup_map.cpp index aec57868..7d0762c8 100644 --- a/src/other_tools/repo_map/repos_to_setup_map.cpp +++ b/src/other_tools/repo_map/repos_to_setup_map.cpp @@ -297,8 +297,7 @@ void ArchiveCheckout(ExpressionPtr const& repo_desc, .sha512 = repo_desc_sha512->IsString() ? std::make_optional(repo_desc_sha512->String()) : std::nullopt, - .origin = repo_name, - .fetch_only = false}, + .origin = repo_name}, .repo_type = repo_type, .subdir = subdir.empty() ? "." : subdir.string(), .pragma_special = pragma_special_value, @@ -617,8 +616,7 @@ void DistdirCheckout(ExpressionPtr const& repo_desc, .sha512 = repo_desc_sha512->IsString() ? std::make_optional(repo_desc_sha512->String()) : std::nullopt, - .origin = dist_repo_name, - .fetch_only = true}; + .origin = dist_repo_name}; // add to distdir content map auto repo_distfile = -- cgit v1.2.3