diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-27 16:16:09 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-07-05 13:32:39 +0200 |
| commit | 4ebb3bf82551c334d16f4935c751fb554224e19c (patch) | |
| tree | c358d268e8704bd1b50430f4305ed713b5fb5812 /src/buildtool/common/repository_config.cpp | |
| parent | 9f5dcef077a3db2f6c791e403e5036f6464c9576 (diff) | |
| download | justbuild-4ebb3bf82551c334d16f4935c751fb554224e19c.tar.gz | |
Pass Storage to RepositoryConfig
...and adjust AnalyseContext.
Diffstat (limited to 'src/buildtool/common/repository_config.cpp')
| -rw-r--r-- | src/buildtool/common/repository_config.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/buildtool/common/repository_config.cpp b/src/buildtool/common/repository_config.cpp index a3b81de1..d26ba55b 100644 --- a/src/buildtool/common/repository_config.cpp +++ b/src/buildtool/common/repository_config.cpp @@ -14,7 +14,6 @@ #include "src/buildtool/common/repository_config.hpp" -#include "src/buildtool/storage/storage.hpp" #include "src/utils/automata/dfa_minimizer.hpp" auto RepositoryConfig::RepositoryInfo::BaseContentDescription() const @@ -35,15 +34,16 @@ auto RepositoryConfig::RepositoryInfo::BaseContentDescription() const return std::nullopt; } -auto RepositoryConfig::RepositoryKey(std::string const& repo) const noexcept +auto RepositoryConfig::RepositoryKey(Storage const& storage, + std::string const& repo) const noexcept -> std::optional<std::string> { auto const& unique = DeduplicateRepo(repo); if (auto const* data = Data(unique)) { // compute key only once (thread-safe) return data->key.SetOnceAndGet( - [this, &unique]() -> std::optional<std::string> { + [this, &storage, &unique]() -> std::optional<std::string> { if (auto graph = BuildGraphForRepository(unique)) { - auto const& cas = Storage::Instance().CAS(); + auto const& cas = storage.CAS(); if (auto digest = cas.StoreBlob(graph->dump(2))) { return ArtifactDigest{*digest}.hash(); } |