summaryrefslogtreecommitdiff
path: root/src/buildtool/serve_api/serve_service/source_tree.cpp
diff options
context:
space:
mode:
authorPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2023-10-09 15:30:31 +0200
committerPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2023-11-02 12:06:50 +0100
commit47eeba4a4a7302662f4c39ebcc8e15a7876f8227 (patch)
tree03a261af2d0ca532607c1e949a344799bee1d02a /src/buildtool/serve_api/serve_service/source_tree.cpp
parentc1a58d73d2fa21f9c692bbe3895443d3afc43d1d (diff)
downloadjustbuild-47eeba4a4a7302662f4c39ebcc8e15a7876f8227.tar.gz
just serve: Fix inconsistencies
- add missing serve_api TARGETS file - rename service client to align with server naming scheme - fix inconsistencies in comments between implementation and protocol
Diffstat (limited to 'src/buildtool/serve_api/serve_service/source_tree.cpp')
-rw-r--r--src/buildtool/serve_api/serve_service/source_tree.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp
index cb3f6220..c8315325 100644
--- a/src/buildtool/serve_api/serve_service/source_tree.cpp
+++ b/src/buildtool/serve_api/serve_service/source_tree.cpp
@@ -24,7 +24,7 @@
#include "src/buildtool/serve_api/remote/config.hpp"
#include "src/buildtool/storage/config.hpp"
-auto SourceTreeService::GetTreeFromCommit(
+auto SourceTreeService::GetSubtreeFromCommit(
std::filesystem::path const& repo_path,
std::string const& commit,
std::string const& subdir,
@@ -36,8 +36,8 @@ auto SourceTreeService::GetTreeFromCommit(
[logger, repo_path, commit](auto const& msg, bool fatal) {
if (fatal) {
auto err = fmt::format(
- "ServeCommitTree: While retrieving tree of commit "
- "{} from repository {}:\n{}",
+ "ServeCommitTree: While retrieving subtree of "
+ "commit {} from repository {}:\n{}",
commit,
repo_path.string(),
msg);
@@ -63,7 +63,7 @@ auto SourceTreeService::ServeCommitTree(
auto const& commit{request->commit()};
auto const& subdir{request->subdir()};
// try in local build root Git cache
- if (auto tree_id = GetTreeFromCommit(
+ if (auto tree_id = GetSubtreeFromCommit(
StorageConfig::GitRoot(), commit, subdir, logger_)) {
if (request->sync_tree()) {
// sync tree with remote CAS
@@ -95,8 +95,8 @@ auto SourceTreeService::ServeCommitTree(
}
// try given extra repositories, in order
for (auto const& path : RemoteServeConfig::KnownRepositories()) {
- if (auto tree_id = GetTreeFromCommit(path, commit, subdir, logger_)) {
-
+ if (auto tree_id =
+ GetSubtreeFromCommit(path, commit, subdir, logger_)) {
if (request->sync_tree()) {
// sync tree with remote CAS
auto digest = ArtifactDigest{*tree_id, 0, /*is_tree=*/true};