Arrange header sorting (#2375)

* Change headers sorting in Clang-format

* Reorder headers

.clang-format

@@ -33,17 +33,19 @@ ExperimentalAutoDetectBinPacking: 'true'
 IncludeBlocks: Regroup
 IncludeCategories:
 - Regex: <[^.]+>
-  Priority: 1
+  Priority: -3
 - Regex: <mamba/.+>
-  Priority: 3
+  Priority: -1
 - Regex: <.+>
-  Priority: 2
+  Priority: -2
 - Regex: '"mamba/.+"'
-  Priority: 4
+  Priority: 0
+- Regex: '"solv-cpp/.+"'
+  Priority: 0
 - Regex: '".+/.+"'
-  Priority: 5
+  Priority: 1
 - Regex: '".+"'
-  Priority: 6
+  Priority: 2
 IndentCaseLabels: 'true'
 IndentWidth: '4'
 IndentWrappedFunctionNames: 'false'

libmamba/src/api/c_api.cpp

@@ -4,10 +4,9 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/c_api.h"
-
 #include <string>
 
+#include "mamba/api/c_api.h"
 #include "mamba/api/config.hpp"
 #include "mamba/api/configuration.hpp"
 #include "mamba/api/create.hpp"

libmamba/src/api/channel_loader.cpp

@@ -5,7 +5,6 @@
 // The full license is in the file LICENSE, distributed with this software.
 
 #include "mamba/api/channel_loader.hpp"
-
 #include "mamba/core/channel.hpp"
 #include "mamba/core/output.hpp"
 #include "mamba/core/repo.hpp"

libmamba/src/api/clean.cpp

@@ -4,10 +4,9 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/clean.hpp"
-
 #include <iostream>
 
+#include "mamba/api/clean.hpp"
 #include "mamba/api/configuration.hpp"
 #include "mamba/core/context.hpp"
 #include "mamba/core/mamba_fs.hpp"

libmamba/src/api/configuration.cpp

@@ -4,8 +4,6 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/configuration.hpp"
-
 #include <algorithm>
 #include <iostream>
 #include <regex>
@@ -14,6 +12,7 @@
 #include <nlohmann/json.hpp>
 #include <reproc++/run.hpp>
 
+#include "mamba/api/configuration.hpp"
 #include "mamba/api/info.hpp"
 #include "mamba/api/install.hpp"
 #include "mamba/core/environment.hpp"

libmamba/src/api/create.cpp

@@ -4,9 +4,8 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/create.hpp"
-
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/create.hpp"
 #include "mamba/api/install.hpp"
 #include "mamba/core/context.hpp"
 #include "mamba/core/util.hpp"

libmamba/src/api/info.cpp

@@ -4,9 +4,8 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/info.hpp"
-
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/info.hpp"
 #include "mamba/core/channel.hpp"
 #include "mamba/core/context.hpp"
 #include "mamba/core/environment.hpp"

libmamba/src/api/install.cpp

@@ -4,8 +4,6 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/install.hpp"
-
 #include <stdexcept>
 
 #include <fmt/color.h>
@@ -16,6 +14,7 @@
 
 #include "mamba/api/channel_loader.hpp"
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/install.hpp"
 #include "mamba/core/activation.hpp"
 #include "mamba/core/env_lockfile.hpp"
 #include "mamba/core/environments_manager.hpp"

libmamba/src/api/list.cpp

@@ -4,12 +4,11 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/list.hpp"
-
 #include <iostream>
 #include <regex>
 
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/list.hpp"
 #include "mamba/core/channel.hpp"
 #include "mamba/core/context.hpp"
 #include "mamba/core/prefix_data.hpp"

libmamba/src/api/remove.cpp

@@ -4,9 +4,8 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/remove.hpp"
-
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/remove.hpp"
 #include "mamba/core/output.hpp"
 #include "mamba/core/package_cache.hpp"
 #include "mamba/core/pool.hpp"

libmamba/src/api/repoquery.cpp

@@ -4,12 +4,11 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/repoquery.hpp"
-
 #include <iostream>
 
 #include "mamba/api/channel_loader.hpp"
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/repoquery.hpp"
 #include "mamba/core/util_string.hpp"
 
 namespace mamba

libmamba/src/api/shell.cpp

@@ -4,11 +4,10 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/shell.hpp"
-
 #include <iostream>
 
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/shell.hpp"
 #include "mamba/core/activation.hpp"
 #include "mamba/core/context.hpp"
 #include "mamba/core/environment.hpp"

libmamba/src/api/update.cpp

@@ -4,10 +4,9 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/update.hpp"
-
 #include "mamba/api/channel_loader.hpp"
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/update.hpp"
 #include "mamba/core/context.hpp"
 #include "mamba/core/pinning.hpp"
 #include "mamba/core/transaction.hpp"

libmamba/src/core/activation.cpp

@@ -5,7 +5,6 @@
 // The full license is in the file LICENSE, distributed with this software.
 
 #include "mamba/core/activation.hpp"
-
 #include "mamba/core/context.hpp"
 #include "mamba/core/environment.hpp"
 #include "mamba/core/output.hpp"

libmamba/src/core/context.cpp

@@ -4,8 +4,6 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/context.hpp"
-
 #include <iostream>
 
 #include <fmt/format.h>
@@ -14,6 +12,7 @@
 #include <spdlog/sinks/stdout_color_sinks.h>
 #include <spdlog/spdlog.h>
 
+#include "mamba/core/context.hpp"
 #include "mamba/core/environment.hpp"
 #include "mamba/core/execution.hpp"
 #include "mamba/core/output.hpp"

libmamba/src/core/env_lockfile.cpp

@@ -4,11 +4,10 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/env_lockfile.hpp"
-
 #include <spdlog/spdlog.h>
 #include <yaml-cpp/yaml.h>
 
+#include "mamba/core/env_lockfile.hpp"
 #include "mamba/core/mamba_fs.hpp"
 #include "mamba/core/match_spec.hpp"
 #include "mamba/core/output.hpp"

libmamba/src/core/environment.cpp

@@ -5,7 +5,6 @@
 // The full license is in the file LICENSE, distributed with this software.
 
 #include "mamba/core/environment.hpp"
-
 #include "mamba/core/util_string.hpp"
 
 #ifdef _WIN32

libmamba/src/core/environments_manager.cpp

@@ -3,14 +3,13 @@
 // Distributed under the terms of the BSD 3-Clause License.
 //
 // The full license is in the file LICENSE, distributed with this software.
-#include "mamba/core/environments_manager.hpp"
-
 #include <set>
 #include <string>
 #include <vector>
 
 #include "mamba/core/context.hpp"
 #include "mamba/core/environment.hpp"
+#include "mamba/core/environments_manager.hpp"
 #include "mamba/core/fsutil.hpp"
 #include "mamba/core/output.hpp"
 #include "mamba/core/util.hpp"

libmamba/src/core/execution.cpp

@@ -1,5 +1,4 @@
 #include "mamba/core/execution.hpp"
-
 #include "mamba/core/invoke.hpp"
 #include "mamba/core/output.hpp"
 

libmamba/src/core/fetch.cpp

@@ -4,11 +4,10 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/fetch.hpp"
-
 #include <string_view>
 
 #include "mamba/core/context.hpp"
+#include "mamba/core/fetch.hpp"
 #include "mamba/core/output.hpp"
 #include "mamba/core/thread_utils.hpp"
 #include "mamba/core/url.hpp"

libmamba/src/core/fsutil.cpp

@@ -4,13 +4,12 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/fsutil.hpp"
-
 #include <fstream>
 #include <string>
 #include <system_error>
 
 #include "mamba/core/environment.hpp"
+#include "mamba/core/fsutil.hpp"
 #include "mamba/core/mamba_fs.hpp"
 #include "mamba/core/output.hpp"
 #include "mamba/core/util.hpp"

libmamba/src/core/history.cpp

@@ -4,12 +4,11 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/history.hpp"
-
 #include <regex>
 
 #include "mamba/core/context.hpp"
 #include "mamba/core/fsutil.hpp"
+#include "mamba/core/history.hpp"
 #include "mamba/core/output.hpp"
 #include "mamba/core/util.hpp"
 #include "mamba/core/util_string.hpp"

libmamba/src/core/link.cpp

@@ -4,8 +4,6 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/link.hpp"
-
 #include <iostream>
 #include <regex>
 #include <string>
@@ -16,6 +14,7 @@
 #include <reproc++/run.hpp>
 
 #include "mamba/core/environment.hpp"
+#include "mamba/core/link.hpp"
 #include "mamba/core/match_spec.hpp"
 #include "mamba/core/menuinst.hpp"
 #include "mamba/core/output.hpp"

libmamba/src/core/mamba_fs.cpp

@@ -4,11 +4,10 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/mamba_fs.hpp"
-
 #include <filesystem>
 #include <string>
 
+#include "mamba/core/mamba_fs.hpp"
 #include "mamba/core/util_string.hpp"
 
 namespace fs

libmamba/src/core/match_spec.cpp

@@ -4,12 +4,11 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/match_spec.hpp"
-
 #include <regex>
 
 #include "mamba/core/channel.hpp"
 #include "mamba/core/environment.hpp"
+#include "mamba/core/match_spec.hpp"
 #include "mamba/core/output.hpp"
 #include "mamba/core/url.hpp"
 #include "mamba/core/util_string.hpp"

libmamba/src/core/package_cache.cpp

@@ -4,10 +4,9 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/package_cache.hpp"
-
 #include "mamba/core/context.hpp"
 #include "mamba/core/output.hpp"
+#include "mamba/core/package_cache.hpp"
 #include "mamba/core/package_handling.hpp"
 #include "mamba/core/url.hpp"
 #include "mamba/core/validate.hpp"

libmamba/src/core/package_handling.cpp

@@ -5,8 +5,6 @@
 // The full license is in the file LICENSE, distributed with this software.
 
 
-#include "mamba/core/package_handling.hpp"
-
 #include <sstream>
 
 #include <archive.h>
@@ -16,6 +14,7 @@
 
 #include "mamba/core/context.hpp"
 #include "mamba/core/output.hpp"
+#include "mamba/core/package_handling.hpp"
 #include "mamba/core/package_paths.hpp"
 #include "mamba/core/thread_utils.hpp"
 #include "mamba/core/util_os.hpp"

libmamba/src/core/package_info.cpp

@@ -4,8 +4,6 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/package_info.hpp"
-
 #include <algorithm>
 #include <functional>
 #include <iterator>
@@ -13,6 +11,7 @@
 #include <tuple>
 
 #include "mamba/core/channel.hpp"
+#include "mamba/core/package_info.hpp"
 #include "mamba/core/util_string.hpp"
 
 namespace mamba

libmamba/src/core/package_paths.cpp

@@ -4,12 +4,11 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/package_paths.hpp"
-
 #include <map>
 #include <set>
 #include <string>
 
+#include "mamba/core/package_paths.hpp"
 #include "mamba/core/util_string.hpp"
 
 namespace mamba

libmamba/src/core/pinning.cpp

@@ -4,11 +4,10 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/pinning.hpp"
-
 #include <fstream>
 
 #include "mamba/core/output.hpp"
+#include "mamba/core/pinning.hpp"
 #include "mamba/core/util_string.hpp"
 
 

libmamba/src/core/pool.cpp

@@ -23,7 +23,6 @@ extern "C"  // Incomplete header
 #include "mamba/core/util_cast.hpp"
 #include "mamba/core/util_compare.hpp"
 #include "mamba/core/util_string.hpp"
-
 #include "solv-cpp/queue.hpp"
 
 namespace mamba

libmamba/src/core/prefix_data.cpp

@@ -4,17 +4,15 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/prefix_data.hpp"
-
 #include <solv/pool.h>
 #include <solv/repo.h>
 #include <solv/transaction.h>
 
 #include "mamba/core/output.hpp"
 #include "mamba/core/pool.hpp"
+#include "mamba/core/prefix_data.hpp"
 #include "mamba/core/repo.hpp"
 #include "mamba/core/util_string.hpp"
-
 #include "solv-cpp/queue.hpp"
 
 namespace mamba

libmamba/src/core/progress_bar_impl.cpp

@@ -1,5 +1,3 @@
-#include "progress_bar_impl.hpp"
-
 #include <algorithm>
 #include <cmath>
 #include <iomanip>
@@ -13,6 +11,8 @@
 #include "mamba/core/execution.hpp"
 #include "mamba/core/util_compare.hpp"
 
+#include "progress_bar_impl.hpp"
+
 namespace cursor
 {
     class CursorMovementTriple

libmamba/src/core/query.cpp

@@ -4,8 +4,6 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/query.hpp"
-
 #include <iostream>
 #include <stack>
 
@@ -20,9 +18,9 @@
 #include "mamba/core/match_spec.hpp"
 #include "mamba/core/output.hpp"
 #include "mamba/core/package_info.hpp"
+#include "mamba/core/query.hpp"
 #include "mamba/core/url.hpp"
 #include "mamba/core/util_string.hpp"
-
 #include "solv-cpp/queue.hpp"
 
 namespace mamba

libmamba/src/core/run.cpp

@@ -1,5 +1,3 @@
-#include "mamba/core/run.hpp"
-
 #include <csignal>
 #include <exception>
 #include <iostream>
@@ -16,6 +14,7 @@
 #include "mamba/api/install.hpp"
 #include "mamba/core/error_handling.hpp"
 #include "mamba/core/execution.hpp"
+#include "mamba/core/run.hpp"
 #include "mamba/core/util_os.hpp"
 #include "mamba/core/util_random.hpp"
 #include "mamba/core/util_string.hpp"

libmamba/src/core/satisfiability_error.cpp

@@ -4,8 +4,6 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/satisfiability_error.hpp"
-
 #include <algorithm>
 #include <functional>
 #include <limits>
@@ -25,6 +23,7 @@
 #include "mamba/core/output.hpp"
 #include "mamba/core/package_info.hpp"
 #include "mamba/core/pool.hpp"
+#include "mamba/core/satisfiability_error.hpp"
 #include "mamba/core/solver.hpp"
 #include "mamba/core/util_string.hpp"
 

libmamba/src/core/solver.cpp

@@ -26,7 +26,6 @@ extern "C"  // Incomplete header
 #include "mamba/core/satisfiability_error.hpp"
 #include "mamba/core/solver.hpp"
 #include "mamba/core/util_string.hpp"
-
 #include "solv-cpp/queue.hpp"
 
 namespace mamba

libmamba/src/core/subdirdata.cpp

@@ -4,13 +4,12 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/subdirdata.hpp"
-
 #include <stdexcept>
 
 #include "mamba/core/mamba_fs.hpp"
 #include "mamba/core/output.hpp"
 #include "mamba/core/package_cache.hpp"
+#include "mamba/core/subdirdata.hpp"
 #include "mamba/core/url.hpp"
 #include "mamba/core/util_string.hpp"
 

libmamba/src/core/transaction.cpp

@@ -27,7 +27,6 @@ extern "C"  // Incomplete header
 #include "mamba/core/transaction.hpp"
 #include "mamba/core/util_scope.hpp"
 #include "mamba/core/util_string.hpp"
-
 #include "solv-cpp/queue.hpp"
 
 #include "progress_bar_impl.hpp"

libmamba/src/core/url.cpp

@@ -4,13 +4,12 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/url.hpp"
-
 #include <regex>
 
 #include <openssl/evp.h>
 
 #include "mamba/core/context.hpp"
+#include "mamba/core/url.hpp"
 #include "mamba/core/util.hpp"
 #include "mamba/core/util_string.hpp"
 

libmamba/src/core/util_string.cpp

@@ -4,8 +4,6 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/util_string.hpp"
-
 #include <cctype>
 #include <cwchar>
 #include <cwctype>
@@ -13,6 +11,8 @@
 
 #include <stddef.h>
 
+#include "mamba/core/util_string.hpp"
+
 namespace mamba
 {
     /****************************************

libmamba/src/core/validate.cpp

@@ -4,8 +4,6 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/validate.hpp"
-
 #include <iostream>
 #include <regex>
 #include <set>
@@ -20,6 +18,7 @@
 #include "mamba/core/output.hpp"
 #include "mamba/core/url.hpp"
 #include "mamba/core/util_string.hpp"
+#include "mamba/core/validate.hpp"
 
 namespace mamba
 {

libmamba/src/core/virtual_packages.cpp

@@ -4,14 +4,13 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/core/virtual_packages.hpp"
-
 #include "mamba/core/context.hpp"
 #include "mamba/core/environment.hpp"
 #include "mamba/core/output.hpp"
 #include "mamba/core/util.hpp"
 #include "mamba/core/util_os.hpp"
 #include "mamba/core/util_string.hpp"
+#include "mamba/core/virtual_packages.hpp"
 
 #ifdef _WIN32
 #include <windows.h>

libmamba/src/solv-cpp/queue.cpp

@@ -5,8 +5,6 @@
 // The full license is in the file LICENSE, distributed with this software.
 
 
-#include "solv-cpp/queue.hpp"
-
 #include <cassert>
 #include <exception>
 #include <limits>
@@ -14,6 +12,8 @@
 
 #include <solv/queue.h>
 
+#include "solv-cpp/queue.hpp"
+
 namespace mamba::solv
 {
     ObjQueue::ObjQueue(std::nullptr_t)

mamba_package/src/package.cpp

@@ -4,11 +4,11 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "package.hpp"
-
 #include "mamba/core/package_handling.hpp"
 #include "mamba/core/util_string.hpp"
 
+#include "package.hpp"
+
 using namespace mamba;  // NOLINT(build/namespaces)
 
 void

micromamba/src/clean.cpp

@@ -5,7 +5,6 @@
 // The full license is in the file LICENSE, distributed with this software.
 
 #include "mamba/api/clean.hpp"
-
 #include "mamba/api/configuration.hpp"
 
 #include "common_options.hpp"

micromamba/src/common_options.cpp

@@ -5,7 +5,6 @@
 // The full license is in the file LICENSE, distributed with this software.
 
 #include "common_options.hpp"
-
 #include "mamba/api/configuration.hpp"
 
 

micromamba/src/config.cpp

@@ -4,12 +4,11 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/config.hpp"
-
 #include <fstream>
 
 #include <yaml-cpp/yaml.h>
 
+#include "mamba/api/config.hpp"
 #include "mamba/api/configuration.hpp"
 #include "mamba/core/fsutil.hpp"
 #include "mamba/core/util.hpp"

micromamba/src/constructor.cpp

@@ -5,7 +5,6 @@
 // The full license is in the file LICENSE, distributed with this software.
 
 #include "constructor.hpp"
-
 #include "mamba/api/configuration.hpp"
 #include "mamba/api/install.hpp"
 #include "mamba/core/package_handling.hpp"

micromamba/src/install.cpp

@@ -1,6 +1,5 @@
-#include "mamba/api/install.hpp"
-
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/install.hpp"
 
 #include "common_options.hpp"
 

micromamba/src/list.cpp

@@ -4,9 +4,8 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/list.hpp"
-
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/list.hpp"
 
 #include "common_options.hpp"
 

micromamba/src/remove.cpp

@@ -4,9 +4,8 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/remove.hpp"
-
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/remove.hpp"
 
 #include "common_options.hpp"
 

micromamba/src/repoquery.cpp

@@ -4,9 +4,8 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/repoquery.hpp"
-
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/repoquery.hpp"
 
 #include "common_options.hpp"
 

micromamba/src/shell.cpp

@@ -4,9 +4,8 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/shell.hpp"
-
 #include "mamba/api/configuration.hpp"
+#include "mamba/api/shell.hpp"
 #include "mamba/core/fsutil.hpp"
 #include "mamba/core/run.hpp"
 

micromamba/src/umamba.cpp

@@ -4,12 +4,11 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "umamba.hpp"
-
 #include "mamba/core/context.hpp"
 #include "mamba/version.hpp"
 
 #include "common_options.hpp"
+#include "umamba.hpp"
 #include "version.hpp"
 
 using namespace mamba;  // NOLINT(build/namespaces)

micromamba/src/update.cpp

@@ -4,14 +4,13 @@
 //
 // The full license is in the file LICENSE, distributed with this software.
 
-#include "mamba/api/update.hpp"
-
 #include <fmt/color.h>
 #include <fmt/format.h>
 
 #include "mamba/api/channel_loader.hpp"
 #include "mamba/api/configuration.hpp"
 #include "mamba/api/shell.hpp"
+#include "mamba/api/update.hpp"
 #include "mamba/core/context.hpp"
 #include "mamba/core/transaction.hpp"
 #include "mamba/core/util_os.hpp"