diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-28 12:02:14 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-07-05 13:32:39 +0200 |
| commit | 849671f3d4ea482d208da4b5adf5c2c3556e25e4 (patch) | |
| tree | c4464ebd7bd88a3785c6337c2788d6e8b449fa22 /src/other_tools/just_mr/update.cpp | |
| parent | 3c7f2481918289e8d47922df1c87a7ae77357749 (diff) | |
| download | justbuild-849671f3d4ea482d208da4b5adf5c2c3556e25e4.tar.gz | |
Pass StorageConfig and Storage to just-mr maps
Diffstat (limited to 'src/other_tools/just_mr/update.cpp')
| -rw-r--r-- | src/other_tools/just_mr/update.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/other_tools/just_mr/update.cpp b/src/other_tools/just_mr/update.cpp index 7c6e9506..cb40766a 100644 --- a/src/other_tools/just_mr/update.cpp +++ b/src/other_tools/just_mr/update.cpp @@ -26,7 +26,6 @@ #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/multithreading/task_system.hpp" -#include "src/buildtool/storage/config.hpp" #include "src/other_tools/git_operations/git_repo_remote.hpp" #include "src/other_tools/just_mr/exit_codes.hpp" #include "src/other_tools/just_mr/progress_reporting/progress.hpp" @@ -37,6 +36,7 @@ auto MultiRepoUpdate(std::shared_ptr<Configuration> const& config, MultiRepoCommonArguments const& common_args, MultiRepoUpdateArguments const& update_args, + StorageConfig const& storage_config, std::string multi_repo_tool_name) -> int { // provide report Logger::Log(LogLevel::Info, "Performing repositories update"); @@ -191,7 +191,7 @@ auto MultiRepoUpdate(std::shared_ptr<Configuration> const& config, } } // Create fake repo for the anonymous remotes - auto tmp_dir = StorageConfig::Instance().CreateTypedTmpDir("update"); + auto tmp_dir = storage_config.CreateTypedTmpDir("update"); if (not tmp_dir) { Logger::Log(LogLevel::Error, "Failed to create commit update tmp dir"); return kExitUpdateError; @@ -220,6 +220,7 @@ auto MultiRepoUpdate(std::shared_ptr<Configuration> const& config, auto git_update_map = CreateGitUpdateMap(git_repo->GetGitCAS(), common_args.git_path->string(), *common_args.local_launcher, + &storage_config, common_args.jobs); // set up progress observer |