summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/other_tools/git_operations/TARGETS9
-rw-r--r--src/other_tools/git_operations/git_config_settings.cpp4
-rw-r--r--src/other_tools/git_operations/git_operations.cpp7
-rw-r--r--src/other_tools/git_operations/git_repo_remote.cpp7
-rw-r--r--src/other_tools/git_operations/git_repo_remote.hpp2
5 files changed, 24 insertions, 5 deletions
diff --git a/src/other_tools/git_operations/TARGETS b/src/other_tools/git_operations/TARGETS
index f4e8611f..7605c94e 100644
--- a/src/other_tools/git_operations/TARGETS
+++ b/src/other_tools/git_operations/TARGETS
@@ -18,7 +18,6 @@
[ "git_repo_remote"
, ["@", "fmt", "", "fmt"]
, ["src/buildtool/file_system", "file_system_manager"]
- , ["src/buildtool/logging", "logging"]
]
}
, "git_repo_remote":
@@ -27,7 +26,9 @@
, "hdrs": ["git_repo_remote.hpp"]
, "srcs": ["git_repo_remote.cpp"]
, "deps":
- [ ["src/buildtool/file_system", "git_repo"]
+ [ ["src/buildtool/file_system", "git_cas"]
+ , ["src/buildtool/file_system", "git_repo"]
+ , ["src/buildtool/file_system", "git_utils"]
, ["src/buildtool/storage", "config"]
]
, "stage": ["src", "other_tools", "git_operations"]
@@ -36,10 +37,11 @@
, ["@", "fmt", "", "fmt"]
, ["@", "json", "", "json"]
, ["", "libgit2"]
- , ["src/buildtool/file_system", "git_utils"]
+ , ["src/buildtool/file_system", "file_system_manager"]
, ["src/buildtool/logging", "log_level"]
, ["src/buildtool/logging", "logging"]
, ["src/buildtool/system", "system_command"]
+ , ["src/utils/cpp", "tmp_dir"]
]
}
, "git_config_settings":
@@ -50,6 +52,7 @@
, "stage": ["src", "other_tools", "git_operations"]
, "private-deps":
[ ["@", "fmt", "", "fmt"]
+ , ["@", "gsl", "", "gsl"]
, ["", "libgit2"]
, ["src/other_tools/utils", "curl_url_handle"]
]
diff --git a/src/other_tools/git_operations/git_config_settings.cpp b/src/other_tools/git_operations/git_config_settings.cpp
index 816e51a7..480e9a86 100644
--- a/src/other_tools/git_operations/git_config_settings.cpp
+++ b/src/other_tools/git_operations/git_config_settings.cpp
@@ -14,9 +14,13 @@
#include "src/other_tools/git_operations/git_config_settings.hpp"
+#include <cstdlib>
+#include <exception>
#include <map>
+#include <utility>
#include "fmt/core.h"
+#include "gsl/gsl"
#include "src/other_tools/utils/curl_url_handle.hpp"
extern "C" {
diff --git a/src/other_tools/git_operations/git_operations.cpp b/src/other_tools/git_operations/git_operations.cpp
index be6d9ce1..e21e55d4 100644
--- a/src/other_tools/git_operations/git_operations.cpp
+++ b/src/other_tools/git_operations/git_operations.cpp
@@ -14,12 +14,15 @@
#include "src/other_tools/git_operations/git_operations.hpp"
+#include <filesystem>
+#include <functional>
#include <memory>
-#include <vector>
+#include <optional>
+#include <string>
+#include <utility>
#include "fmt/core.h"
#include "src/buildtool/file_system/file_system_manager.hpp"
-#include "src/buildtool/logging/logger.hpp"
#include "src/other_tools/git_operations/git_repo_remote.hpp"
auto CriticalGitOps::GitInitialCommit(GitOpParams const& crit_op_params,
diff --git a/src/other_tools/git_operations/git_repo_remote.cpp b/src/other_tools/git_operations/git_repo_remote.cpp
index b9b9cc93..ffbb0222 100644
--- a/src/other_tools/git_operations/git_repo_remote.cpp
+++ b/src/other_tools/git_operations/git_repo_remote.cpp
@@ -15,15 +15,22 @@
#include "src/other_tools/git_operations/git_repo_remote.hpp"
#include <cstddef>
+#include <cstdlib>
+#include <exception>
+#include <functional>
+#include <limits>
+#include <map>
#include <utility> // std::move
#include "fmt/core.h"
#include "nlohmann/json.hpp"
+#include "src/buildtool/file_system/file_system_manager.hpp"
#include "src/buildtool/file_system/git_utils.hpp"
#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
#include "src/buildtool/system/system_command.hpp"
#include "src/other_tools/git_operations/git_config_settings.hpp"
+#include "src/utils/cpp/tmp_dir.hpp"
extern "C" {
#include <git2.h>
diff --git a/src/other_tools/git_operations/git_repo_remote.hpp b/src/other_tools/git_operations/git_repo_remote.hpp
index 53987e58..ce28e4a4 100644
--- a/src/other_tools/git_operations/git_repo_remote.hpp
+++ b/src/other_tools/git_operations/git_repo_remote.hpp
@@ -21,7 +21,9 @@
#include <string>
#include <vector>
+#include "src/buildtool/file_system/git_cas.hpp"
#include "src/buildtool/file_system/git_repo.hpp"
+#include "src/buildtool/file_system/git_utils.hpp"
#include "src/buildtool/storage/config.hpp"
extern "C" {