maint: Move solver::libsolv::repo_info to solver::repo_info

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
mamba-org · Aug 1, 2024 · 0b09415 · 0b09415
1 parent bc89383
commit 0b09415
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 26 deletions.
diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt
@@ -183,12 +183,12 @@ set(
     # Solver generic interface
     ${LIBMAMBA_SOURCE_DIR}/solver/helpers.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/problems_graph.cpp
+    ${LIBMAMBA_SOURCE_DIR}/solver/repo_info.cpp
     # Solver libsolv implementation
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/database.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/helpers.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/matcher.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/parameters.cpp
-    ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/repo_info.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/solver.cpp
     ${LIBMAMBA_SOURCE_DIR}/solver/libsolv/unsolvable.cpp
     # Artifacts validation
@@ -323,12 +323,12 @@ set(
     ${LIBMAMBA_INCLUDE_DIR}/mamba/specs/version_spec.hpp
     # Solver generic interface
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/problems_graph.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/repo_info.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/request.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/solution.hpp
     # Solver libsolv implementation
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/database.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/parameters.hpp
-    ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/repo_info.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/solver.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/solver/libsolv/unsolvable.hpp
     # Artifacts validation

diff --git a/libmamba/include/mamba/core/package_database_loader.hpp b/libmamba/include/mamba/core/package_database_loader.hpp
@@ -8,7 +8,7 @@
 #define MAMBA_CORE_PACKAGE_DATABASE_LOADER_HPP
 
 #include "mamba/core/error_handling.hpp"
-#include "mamba/solver/libsolv/repo_info.hpp"
+#include "mamba/solver/repo_info.hpp"
 #include "mamba/specs/channel.hpp"
 
 namespace mamba
@@ -28,12 +28,12 @@ namespace mamba
         const Context& ctx,
         solver::libsolv::Database& db,
         const SubdirData& subdir
-    ) -> expected_t<solver::libsolv::RepoInfo>;
+    ) -> expected_t<solver::RepoInfo>;
 
     auto load_installed_packages_in_database(
         const Context& ctx,
         solver::libsolv::Database& db,
         const PrefixData& prefix
-    ) -> solver::libsolv::RepoInfo;
+    ) -> solver::RepoInfo;
 }
 #endif
diff --git a/libmamba/include/mamba/solver/libsolv/database.hpp b/libmamba/include/mamba/solver/libsolv/database.hpp
@@ -14,7 +14,7 @@
 
 #include "mamba/core/error_handling.hpp"
 #include "mamba/solver/libsolv/parameters.hpp"
-#include "mamba/solver/libsolv/repo_info.hpp"
+#include "mamba/solver/repo_info.hpp"
 #include "mamba/specs/channel.hpp"
 #include "mamba/specs/package_info.hpp"
 #include "mamba/util/loop_control.hpp"

diff --git a/...nclude/mamba/solver/libsolv/repo_info.hpp → libmamba/include/mamba/solver/repo_info.hpp b/...nclude/mamba/solver/libsolv/repo_info.hpp → libmamba/include/mamba/solver/repo_info.hpp
@@ -17,9 +17,12 @@ extern "C"
     using Repo = struct s_Repo;
 }
 
