summaryrefslogtreecommitdiff
path: root/src/buildtool/file_system
diff options
context:
space:
mode:
Diffstat (limited to 'src/buildtool/file_system')
-rw-r--r--src/buildtool/file_system/TARGETS29
-rw-r--r--src/buildtool/file_system/file_root.hpp2
-rw-r--r--src/buildtool/file_system/file_storage.hpp4
-rw-r--r--src/buildtool/file_system/file_system_manager.hpp1
-rw-r--r--src/buildtool/file_system/git_cas.cpp1
-rw-r--r--src/buildtool/file_system/git_context.cpp1
-rw-r--r--src/buildtool/file_system/git_repo.cpp1
-rw-r--r--src/buildtool/file_system/git_tree.cpp1
-rw-r--r--src/buildtool/file_system/git_utils.cpp1
-rw-r--r--src/buildtool/file_system/jsonfs.hpp2
-rw-r--r--src/buildtool/file_system/object_cas.hpp2
11 files changed, 39 insertions, 6 deletions
diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS
index 4c56cad3..b8b86d29 100644
--- a/src/buildtool/file_system/TARGETS
+++ b/src/buildtool/file_system/TARGETS
@@ -10,8 +10,11 @@
, "name": ["file_storage"]
, "hdrs": ["file_storage.hpp"]
, "deps":
- [ ["src/buildtool/execution_api/common", "common"]
+ [ "object_type"
+ , ["src/buildtool/execution_api/common", "common"]
, ["src/buildtool/file_system", "file_system_manager"]
+ , ["src/buildtool/logging", "log_level"]
+ , ["src/buildtool/logging", "logging"]
]
, "stage": ["src", "buildtool", "file_system"]
}
@@ -23,10 +26,10 @@
[ "file_storage"
, ["src/buildtool/file_system", "file_system_manager"]
, ["src/buildtool/common", "common"]
+ , ["src/buildtool/logging", "log_level"]
, ["src/buildtool/logging", "logging"]
]
, "stage": ["src", "buildtool", "file_system"]
- , "private-deps": [["src/buildtool/execution_api/common", "common"]]
}
, "file_system_manager":
{ "type": ["@", "rules", "CC", "library"]
@@ -34,6 +37,7 @@
, "hdrs": ["file_system_manager.hpp"]
, "deps":
[ "object_type"
+ , ["src/buildtool/logging", "log_level"]
, ["src/buildtool/logging", "logging"]
, ["src/buildtool/system", "system"]
, ["src/utils/cpp", "path"]
@@ -45,7 +49,13 @@
{ "type": ["@", "rules", "CC", "library"]
, "name": ["jsonfs"]
, "hdrs": ["jsonfs.hpp"]
- , "deps": ["object_type", "file_system_manager", ["src/utils/cpp", "json"]]
+ , "deps":
+ [ "object_type"
+ , "file_system_manager"
+ , ["src/buildtool/logging", "log_level"]
+ , ["src/buildtool/logging", "logging"]
+ , ["src/utils/cpp", "json"]
+ ]
, "stage": ["src", "buildtool", "file_system"]
}
, "git_cas":
@@ -56,7 +66,8 @@
, "deps": ["git_context", "git_utils", ["@", "gsl", "", "gsl"]]
, "stage": ["src", "buildtool", "file_system"]
, "private-deps":
- [ ["src/buildtool/logging", "logging"]
+ [ ["src/buildtool/logging", "log_level"]
+ , ["src/buildtool/logging", "logging"]
, ["src/utils/cpp", "hex_string"]
, ["src/utils/cpp", "path"]
, ["", "libgit2"]
@@ -78,6 +89,7 @@
, "private-deps":
[ ["", "libgit2"]
, "file_system_manager"
+ , ["src/buildtool/logging", "log_level"]
, ["src/buildtool/logging", "logging"]
, ["src/utils/cpp", "path"]
, ["src/buildtool/common", "common"]
@@ -90,7 +102,8 @@
, "srcs": ["git_context.cpp"]
, "stage": ["src", "buildtool", "file_system"]
, "private-deps":
- [ ["src/buildtool/logging", "logging"]
+ [ ["src/buildtool/logging", "log_level"]
+ , ["src/buildtool/logging", "logging"]
, ["", "libgit2"]
, ["src/utils/cpp", "gsl"]
]
@@ -103,7 +116,8 @@
, "deps": ["git_cas", ["src/buildtool/common", "bazel_types"]]
, "stage": ["src", "buildtool", "file_system"]
, "private-deps":
- [ ["src/buildtool/logging", "logging"]
+ [ ["src/buildtool/logging", "log_level"]
+ , ["src/buildtool/logging", "logging"]
, ["", "libgit2"]
, ["src/utils/cpp", "path"]
, ["src/utils/cpp", "hex_string"]
@@ -124,6 +138,7 @@
, "private-deps":
[ ["", "libgit2"]
, ["@", "fmt", "", "fmt"]
+ , ["src/buildtool/logging", "log_level"]
, ["src/buildtool/logging", "logging"]
, ["src/utils/cpp", "hex_string"]
]
@@ -137,6 +152,8 @@
, "file_system_manager"
, ["src/buildtool/common", "artifact_description"]
, ["src/buildtool/compatibility", "compatibility"]
+ , ["src/buildtool/logging", "log_level"]
+ , ["src/buildtool/logging", "logging"]
, ["@", "gsl", "", "gsl"]
, ["@", "json", "", "json"]
, ["src/utils/cpp", "concepts"]
diff --git a/src/buildtool/file_system/file_root.hpp b/src/buildtool/file_system/file_root.hpp
index 950cd36b..0f2a3d79 100644
--- a/src/buildtool/file_system/file_root.hpp
+++ b/src/buildtool/file_system/file_root.hpp
@@ -30,6 +30,8 @@
#include "src/buildtool/compatibility/compatibility.hpp"
#include "src/buildtool/file_system/file_system_manager.hpp"
#include "src/buildtool/file_system/git_tree.hpp"
+#include "src/buildtool/logging/log_level.hpp"
+#include "src/buildtool/logging/logger.hpp"
#include "src/utils/cpp/concepts.hpp"
/// FilteredIterator is an helper class to allow for iteration over
diff --git a/src/buildtool/file_system/file_storage.hpp b/src/buildtool/file_system/file_storage.hpp
index 488274a5..6006a410 100644
--- a/src/buildtool/file_system/file_storage.hpp
+++ b/src/buildtool/file_system/file_storage.hpp
@@ -17,9 +17,13 @@
#include <filesystem>
#include <string>
+#include <utility>
#include "src/buildtool/execution_api/common/execution_common.hpp"
#include "src/buildtool/file_system/file_system_manager.hpp"
+#include "src/buildtool/file_system/object_type.hpp"
+#include "src/buildtool/logging/log_level.hpp"
+#include "src/buildtool/logging/logger.hpp"
enum class StoreMode {
// First thread to write conflicting file wins.
diff --git a/src/buildtool/file_system/file_system_manager.hpp b/src/buildtool/file_system/file_system_manager.hpp
index 71b319d1..9bbd2264 100644
--- a/src/buildtool/file_system/file_system_manager.hpp
+++ b/src/buildtool/file_system/file_system_manager.hpp
@@ -36,6 +36,7 @@
#include "gsl/gsl"
#include "src/buildtool/file_system/object_type.hpp"
+#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
#include "src/buildtool/system/system.hpp"
#include "src/utils/cpp/path.hpp"
diff --git a/src/buildtool/file_system/git_cas.cpp b/src/buildtool/file_system/git_cas.cpp
index 898c7508..32426e88 100644
--- a/src/buildtool/file_system/git_cas.cpp
+++ b/src/buildtool/file_system/git_cas.cpp
@@ -19,6 +19,7 @@
#include <sstream>
#include "gsl/gsl"
+#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
#include "src/utils/cpp/hex_string.hpp"
#include "src/utils/cpp/path.hpp"
diff --git a/src/buildtool/file_system/git_context.cpp b/src/buildtool/file_system/git_context.cpp
index 084e9d58..94fb3cef 100644
--- a/src/buildtool/file_system/git_context.cpp
+++ b/src/buildtool/file_system/git_context.cpp
@@ -14,6 +14,7 @@
#include "src/buildtool/file_system/git_context.hpp"
+#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
#include "src/utils/cpp/gsl.hpp"
diff --git a/src/buildtool/file_system/git_repo.cpp b/src/buildtool/file_system/git_repo.cpp
index eceb5a1d..4799bcbf 100644
--- a/src/buildtool/file_system/git_repo.cpp
+++ b/src/buildtool/file_system/git_repo.cpp
@@ -19,6 +19,7 @@
#include "src/buildtool/common/artifact_digest.hpp"
#include "src/buildtool/file_system/file_system_manager.hpp"
+#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
#include "src/buildtool/storage/config.hpp"
#include "src/utils/cpp/gsl.hpp"
diff --git a/src/buildtool/file_system/git_tree.cpp b/src/buildtool/file_system/git_tree.cpp
index a3c441d9..a5a3262d 100644
--- a/src/buildtool/file_system/git_tree.cpp
+++ b/src/buildtool/file_system/git_tree.cpp
@@ -17,6 +17,7 @@
#include <sstream>
#include "src/buildtool/common/artifact_digest.hpp"
+#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
#include "src/utils/cpp/path.hpp"
diff --git a/src/buildtool/file_system/git_utils.cpp b/src/buildtool/file_system/git_utils.cpp
index a3b503ab..55d1ca38 100644
--- a/src/buildtool/file_system/git_utils.cpp
+++ b/src/buildtool/file_system/git_utils.cpp
@@ -15,6 +15,7 @@
#include "src/buildtool/file_system/git_utils.hpp"
#include "fmt/core.h"
+#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
#include "src/utils/cpp/hex_string.hpp"
diff --git a/src/buildtool/file_system/jsonfs.hpp b/src/buildtool/file_system/jsonfs.hpp
index 550efab4..952d2f32 100644
--- a/src/buildtool/file_system/jsonfs.hpp
+++ b/src/buildtool/file_system/jsonfs.hpp
@@ -22,6 +22,8 @@
#include "src/buildtool/file_system/file_system_manager.hpp"
#include "src/buildtool/file_system/object_type.hpp"
+#include "src/buildtool/logging/log_level.hpp"
+#include "src/buildtool/logging/logger.hpp"
#include "src/utils/cpp/json.hpp"
class Json {
diff --git a/src/buildtool/file_system/object_cas.hpp b/src/buildtool/file_system/object_cas.hpp
index e7cd7f1b..c4377a5c 100644
--- a/src/buildtool/file_system/object_cas.hpp
+++ b/src/buildtool/file_system/object_cas.hpp
@@ -20,8 +20,10 @@
#include <thread>
#include "src/buildtool/common/artifact.hpp"
+#include "src/buildtool/common/bazel_types.hpp"
#include "src/buildtool/file_system/file_storage.hpp"
#include "src/buildtool/file_system/file_system_manager.hpp"
+#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
/// \brief CAS for storing objects as plain blobs.