summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/other_tools/just_mr/setup.cpp3
-rw-r--r--src/other_tools/root_maps/TARGETS1
-rw-r--r--src/other_tools/root_maps/fpath_git_map.cpp67
-rw-r--r--src/other_tools/root_maps/fpath_git_map.hpp4
4 files changed, 8 insertions, 67 deletions
diff --git a/src/other_tools/just_mr/setup.cpp b/src/other_tools/just_mr/setup.cpp
index 55aa328b..a265abee 100644
--- a/src/other_tools/just_mr/setup.cpp
+++ b/src/other_tools/just_mr/setup.cpp
@@ -382,9 +382,6 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
&resolve_symlinks_map,
serve ? &*serve : nullptr,
&native_storage_config,
- compat_storage_config != nullptr ? &*compat_storage_config : nullptr,
- has_remote_api ? &*apis.local : nullptr, // only needed if remote given
- has_remote_api ? &*apis.remote : nullptr,
common_args.jobs,
multi_repo_tool_name,
common_args.just_path ? common_args.just_path->string()
diff --git a/src/other_tools/root_maps/TARGETS b/src/other_tools/root_maps/TARGETS
index a7a87958..8e6e40a8 100644
--- a/src/other_tools/root_maps/TARGETS
+++ b/src/other_tools/root_maps/TARGETS
@@ -84,7 +84,6 @@
, "deps":
[ ["@", "gsl", "", "gsl"]
, ["@", "json", "", "json"]
- , ["src/buildtool/execution_api/common", "common"]
, ["src/buildtool/file_system/symlinks_map", "pragma_special"]
, ["src/buildtool/file_system/symlinks_map", "resolve_symlinks_map"]
, ["src/buildtool/multithreading", "async_map_consumer"]
diff --git a/src/other_tools/root_maps/fpath_git_map.cpp b/src/other_tools/root_maps/fpath_git_map.cpp
index 06d0a7d6..c1d93e61 100644
--- a/src/other_tools/root_maps/fpath_git_map.cpp
+++ b/src/other_tools/root_maps/fpath_git_map.cpp
@@ -37,17 +37,12 @@ namespace {
/// \brief Does the serve endpoint checks and sets the workspace root.
/// It guarantees the logger is called exactly once with fatal on failure, and
/// the setter on success.
-void CheckServeAndSetRoot(
- std::string const& tree_id,
- std::string const& repo_root,
- bool absent,
- ServeApi const* serve,
- gsl::not_null<StorageConfig const*> const& /*native_storage_config*/,
- StorageConfig const* /*compat_storage_config*/,
- IExecutionApi const* /*local_api*/,
- IExecutionApi const* /*remote_api*/,
- FilePathGitMap::SetterPtr const& ws_setter,
- FilePathGitMap::LoggerPtr const& logger) {
+void CheckServeAndSetRoot(std::string const& tree_id,
+ std::string const& repo_root,
+ bool absent,
+ ServeApi const* serve,
+ FilePathGitMap::SetterPtr const& ws_setter,
+ FilePathGitMap::LoggerPtr const& logger) {
// if serve endpoint is given, try to ensure it has this tree available to
// be able to build against it. If root is not absent, do not fail if we
// don't have a suitable remote endpoint, but warn user nonetheless.
@@ -107,9 +102,6 @@ void ResolveFilePathTree(
gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
gsl::not_null<TaskSystem*> const& ts,
FilePathGitMap::SetterPtr const& ws_setter,
FilePathGitMap::LoggerPtr const& logger) {
@@ -134,10 +126,6 @@ void ResolveFilePathTree(
native_storage_config->GitRoot().string(),
absent,
serve,
- native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
ws_setter,
logger);
}
@@ -157,9 +145,6 @@ void ResolveFilePathTree(
absent,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
ts,
ws_setter,
logger](auto const& hashes) {
@@ -182,9 +167,6 @@ void ResolveFilePathTree(
absent,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
ws_setter,
logger](auto const& values) {
GitOpValue op_result = *values[0];
@@ -212,10 +194,6 @@ void ResolveFilePathTree(
native_storage_config->GitRoot().string(),
absent,
serve,
- native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
ws_setter,
logger);
},
@@ -243,16 +221,8 @@ void ResolveFilePathTree(
// tree needs no further processing;
// if serve endpoint is given, try to ensure it has this tree available
// to be able to build against it
- CheckServeAndSetRoot(tree_hash,
- repo_root,
- absent,
- serve,
- native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
- ws_setter,
- logger);
+ CheckServeAndSetRoot(
+ tree_hash, repo_root, absent, serve, ws_setter, logger);
}
}
@@ -265,9 +235,6 @@ auto CreateFilePathGitMap(
gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
std::size_t jobs,
std::string const& multi_repo_tool_name,
std::string const& build_tool_name) -> FilePathGitMap {
@@ -277,9 +244,6 @@ auto CreateFilePathGitMap(
resolve_symlinks_map,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
multi_repo_tool_name,
build_tool_name](auto ts,
auto setter,
@@ -318,9 +282,6 @@ auto CreateFilePathGitMap(
resolve_symlinks_map,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
ts,
setter,
logger](auto const& values) {
@@ -381,9 +342,6 @@ auto CreateFilePathGitMap(
resolve_symlinks_map,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
ts,
setter,
logger](auto const& values) {
@@ -406,9 +364,6 @@ auto CreateFilePathGitMap(
resolve_symlinks_map,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
ts,
setter,
logger);
@@ -477,9 +432,6 @@ auto CreateFilePathGitMap(
resolve_symlinks_map,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
ts,
setter,
logger](auto const& values) {
@@ -505,9 +457,6 @@ auto CreateFilePathGitMap(
resolve_symlinks_map,
serve,
native_storage_config,
- compat_storage_config,
- local_api,
- remote_api,
ts,
setter,
logger);
diff --git a/src/other_tools/root_maps/fpath_git_map.hpp b/src/other_tools/root_maps/fpath_git_map.hpp
index 2c6f7360..29ca8832 100644
--- a/src/other_tools/root_maps/fpath_git_map.hpp
+++ b/src/other_tools/root_maps/fpath_git_map.hpp
@@ -23,7 +23,6 @@
#include "gsl/gsl"
#include "nlohmann/json.hpp"
-#include "src/buildtool/execution_api/common/execution_api.hpp"
#include "src/buildtool/file_system/symlinks_map/pragma_special.hpp"
#include "src/buildtool/file_system/symlinks_map/resolve_symlinks_map.hpp"
#include "src/buildtool/multithreading/async_map_consumer.hpp"
@@ -59,9 +58,6 @@ using FilePathGitMap = AsyncMapConsumer<FpathInfo, nlohmann::json>;
gsl::not_null<ResolveSymlinksMap*> const& resolve_symlinks_map,
ServeApi const* serve,
gsl::not_null<StorageConfig const*> const& native_storage_config,
- StorageConfig const* compat_storage_config,
- IExecutionApi const* local_api,
- IExecutionApi const* remote_api,
std::size_t jobs,
std::string const& multi_repo_tool_name,
std::string const& build_tool_name) -> FilePathGitMap;
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-03 15:14:54 +0000