diff options
18 files changed, 148 insertions, 42 deletions
diff --git a/src/other_tools/repo_map/TARGETS b/src/other_tools/repo_map/TARGETS index d7d2e2af..264b4dcb 100644 --- a/src/other_tools/repo_map/TARGETS +++ b/src/other_tools/repo_map/TARGETS @@ -5,7 +5,9 @@ , "srcs": ["repos_to_setup_map.cpp"] , "deps": [ ["@", "gsl", "", "gsl"] + , ["@", "json", "", "json"] , ["src/buildtool/build_engine/expression", "expression"] + , ["src/buildtool/multithreading", "async_map_consumer"] , ["src/other_tools/just_mr/progress_reporting", "statistics"] , ["src/other_tools/root_maps", "commit_git_map"] , ["src/other_tools/root_maps", "content_git_map"] @@ -17,17 +19,19 @@ , "stage": ["src", "other_tools", "repo_map"] , "private-deps": [ ["@", "fmt", "", "fmt"] + , ["src/buildtool/build_engine/expression", "expression_ptr_interface"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/crypto", "hash_info"] , ["src/buildtool/file_system", "file_root"] , ["src/buildtool/file_system/symlinks_map", "pragma_special"] - , ["src/buildtool/logging", "log_level"] - , ["src/buildtool/logging", "logging"] , ["src/buildtool/multithreading", "task_system"] + , ["src/other_tools/just_mr", "utils"] , ["src/other_tools/ops_maps", "content_cas_map"] , ["src/other_tools/ops_maps", "git_tree_fetch_map"] , ["src/other_tools/utils", "parse_archive"] , ["src/other_tools/utils", "parse_git_tree"] + , ["src/utils/cpp", "expected"] + , ["src/utils/cpp", "path"] ] } } diff --git a/src/other_tools/repo_map/repos_to_setup_map.cpp b/src/other_tools/repo_map/repos_to_setup_map.cpp index 351c6215..8a714cb2 100644 --- a/src/other_tools/repo_map/repos_to_setup_map.cpp +++ b/src/other_tools/repo_map/repos_to_setup_map.cpp @@ -14,21 +14,27 @@ #include "src/other_tools/repo_map/repos_to_setup_map.hpp" +#include <filesystem> +#include <type_traits> #include <unordered_map> #include <utility> // std::move +#include <vector> #include "fmt/core.h" +#include "src/buildtool/build_engine/expression/expression.hpp" +#include "src/buildtool/build_engine/expression/expression_ptr.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/crypto/hash_info.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/symlinks_map/pragma_special.hpp" -#include "src/buildtool/logging/log_level.hpp" -#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/multithreading/task_system.hpp" +#include "src/other_tools/just_mr/utils.hpp" #include "src/other_tools/ops_maps/content_cas_map.hpp" #include "src/other_tools/ops_maps/git_tree_fetch_map.hpp" #include "src/other_tools/utils/parse_archive.hpp" #include "src/other_tools/utils/parse_git_tree.hpp" +#include "src/utils/cpp/expected.hpp" +#include "src/utils/cpp/path.hpp" namespace { diff --git a/src/other_tools/repo_map/repos_to_setup_map.hpp b/src/other_tools/repo_map/repos_to_setup_map.hpp index 0f7f6473..0eb02328 100644 --- a/src/other_tools/repo_map/repos_to_setup_map.hpp +++ b/src/other_tools/repo_map/repos_to_setup_map.hpp @@ -22,7 +22,9 @@ #include <string> #include "gsl/gsl" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/expression/configuration.hpp" +#include "src/buildtool/multithreading/async_map_consumer.hpp" #include "src/other_tools/just_mr/progress_reporting/statistics.hpp" #include "src/other_tools/root_maps/commit_git_map.hpp" #include "src/other_tools/root_maps/content_git_map.hpp" diff --git a/src/other_tools/root_maps/TARGETS b/src/other_tools/root_maps/TARGETS index 4ad51d2f..11f6b4e6 100644 --- a/src/other_tools/root_maps/TARGETS +++ b/src/other_tools/root_maps/TARGETS @@ -7,11 +7,14 @@ [ ["@", "gsl", "", "gsl"] , ["@", "json", "", "json"] , ["src/buildtool/execution_api/common", "common"] + , ["src/buildtool/multithreading", "async_map_consumer"] , ["src/buildtool/serve_api/remote", "serve_api"] , ["src/buildtool/storage", "config"] , ["src/buildtool/storage", "storage"] , ["src/other_tools/ops_maps", "content_cas_map"] + , ["src/other_tools/ops_maps", "critical_git_op_map"] , ["src/other_tools/ops_maps", "import_to_git_map"] + , ["src/utils/cpp", "hash_combine"] ] , "stage": ["src", "other_tools", "root_maps"] , "private-deps": @@ -21,14 +24,15 @@ , ["src/buildtool/common", "common"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/file_system", "file_root"] - , ["src/buildtool/file_system", "file_storage"] + , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/file_system", "git_repo"] + , ["src/buildtool/file_system", "git_types"] , ["src/buildtool/file_system", "object_type"] , ["src/buildtool/multithreading", "task_system"] , ["src/buildtool/storage", "fs_utils"] - , ["src/other_tools/just_mr/progress_reporting", "progress"] - , ["src/other_tools/just_mr/progress_reporting", "statistics"] - , ["src/other_tools/ops_maps", "critical_git_op_map"] + , ["src/other_tools/git_operations", "git_ops_types"] + , ["src/utils/cpp", "expected"] + , ["src/utils/cpp", "hex_string"] , ["src/utils/cpp", "tmp_dir"] ] } @@ -42,6 +46,7 @@ , ["@", "json", "", "json"] , ["src/buildtool/common", "user_structs"] , ["src/buildtool/execution_api/common", "common"] + , ["src/buildtool/multithreading", "async_map_consumer"] , ["src/buildtool/serve_api/remote", "serve_api"] , ["src/buildtool/storage", "config"] , ["src/buildtool/storage", "storage"] @@ -55,15 +60,21 @@ , "private-deps": [ "root_utils" , ["@", "fmt", "", "fmt"] - , ["src/buildtool/common", "artifact_digest_factory"] - , ["src/buildtool/crypto", "hash_function"] + , ["src/buildtool/common", "common"] , ["src/buildtool/file_system", "file_root"] , ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/file_system", "git_cas"] + , ["src/buildtool/file_system", "git_repo"] + , ["src/buildtool/file_system", "git_types"] + , ["src/buildtool/file_system", "object_type"] , ["src/buildtool/multithreading", "task_system"] + , ["src/buildtool/progress_reporting", "task_tracker"] , ["src/buildtool/storage", "fs_utils"] + , ["src/other_tools/git_operations", "git_ops_types"] , ["src/other_tools/git_operations", "git_repo_remote"] - , ["src/other_tools/utils", "curl_url_handle"] + , ["src/utils/cpp", "expected"] , ["src/utils/cpp", "path"] + , ["src/utils/cpp", "tmp_dir"] ] } , "fpath_git_map": @@ -77,10 +88,11 @@ , ["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"] , ["src/buildtool/serve_api/remote", "serve_api"] , ["src/buildtool/storage", "config"] , ["src/buildtool/storage", "storage"] - , ["src/other_tools/just_mr", "utils"] + , ["src/other_tools/ops_maps", "critical_git_op_map"] , ["src/other_tools/ops_maps", "import_to_git_map"] , ["src/utils/cpp", "hash_combine"] , ["src/utils/cpp", "path_hash"] @@ -89,11 +101,12 @@ , "private-deps": [ "root_utils" , ["@", "fmt", "", "fmt"] - , ["src/buildtool/execution_api/local", "config"] , ["src/buildtool/file_system", "file_root"] - , ["src/buildtool/file_system", "git_repo"] + , ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/file_system", "git_cas"] , ["src/buildtool/multithreading", "task_system"] , ["src/buildtool/storage", "fs_utils"] + , ["src/other_tools/git_operations", "git_ops_types"] , ["src/other_tools/git_operations", "git_repo_remote"] , ["src/utils/cpp", "tmp_dir"] ] @@ -109,27 +122,33 @@ , ["src/buildtool/common", "user_structs"] , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/file_system/symlinks_map", "resolve_symlinks_map"] + , ["src/buildtool/multithreading", "async_map_consumer"] , ["src/buildtool/serve_api/remote", "serve_api"] , ["src/buildtool/storage", "config"] , ["src/buildtool/storage", "storage"] , ["src/other_tools/just_mr", "mirrors"] , ["src/other_tools/just_mr/progress_reporting", "progress"] , ["src/other_tools/ops_maps", "content_cas_map"] + , ["src/other_tools/ops_maps", "critical_git_op_map"] , ["src/other_tools/ops_maps", "import_to_git_map"] ] , "stage": ["src", "other_tools", "root_maps"] , "private-deps": [ "root_utils" , ["@", "fmt", "", "fmt"] + , ["src/buildtool/common", "common"] , ["src/buildtool/crypto", "hash_info"] , ["src/buildtool/file_system", "file_root"] - , ["src/buildtool/file_system", "file_storage"] - , ["src/buildtool/file_system/symlinks_map", "pragma_special"] + , ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/file_system", "git_cas"] + , ["src/buildtool/file_system", "git_types"] , ["src/buildtool/multithreading", "task_system"] + , ["src/buildtool/progress_reporting", "task_tracker"] , ["src/buildtool/storage", "fs_utils"] + , ["src/other_tools/git_operations", "git_ops_types"] , ["src/other_tools/git_operations", "git_repo_remote"] - , ["src/other_tools/utils", "content"] , ["src/utils/archive", "archive_ops"] + , ["src/utils/cpp", "tmp_dir"] ] } , "foreign_file_git_map": @@ -140,6 +159,7 @@ , "deps": [ ["@", "gsl", "", "gsl"] , ["@", "json", "", "json"] + , ["src/buildtool/multithreading", "async_map_consumer"] , ["src/buildtool/serve_api/remote", "serve_api"] , ["src/buildtool/storage", "config"] , ["src/buildtool/storage", "storage"] @@ -149,11 +169,19 @@ , "private-deps": [ "root_utils" , ["@", "fmt", "", "fmt"] + , ["src/buildtool/common", "common"] , ["src/buildtool/crypto", "hash_info"] , ["src/buildtool/file_system", "file_root"] , ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/file_system", "git_cas"] + , ["src/buildtool/file_system", "git_repo"] + , ["src/buildtool/file_system", "git_types"] + , ["src/buildtool/file_system", "object_type"] , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/multithreading", "task_system"] , ["src/buildtool/storage", "fs_utils"] + , ["src/utils/cpp", "expected"] + , ["src/utils/cpp", "hex_string"] , ["src/utils/cpp", "tmp_dir"] ] , "stage": ["src", "other_tools", "root_maps"] @@ -167,6 +195,7 @@ [ ["@", "gsl", "", "gsl"] , ["@", "json", "", "json"] , ["src/buildtool/execution_api/common", "common"] + , ["src/buildtool/multithreading", "async_map_consumer"] , ["src/buildtool/serve_api/remote", "serve_api"] , ["src/buildtool/storage", "config"] , ["src/buildtool/storage", "storage"] @@ -181,10 +210,13 @@ , ["@", "fmt", "", "fmt"] , ["src/buildtool/common", "common"] , ["src/buildtool/common", "config"] - , ["src/buildtool/crypto", "hash_info"] , ["src/buildtool/execution_api/serve", "mr_git_api"] , ["src/buildtool/file_system", "file_root"] + , ["src/buildtool/file_system", "object_type"] + , ["src/buildtool/multithreading", "task_system"] + , ["src/other_tools/git_operations", "git_ops_types"] , ["src/other_tools/git_operations", "git_repo_remote"] + , ["src/utils/cpp", "tmp_dir"] ] } , "root_utils": @@ -210,6 +242,7 @@ , ["src/buildtool/execution_api/serve", "mr_git_api"] , ["src/buildtool/execution_api/serve", "utils"] , ["src/buildtool/file_system", "object_type"] + , ["src/utils/cpp", "expected"] ] } } diff --git a/src/other_tools/root_maps/commit_git_map.cpp b/src/other_tools/root_maps/commit_git_map.cpp index 8f96eb82..d877772e 100644 --- a/src/other_tools/root_maps/commit_git_map.cpp +++ b/src/other_tools/root_maps/commit_git_map.cpp @@ -14,21 +14,29 @@ #include "src/other_tools/root_maps/commit_git_map.hpp" -#include <algorithm> +#include <filesystem> +#include <memory> #include <optional> #include <string> #include "fmt/core.h" -#include "src/buildtool/common/artifact_digest_factory.hpp" -#include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/common/artifact.hpp" +#include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/file_system/git_cas.hpp" +#include "src/buildtool/file_system/git_repo.hpp" +#include "src/buildtool/file_system/git_types.hpp" +#include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/multithreading/task_system.hpp" +#include "src/buildtool/progress_reporting/task_tracker.hpp" #include "src/buildtool/storage/fs_utils.hpp" +#include "src/other_tools/git_operations/git_ops_types.hpp" #include "src/other_tools/git_operations/git_repo_remote.hpp" #include "src/other_tools/root_maps/root_utils.hpp" -#include "src/other_tools/utils/curl_url_handle.hpp" +#include "src/utils/cpp/expected.hpp" #include "src/utils/cpp/path.hpp" +#include "src/utils/cpp/tmp_dir.hpp" namespace { diff --git a/src/other_tools/root_maps/commit_git_map.hpp b/src/other_tools/root_maps/commit_git_map.hpp index fad04614..5298caf7 100644 --- a/src/other_tools/root_maps/commit_git_map.hpp +++ b/src/other_tools/root_maps/commit_git_map.hpp @@ -16,7 +16,7 @@ #define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_COMMIT_GIT_MAP_HPP #include <cstddef> -#include <optional> +#include <functional> #include <string> #include <utility> #include <vector> @@ -25,6 +25,7 @@ #include "nlohmann/json.hpp" #include "src/buildtool/common/user_structs.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" +#include "src/buildtool/multithreading/async_map_consumer.hpp" #include "src/buildtool/serve_api/remote/serve_api.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" diff --git a/src/other_tools/root_maps/content_git_map.cpp b/src/other_tools/root_maps/content_git_map.cpp index c68500ba..a6968f79 100644 --- a/src/other_tools/root_maps/content_git_map.cpp +++ b/src/other_tools/root_maps/content_git_map.cpp @@ -14,17 +14,28 @@ #include "src/other_tools/root_maps/content_git_map.hpp" +#include <filesystem> +#include <functional> +#include <memory> +#include <optional> +#include <string> +#include <vector> + #include "fmt/core.h" +#include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/crypto/hash_info.hpp" #include "src/buildtool/file_system/file_root.hpp" -#include "src/buildtool/file_system/file_storage.hpp" -#include "src/buildtool/file_system/symlinks_map/pragma_special.hpp" +#include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/file_system/git_cas.hpp" +#include "src/buildtool/file_system/git_types.hpp" #include "src/buildtool/multithreading/task_system.hpp" +#include "src/buildtool/progress_reporting/task_tracker.hpp" #include "src/buildtool/storage/fs_utils.hpp" +#include "src/other_tools/git_operations/git_ops_types.hpp" #include "src/other_tools/git_operations/git_repo_remote.hpp" #include "src/other_tools/root_maps/root_utils.hpp" -#include "src/other_tools/utils/content.hpp" #include "src/utils/archive/archive_ops.hpp" +#include "src/utils/cpp/tmp_dir.hpp" namespace { diff --git a/src/other_tools/root_maps/content_git_map.hpp b/src/other_tools/root_maps/content_git_map.hpp index 52e6929e..1aa342e9 100644 --- a/src/other_tools/root_maps/content_git_map.hpp +++ b/src/other_tools/root_maps/content_git_map.hpp @@ -16,7 +16,6 @@ #define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_CONTENT_GIT_MAP_HPP #include <cstddef> -#include <optional> #include <utility> #include "gsl/gsl" @@ -24,12 +23,14 @@ #include "src/buildtool/common/user_structs.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/file_system/symlinks_map/resolve_symlinks_map.hpp" +#include "src/buildtool/multithreading/async_map_consumer.hpp" #include "src/buildtool/serve_api/remote/serve_api.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" #include "src/other_tools/just_mr/mirrors.hpp" #include "src/other_tools/just_mr/progress_reporting/progress.hpp" #include "src/other_tools/ops_maps/content_cas_map.hpp" +#include "src/other_tools/ops_maps/critical_git_op_map.hpp" #include "src/other_tools/ops_maps/import_to_git_map.hpp" /// \brief Maps the content of an archive to the resulting Git tree WS root, diff --git a/src/other_tools/root_maps/distdir_git_map.cpp b/src/other_tools/root_maps/distdir_git_map.cpp index ef460949..aa95fa74 100644 --- a/src/other_tools/root_maps/distdir_git_map.cpp +++ b/src/other_tools/root_maps/distdir_git_map.cpp @@ -15,24 +15,25 @@ #include "src/other_tools/root_maps/distdir_git_map.hpp" #include <algorithm> +#include <filesystem> +#include <optional> #include "fmt/core.h" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" #include "src/buildtool/crypto/hash_function.hpp" -#include "src/buildtool/execution_api/common/execution_common.hpp" #include "src/buildtool/file_system/file_root.hpp" -#include "src/buildtool/file_system/file_storage.hpp" +#include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_repo.hpp" +#include "src/buildtool/file_system/git_types.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/multithreading/task_system.hpp" #include "src/buildtool/storage/fs_utils.hpp" -#include "src/other_tools/just_mr/progress_reporting/progress.hpp" -#include "src/other_tools/just_mr/progress_reporting/statistics.hpp" -#include "src/other_tools/ops_maps/content_cas_map.hpp" -#include "src/other_tools/ops_maps/critical_git_op_map.hpp" +#include "src/other_tools/git_operations/git_ops_types.hpp" #include "src/other_tools/root_maps/root_utils.hpp" +#include "src/utils/cpp/expected.hpp" +#include "src/utils/cpp/hex_string.hpp" #include "src/utils/cpp/tmp_dir.hpp" namespace { diff --git a/src/other_tools/root_maps/distdir_git_map.hpp b/src/other_tools/root_maps/distdir_git_map.hpp index 2dc678f8..39cb961b 100644 --- a/src/other_tools/root_maps/distdir_git_map.hpp +++ b/src/other_tools/root_maps/distdir_git_map.hpp @@ -16,20 +16,24 @@ #define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_DISTDIR_GIT_MAP_HPP #include <cstddef> +#include <functional> #include <memory> -#include <optional> #include <string> #include <unordered_map> #include <utility> +#include <vector> #include "gsl/gsl" #include "nlohmann/json.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" +#include "src/buildtool/multithreading/async_map_consumer.hpp" #include "src/buildtool/serve_api/remote/serve_api.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" #include "src/other_tools/ops_maps/content_cas_map.hpp" +#include "src/other_tools/ops_maps/critical_git_op_map.hpp" #include "src/other_tools/ops_maps/import_to_git_map.hpp" +#include "src/utils/cpp/hash_combine.hpp" struct DistdirInfo { std::string content_id; /* key */ diff --git a/src/other_tools/root_maps/foreign_file_git_map.cpp b/src/other_tools/root_maps/foreign_file_git_map.cpp index 25c77947..1a5d4b9d 100644 --- a/src/other_tools/root_maps/foreign_file_git_map.cpp +++ b/src/other_tools/root_maps/foreign_file_git_map.cpp @@ -14,13 +14,28 @@ #include "src/other_tools/root_maps/foreign_file_git_map.hpp" +#include <filesystem> +#include <functional> +#include <memory> +#include <optional> +#include <string> +#include <vector> + #include "fmt/core.h" +#include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/crypto/hash_info.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/file_system/git_cas.hpp" +#include "src/buildtool/file_system/git_repo.hpp" +#include "src/buildtool/file_system/git_types.hpp" +#include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/multithreading/task_system.hpp" #include "src/buildtool/storage/fs_utils.hpp" #include "src/other_tools/root_maps/root_utils.hpp" +#include "src/utils/cpp/expected.hpp" +#include "src/utils/cpp/hex_string.hpp" #include "src/utils/cpp/tmp_dir.hpp" namespace { diff --git a/src/other_tools/root_maps/foreign_file_git_map.hpp b/src/other_tools/root_maps/foreign_file_git_map.hpp index e2662c4c..8a73d623 100644 --- a/src/other_tools/root_maps/foreign_file_git_map.hpp +++ b/src/other_tools/root_maps/foreign_file_git_map.hpp @@ -16,11 +16,11 @@ #define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_FOREIGN_FILE_GIT_MAP_HPP #include <cstddef> -#include <optional> #include <utility> #include "gsl/gsl" #include "nlohmann/json.hpp" +#include "src/buildtool/multithreading/async_map_consumer.hpp" #include "src/buildtool/serve_api/remote/serve_api.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" diff --git a/src/other_tools/root_maps/fpath_git_map.cpp b/src/other_tools/root_maps/fpath_git_map.cpp index ca8bdd52..83065bb4 100644 --- a/src/other_tools/root_maps/fpath_git_map.cpp +++ b/src/other_tools/root_maps/fpath_git_map.cpp @@ -14,14 +14,17 @@ #include "src/other_tools/root_maps/fpath_git_map.hpp" +#include <memory> #include <utility> // std::move +#include <vector> #include "fmt/core.h" -#include "src/buildtool/execution_api/local/config.hpp" #include "src/buildtool/file_system/file_root.hpp" -#include "src/buildtool/file_system/git_repo.hpp" +#include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/file_system/git_cas.hpp" #include "src/buildtool/multithreading/task_system.hpp" #include "src/buildtool/storage/fs_utils.hpp" +#include "src/other_tools/git_operations/git_ops_types.hpp" #include "src/other_tools/git_operations/git_repo_remote.hpp" #include "src/other_tools/root_maps/root_utils.hpp" #include "src/utils/cpp/tmp_dir.hpp" diff --git a/src/other_tools/root_maps/fpath_git_map.hpp b/src/other_tools/root_maps/fpath_git_map.hpp index ad2f4c39..79df10ce 100644 --- a/src/other_tools/root_maps/fpath_git_map.hpp +++ b/src/other_tools/root_maps/fpath_git_map.hpp @@ -17,6 +17,7 @@ #include <cstddef> #include <filesystem> +#include <functional> #include <optional> #include <string> @@ -25,10 +26,11 @@ #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" #include "src/buildtool/serve_api/remote/serve_api.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" -#include "src/other_tools/just_mr/utils.hpp" +#include "src/other_tools/ops_maps/critical_git_op_map.hpp" #include "src/other_tools/ops_maps/import_to_git_map.hpp" #include "src/utils/cpp/hash_combine.hpp" #include "src/utils/cpp/path_hash.hpp" diff --git a/src/other_tools/root_maps/root_utils.cpp b/src/other_tools/root_maps/root_utils.cpp index 89e71653..85c0ee62 100644 --- a/src/other_tools/root_maps/root_utils.cpp +++ b/src/other_tools/root_maps/root_utils.cpp @@ -14,6 +14,10 @@ #include "src/other_tools/root_maps/root_utils.hpp" +#include <functional> +#include <memory> +#include <vector> + #include "fmt/core.h" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" @@ -23,6 +27,7 @@ #include "src/buildtool/execution_api/serve/mr_git_api.hpp" #include "src/buildtool/execution_api/serve/utils.hpp" #include "src/buildtool/file_system/object_type.hpp" +#include "src/utils/cpp/expected.hpp" auto CheckServeHasAbsentRoot(ServeApi const& serve, std::string const& tree_id, diff --git a/src/other_tools/root_maps/root_utils.hpp b/src/other_tools/root_maps/root_utils.hpp index 2d3ec6a7..17e1868d 100644 --- a/src/other_tools/root_maps/root_utils.hpp +++ b/src/other_tools/root_maps/root_utils.hpp @@ -15,6 +15,7 @@ #ifndef INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_ROOT_UTILS_HPP #define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_ROOT_UTILS_HPP +#include <filesystem> #include <optional> #include <string> diff --git a/src/other_tools/root_maps/tree_id_git_map.cpp b/src/other_tools/root_maps/tree_id_git_map.cpp index 50cd3de8..7f9d9bd3 100644 --- a/src/other_tools/root_maps/tree_id_git_map.cpp +++ b/src/other_tools/root_maps/tree_id_git_map.cpp @@ -14,14 +14,24 @@ #include "src/other_tools/root_maps/tree_id_git_map.hpp" +#include <filesystem> +#include <memory> +#include <optional> +#include <string> +#include <vector> + #include "fmt/core.h" +#include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/repository_config.hpp" -#include "src/buildtool/crypto/hash_info.hpp" #include "src/buildtool/execution_api/serve/mr_git_api.hpp" #include "src/buildtool/file_system/file_root.hpp" +#include "src/buildtool/file_system/object_type.hpp" +#include "src/buildtool/multithreading/task_system.hpp" +#include "src/other_tools/git_operations/git_ops_types.hpp" #include "src/other_tools/git_operations/git_repo_remote.hpp" #include "src/other_tools/root_maps/root_utils.hpp" +#include "src/utils/cpp/tmp_dir.hpp" namespace { diff --git a/src/other_tools/root_maps/tree_id_git_map.hpp b/src/other_tools/root_maps/tree_id_git_map.hpp index db7dfd68..9e6a6872 100644 --- a/src/other_tools/root_maps/tree_id_git_map.hpp +++ b/src/other_tools/root_maps/tree_id_git_map.hpp @@ -16,14 +16,13 @@ #define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_TREE_ID_GIT_MAP_HPP #include <cstddef> -#include <optional> -#include <string> +#include <functional> #include <utility> -#include <vector> #include "gsl/gsl" #include "nlohmann/json.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" +#include "src/buildtool/multithreading/async_map_consumer.hpp" #include "src/buildtool/serve_api/remote/serve_api.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" |