diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-11-02 11:35:51 +0100 |
|---|---|---|
| committer | Alberto Sartori <alberto.sartori@huawei.com> | 2023-11-15 20:19:18 +0100 |
| commit | 40ed3ee050e0fc3d0f41fc46f7360d28b9a1f7cc (patch) | |
| tree | e1096799ec23b3ae5009cbbead98ee5db559e54a /src/other_tools/root_maps/content_git_map.cpp | |
| parent | e2e0e3b4e92885dd74127aacaabb0c5f3ba86ce7 (diff) | |
| download | justbuild-40ed3ee050e0fc3d0f41fc46f7360d28b9a1f7cc.tar.gz | |
just-mr: Update to using the static methods of ServeApi
Diffstat (limited to 'src/other_tools/root_maps/content_git_map.cpp')
| -rw-r--r-- | src/other_tools/root_maps/content_git_map.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/other_tools/root_maps/content_git_map.cpp b/src/other_tools/root_maps/content_git_map.cpp index 79500f5d..344fec0b 100644 --- a/src/other_tools/root_maps/content_git_map.cpp +++ b/src/other_tools/root_maps/content_git_map.cpp @@ -306,7 +306,7 @@ auto CreateContentGitMap( CAInfoPtr const& ca_info, gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map, gsl::not_null<CriticalGitOpMap*> const& critical_git_op_map, - ServeApi* serve_api, + bool serve_api_exists, IExecutionApi* local_api, IExecutionApi* remote_api, bool fetch_absent, @@ -318,7 +318,7 @@ auto CreateContentGitMap( just_mr_paths, additional_mirrors, ca_info, - serve_api, + serve_api_exists, local_api, remote_api, fetch_absent](auto ts, @@ -469,13 +469,13 @@ auto CreateContentGitMap( return; } // check if content is known to remote serve service - if (serve_api != nullptr) { + if (serve_api_exists) { // if fetching absent, request (and sync) the whole archive // tree, UNRESOLVED, to ensure we maintain the id file // association if (fetch_absent) { if (auto root_tree_id = - serve_api->RetrieveTreeFromArchive( + ServeApi::RetrieveTreeFromArchive( key.archive.content, key.repo_type, /*subdir = */ ".", @@ -810,7 +810,7 @@ auto CreateContentGitMap( // if not fetching absent, request the resolved subdir // tree directly else { - if (auto tree_id = serve_api->RetrieveTreeFromArchive( + if (auto tree_id = ServeApi::RetrieveTreeFromArchive( key.archive.content, key.repo_type, key.subdir, |