recursive repository, works

Author: takev

CMakeLists.txt

@@ -54,7 +54,6 @@ add_library(hk_objects OBJECT
     "${CMAKE_CURRENT_SOURCE_DIR}/src/error/error_list.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/error/error_location.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/error/errors.hpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/error/make_error.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/parser/consume.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/parser/parse_fqname.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/parser/parse_import_declaration.cpp"
@@ -100,18 +99,22 @@ add_library(hk_objects OBJECT
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/file.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/file.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/fixed_fifo.hpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/fixed_string.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/fqname.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/generator.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/git_error.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/git_error.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/git.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/git.hpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/interned.hpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/lazy_vector.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/log.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/log.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/module.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/module.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/path.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/path.hpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/repository_flags.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/repository_url.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/repository_url.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/utility/semantic_version.cpp"

src/error/errors.hpp

@@ -20,7 +20,7 @@ E(missing_import_mod_declaration_as_name, "E0011: Expected a name after 'as' key
 E(missing_import_mod_declaration_name, "E0012: Expected fully qualified name after 'import' keyword in a import-declaration.");
 E(missing_import_declaration_semicolon, "E0013: Expected ';' after a import-declaration.");
 E(missing_fqname_identifier_after_dot, "E0014: Expected identifier after '.' in fully qualified name.");
-E(could_not_clone_repository, "E0015: Could not clone repository '{}' rev '{}': {}.");
+E(could_not_clone_repository, "E0015: Could not clone repository '{}' rev '{}' into '{}': {}.");
 }
 
 namespace hk::warning {

src/repository/repository.cpp

@@ -81,7 +81,14 @@ error_code repository::recursive_scan_prologues(repository_flags flags)
         todo.insert(std::move(item));
     }
 
-    auto hkdeps = _path / "_hkdeps";
+    auto hkdeps_path = _path / "_hkdeps";
+
+    auto ec = std::error_code{};
+    if (not std::filesystem::create_directory(hkdeps_path, ec) and ec) {
+        std::println(stderr, "Error: could not create directory '{}': {}.", hkdeps_path.string(), ec.message());
+        std::terminate();
+    }
+
     while (not todo.empty()) {
         auto child_repo_url_node = todo.extract(todo.begin());
         auto [it, inserted, _] = done.insert(std::move(child_repo_url_node));
@@ -90,11 +97,12 @@ error_code repository::recursive_scan_prologues(repository_flags flags)
         }
 
         assert(it != done.end());
-        auto child_repo_path = hkdeps / it->first.directory();
+        auto child_repo_path = hkdeps_path / it->first.directory();
         auto &child_repo = get_child_repository(it->first);
         if (not child_repo.repository) {
             if (auto r = git_checkout_or_clone(it->first, child_repo_path, flags); r != git_error::ok) {
-                return xxxxxxxxxxxxxxx needs destination directory in message it->second.add(error::could_not_clone_repository, it->first.url(), it->first.rev(), r).error();
+                auto short_hkdeps = std::format("_hkdeps/{}", it->first.directory());
+                return it->second.add(error::could_not_clone_repository, it->first.url(), it->first.rev(), short_hkdeps, r).error();
             }
 
             child_repo.repository = std::make_unique<repository>(child_repo_path);
@@ -105,9 +113,12 @@ error_code repository::recursive_scan_prologues(repository_flags flags)
         }
     }
 
-    // Remove internal repositories not in done.
+    // Remove internal repositories not in 'done'.
+    std::erase_if(_child_repositories, [&](auto const& item) {
+        return not done.contains(item.url);
+    });
 
-    return error_code{};
+    return hk::error_code{};
 }
 
 void repository::untouch(bool remove)

src/repository/repository_tests.cpp

@@ -2,14 +2,15 @@
 #include "utility/unit_test.hpp"
 #include <hikotest/hikotest.hpp>
 #include <ranges>
+#include <filesystem>
 
 TEST_SUITE(repository_suite) 
 {
 
 TEST_CASE(single_repository_scan) 
 {
     auto test_data_path = hk::test_data_path();
-    auto repository_path = std::filesystem::canonical(test_data_path / "prologue_scan" / "root");
+    auto repository_path = std::filesystem::canonical(test_data_path / "single_repository_scan");
     auto repository = hk::repository{repository_path};
     repository.scan_prologues(hk::repository_flags{});
 
@@ -19,5 +20,16 @@ TEST_CASE(single_repository_scan)
     REQUIRE(urls[0].first.rev() == "main");
 }
 
+TEST_CASE(recursive_repository_scan) 
+{
+    auto test_data_path = hk::test_data_path();
+    auto repository_path = std::filesystem::canonical(test_data_path / "recursive_repository_scan");
+    auto repository = hk::repository{repository_path};
+
+    std::filesystem::remove_all(repository_path / "_hkdeps");
+    auto error = repository.recursive_scan_prologues(hk::repository_flags{});
+    REQUIRE(error.kind == '\0');
+    REQUIRE(error.code == 0);
+}
 
 };

test_data/prologue_scan/root/main.hkm

@@ -0,0 +1,5 @@
+
+module nl.hikolang.recursive_repository_scan.main application "psmain"
+
+import git "https://github.com/hikogui/hikolang-test-a.git" "main"
+

test_data/recursive_repository_scan/main.hkm

@@ -0,0 +1,5 @@
+
+module nl.hikolang.single_repository_scan.main application "psmain"
+
+import git "https://github.com/hikogui/hikolang-test-a.git" "main"
+