From cae2ec50abedb135bbeab2aae95fecebcfe977b3 Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Mon, 4 Mar 2024 14:06:54 +0100
Subject: serve protocol: support executable distfiles

As serve and just-mr share their caching of description-tree
association, we also have to change this cache. Thanks to json
encoding before hashing, we know that the old and new hash keys
do not overlap, so the change is save. As distdirs also keep the
respective files in the git root, no new downlaoding will happen
either, hence no warning in the CHANGELOG is needed.
---
 src/buildtool/serve_api/serve_service/source_tree.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/buildtool/serve_api/serve_service/source_tree.hpp')

diff --git a/src/buildtool/serve_api/serve_service/source_tree.hpp b/src/buildtool/serve_api/serve_service/source_tree.hpp
index bd89bf78..ce53d750 100644
--- a/src/buildtool/serve_api/serve_service/source_tree.hpp
+++ b/src/buildtool/serve_api/serve_service/source_tree.hpp
@@ -20,6 +20,7 @@
 #include <mutex>
 #include <optional>
 #include <string>
+#include <utility>
 #include <variant>
 #include <vector>
 
@@ -207,7 +208,8 @@ class SourceTreeService final
     [[nodiscard]] auto DistdirImportToGit(
         std::string const& tree_id,
         std::string const& content_id,
-        std::unordered_map<std::string, std::string> const& content_list,
+        std::unordered_map<std::string, std::pair<std::string, bool>> const&
+            content_list,
         bool sync_tree,
         ServeDistdirTreeResponse* response) -> ::grpc::Status;
 };
-- 
cgit v1.2.3