diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-09-11 14:26:02 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-09-11 14:52:07 +0200 |
| commit | faed6b210a213ecb0c52a397c99c62d39df07bb2 (patch) | |
| tree | 5fa7cd230745a5b68d51e4ed5b31e4cc4a43e17e /src/other_tools/root_maps/commit_git_map.cpp | |
| parent | 6d0d9197e3b25f528ff966081b6752a91c429e1a (diff) | |
| download | justbuild-faed6b210a213ecb0c52a397c99c62d39df07bb2.tar.gz | |
Use ArtifactDigestFactory in just-mr maps
...to create ArtifactDigests.
Diffstat (limited to 'src/other_tools/root_maps/commit_git_map.cpp')
| -rw-r--r-- | src/other_tools/root_maps/commit_git_map.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/other_tools/root_maps/commit_git_map.cpp b/src/other_tools/root_maps/commit_git_map.cpp index 2d64d599..e6463d57 100644 --- a/src/other_tools/root_maps/commit_git_map.cpp +++ b/src/other_tools/root_maps/commit_git_map.cpp @@ -19,6 +19,8 @@ #include <string> #include "fmt/core.h" +#include "src/buildtool/common/artifact_digest_factory.hpp" +#include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/multithreading/task_system.hpp" @@ -851,12 +853,16 @@ void EnsureCommit(GitRepoInfo const& repo_info, } // try to get root tree from remote CAS - auto root_digest = ArtifactDigest{ - root_tree_id, 0, /*is_tree=*/true}; - if (remote_api != nullptr and + auto const root_digest = + ArtifactDigestFactory::Create( + storage_config->hash_function.GetType(), + root_tree_id, + 0, + /*is_tree=*/true); + if (remote_api != nullptr and root_digest and remote_api->RetrieveToCas( {Artifact::ObjectInfo{ - .digest = root_digest, + .digest = *root_digest, .type = ObjectType::Tree}}, *local_api)) { progress->TaskTracker().Stop(repo_info.origin); @@ -877,7 +883,7 @@ void EnsureCommit(GitRepoInfo const& repo_info, } if (not local_api->RetrieveToPaths( {Artifact::ObjectInfo{ - .digest = root_digest, + .digest = *root_digest, .type = ObjectType::Tree}}, {tmp_dir->GetPath()})) { (*logger)(fmt::format( |