summaryrefslogtreecommitdiff
path: root/src/other_tools/root_maps/distdir_git_map.cpp
diff options
context:
space:
mode:
authorMaksim Denisov <denisov.maksim@huawei.com>2025-01-21 11:39:34 +0100
committerMaksim Denisov <denisov.maksim@huawei.com>2025-01-23 16:50:37 +0100
commit432fd50358cfb7d90ca98bbf702d4909b30f74e8 (patch)
tree3836794aff374bf5298c0b07dd0abdba179e2793 /src/other_tools/root_maps/distdir_git_map.cpp
parentbbfd7d286ee5ed4e3caceb20d9debb0f971adb19 (diff)
downloadjustbuild-432fd50358cfb7d90ca98bbf702d4909b30f74e8.tar.gz
Call serve directly instead of EnsureAbsentRootOnServe.
Diffstat (limited to 'src/other_tools/root_maps/distdir_git_map.cpp')
-rw-r--r--src/other_tools/root_maps/distdir_git_map.cpp26
1 files changed, 4 insertions, 22 deletions
diff --git a/src/other_tools/root_maps/distdir_git_map.cpp b/src/other_tools/root_maps/distdir_git_map.cpp
index 422a89cd..49329908 100644
--- a/src/other_tools/root_maps/distdir_git_map.cpp
+++ b/src/other_tools/root_maps/distdir_git_map.cpp
@@ -417,17 +417,8 @@ auto CreateDistdirGitMap(
// remote CAS
if (digest and remote_api->IsAvailable({*digest})) {
// tell serve to set up the root from the remote CAS
- // tree; upload can be skipped
- if (EnsureAbsentRootOnServe(
- *serve,
- tree_id,
- /*repo_path=*/"",
- native_storage_config,
- /*compat_storage_config=*/nullptr,
- /*local_api=*/nullptr,
- /*remote_api=*/nullptr,
- logger,
- /*no_sync_is_fatal=*/true)) {
+ // tree
+ if (serve->GetTreeFromRemote(*digest)) {
// set workspace root as absent
(*setter)(std::pair(
nlohmann::json::array(
@@ -457,17 +448,8 @@ auto CreateDistdirGitMap(
return;
}
// tell serve to set up the root from the remote CAS
- // tree; upload can be skipped
- if (EnsureAbsentRootOnServe(
- *serve,
- tree_id,
- /*repo_path=*/"",
- native_storage_config,
- /*compat_storage_config=*/nullptr,
- /*local_api=*/nullptr,
- /*remote_api=*/nullptr,
- logger,
- /*no_sync_is_fatal=*/true)) {
+ // tree
+ if (serve->GetTreeFromRemote(*digest)) {
// set workspace root as absent
(*setter)(std::pair(
nlohmann::json::array(