-namespace mamba::solver::libsolv
+namespace mamba::solver
 {
-    class Database;
+    namespace libsolv
+    {
+        class Database;
+    }
 
     /**
      * A libsolv repository descriptor.
@@ -50,15 +53,15 @@ namespace mamba::solver::libsolv
 
         [[nodiscard]] auto package_count() const -> std::size_t;
 
-        [[nodiscard]] auto priority() const -> Priorities;
+        [[nodiscard]] auto priority() const -> libsolv::Priorities;
 
     private:
 
         ::Repo* m_ptr = nullptr;  // This is a view managed by libsolv pool
 
         explicit RepoInfo(::Repo* repo);
 
-        friend class Database;
+        friend class mamba::solver::libsolv::Database;
         friend auto operator==(RepoInfo lhs, RepoInfo rhs) -> bool;
     };
 

diff --git a/libmamba/src/api/channel_loader.cpp b/libmamba/src/api/channel_loader.cpp
@@ -12,7 +12,7 @@
 #include "mamba/core/prefix_data.hpp"
 #include "mamba/core/subdirdata.hpp"
 #include "mamba/solver/libsolv/database.hpp"
-#include "mamba/solver/libsolv/repo_info.hpp"
+#include "mamba/solver/repo_info.hpp"
 #include "mamba/specs/package_info.hpp"
 
 namespace mamba
@@ -24,7 +24,7 @@ namespace mamba
             ChannelContext& channel_context,
             solver::libsolv::Database& pool,
             const fs::u8path& pkgs_dir
-        ) -> solver::libsolv::RepoInfo
+        ) -> solver::RepoInfo
         {
             if (!fs::exists(pkgs_dir))
             {
@@ -235,7 +235,7 @@ namespace mamba
                 }
 
                 load_subdir_in_database(ctx, pool, subdir)
-                    .transform([&](solver::libsolv::RepoInfo&& repo)
+                    .transform([&](solver::RepoInfo&& repo)
                                { pool.set_repo_priority(repo, priorities[i]); })
                     .or_else(
                         [&](const auto&)

diff --git a/libmamba/src/api/remove.cpp b/libmamba/src/api/remove.cpp
@@ -12,8 +12,8 @@
 #include "mamba/core/package_database_loader.hpp"
 #include "mamba/core/prefix_data.hpp"
 #include "mamba/core/transaction.hpp"
-#include "mamba/solver/libsolv/repo_info.hpp"
 #include "mamba/solver/libsolv/solver.hpp"
+#include "mamba/solver/repo_info.hpp"
 #include "mamba/solver/request.hpp"
 
 namespace mamba

diff --git a/libmamba/src/api/repoquery.cpp b/libmamba/src/api/repoquery.cpp
@@ -14,7 +14,7 @@
 #include "mamba/core/package_database_loader.hpp"
 #include "mamba/core/prefix_data.hpp"
 #include "mamba/solver/libsolv/database.hpp"
-#include "mamba/solver/libsolv/repo_info.hpp"
+#include "mamba/solver/repo_info.hpp"
 #include "mamba/util/string.hpp"
 
 namespace mamba

diff --git a/libmamba/src/core/package_database_loader.cpp b/libmamba/src/core/package_database_loader.cpp
@@ -20,7 +20,7 @@
 #include "mamba/core/subdirdata.hpp"
 #include "mamba/core/virtual_packages.hpp"
 #include "mamba/solver/libsolv/database.hpp"
-#include "mamba/solver/libsolv/repo_info.hpp"
+#include "mamba/solver/repo_info.hpp"
 #include "mamba/util/build.hpp"
 #include "mamba/util/string.hpp"
 
@@ -54,7 +54,7 @@ namespace mamba
 
     auto
     load_subdir_in_database(const Context& ctx, solver::libsolv::Database& db, const SubdirData& subdir)
-        -> expected_t<solver::libsolv::RepoInfo>
+        -> expected_t<solver::RepoInfo>
     {
         const auto expected_cache_origin = solver::libsolv::RepodataOrigin{
             /* .url= */ util::rsplit(subdir.metadata().url(), "/", 1).front(),
@@ -110,7 +110,7 @@ namespace mamba
                 }
             )
             .transform(
-                [&](solver::libsolv::RepoInfo&& repo) -> solver::libsolv::RepoInfo
+                [&](solver::RepoInfo&& repo) -> solver::RepoInfo
                 {
                     if (!util::on_win)
                     {
@@ -134,7 +134,7 @@ namespace mamba
         const Context& ctx,
         solver::libsolv::Database& db,
         const PrefixData& prefix
-    ) -> solver::libsolv::RepoInfo
+    ) -> solver::RepoInfo
     {
         // TODO(C++20): We could do a PrefixData range that returns packages without storing thems.
         auto pkgs = prefix.sorted_records();

diff --git a/libmamba/src/solver/libsolv/database.cpp b/libmamba/src/solver/libsolv/database.cpp
@@ -17,7 +17,7 @@
 
 #include "mamba/fs/filesystem.hpp"
 #include "mamba/solver/libsolv/database.hpp"
-#include "mamba/solver/libsolv/repo_info.hpp"
+#include "mamba/solver/repo_info.hpp"
 #include "mamba/specs/match_spec.hpp"
 #include "mamba/util/random.hpp"
 #include "solv-cpp/pool.hpp"

diff --git a/libmamba/src/solver/libsolv/repo_info.cpp → libmamba/src/solver/repo_info.cpp b/libmamba/src/solver/libsolv/repo_info.cpp → libmamba/src/solver/repo_info.cpp
@@ -7,10 +7,10 @@
 #include <string_view>
 #include <type_traits>
 
-#include "mamba/solver/libsolv/repo_info.hpp"
+#include "mamba/solver/repo_info.hpp"
 #include "solv-cpp/repo.hpp"
 
-namespace mamba::solver::libsolv
+namespace mamba::solver
 {
     RepoInfo::RepoInfo(::Repo* repo)
         : m_ptr(repo)
@@ -22,9 +22,9 @@ namespace mamba::solver::libsolv
         return solv::ObjRepoViewConst(*m_ptr).name();
     }
 
-    auto RepoInfo::priority() const -> Priorities
+    auto RepoInfo::priority() const -> libsolv::Priorities
     {
-        static_assert(std::is_same_v<decltype(m_ptr->priority), Priorities::value_type>);
+        static_assert(std::is_same_v<decltype(m_ptr->priority), libsolv::Priorities::value_type>);
         return { /* .priority= */ m_ptr->priority, /* .subpriority= */ m_ptr->subpriority };
     }
 

diff --git a/libmamba/tests/src/solver/test_problems_graph.cpp b/libmamba/tests/src/solver/test_problems_graph.cpp
@@ -21,10 +21,10 @@
 #include "mamba/core/util.hpp"
 #include "mamba/fs/filesystem.hpp"
 #include "mamba/solver/libsolv/database.hpp"
-#include "mamba/solver/libsolv/repo_info.hpp"
 #include "mamba/solver/libsolv/solver.hpp"
 #include "mamba/solver/libsolv/unsolvable.hpp"
 #include "mamba/solver/problems_graph.hpp"
+#include "mamba/solver/repo_info.hpp"
 #include "mamba/specs/package_info.hpp"
 #include "mamba/util/string.hpp"
 

diff --git a/libmambapy/src/libmambapy/bindings/solver_libsolv.cpp b/libmambapy/src/libmambapy/bindings/solver_libsolv.cpp
@@ -10,9 +10,9 @@
 
 #include "mamba/solver/libsolv/database.hpp"
 #include "mamba/solver/libsolv/parameters.hpp"
-#include "mamba/solver/libsolv/repo_info.hpp"
 #include "mamba/solver/libsolv/solver.hpp"
 #include "mamba/solver/libsolv/unsolvable.hpp"
+#include "mamba/solver/repo_info.hpp"
 
 #include "bind_utils.hpp"
 #include "bindings.hpp"