Rename #includes with regex

I used: fd --type f '.*\.(?:(?:cpp)|(?:hpp)|(?:c)|(?:h))' --exec sed -i -E 's/#include <libdnf\/(.+)>/#include <libdnf5\/\1>/g' {} fd --type f '.*\.(?:(?:cpp)|(?:hpp)|(?:c)|(?:h))' --exec sed -i -E 's/#include "libdnf\/(.+)"/#include "libdnf5\/\1"/g' {} fd --type f '.*\.(?:(?:cpp)|(?:hpp)|(?:c)|(?:h))' --exec sed -i -E 's/#include "libdnf-cli\/(.+)"/#include "libdnf5-cli\/\1"/g' {} fd --type f '.*\.(?:(?:cpp)|(?:hpp)|(?:c)|(?:h))' --exec sed -i -E 's/#include <libdnf-cli\/(.+)>/#include <libdnf5-cli\/\1>/g' {} The pre-commit hook then rearranged many of the #includes.
rpm-software-management · Jun 21, 2023 · 7e82e0d · 7e82e0d
1 parent 04c073f
commit 7e82e0d
Show file tree

Hide file tree

Showing 469 changed files with 1,050 additions and 1,237 deletions.
diff --git a/dnf5-plugins/builddep_plugin/builddep.cpp b/dnf5-plugins/builddep_plugin/builddep.cpp
@@ -19,13 +19,12 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "builddep.hpp"
 
+#include "libdnf5-cli/exception.hpp"
 #include "utils/bgettext/bgettext-mark-domain.h"
 #include "utils/string.hpp"
 
-#include "libdnf-cli/exception.hpp"
-
 #include <dnf5/shared_options.hpp>
-#include <libdnf/rpm/package_query.hpp>
+#include <libdnf5/rpm/package_query.hpp>
 #include <rpm/rpmbuild.h>
 
 #include <iostream>

diff --git a/dnf5-plugins/builddep_plugin/builddep.hpp b/dnf5-plugins/builddep_plugin/builddep.hpp
@@ -24,7 +24,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include <dnf5/context.hpp>
 #include <dnf5/shared_options.hpp>
-#include <libdnf/conf/option_bool.hpp>
+#include <libdnf5/conf/option_bool.hpp>
 
 #include <vector>
 

diff --git a/dnf5-plugins/changelog_plugin/changelog.cpp b/dnf5-plugins/changelog_plugin/changelog.cpp
@@ -19,11 +19,11 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "changelog.hpp"
 
-#include <libdnf-cli/output/changelogs.hpp>
-#include <libdnf/conf/const.hpp>
-#include <libdnf/conf/option_string.hpp>
-#include <libdnf/rpm/package.hpp>
-#include <libdnf/rpm/package_query.hpp>
+#include <libdnf5-cli/output/changelogs.hpp>
+#include <libdnf5/conf/const.hpp>
+#include <libdnf5/conf/option_string.hpp>
+#include <libdnf5/rpm/package.hpp>
+#include <libdnf5/rpm/package_query.hpp>
 
 #include <ctime>
 #include <iomanip>

diff --git a/dnf5-plugins/changelog_plugin/changelog.hpp b/dnf5-plugins/changelog_plugin/changelog.hpp
@@ -21,8 +21,8 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #define DNF5_COMMANDS_CHANGELOG_HPP
 
 #include <dnf5/context.hpp>
-#include <libdnf/conf/option_bool.hpp>
-#include <libdnf/conf/option_number.hpp>
+#include <libdnf5/conf/option_bool.hpp>
+#include <libdnf5/conf/option_number.hpp>
 
 #include <memory>
 #include <vector>

diff --git a/dnf5-plugins/copr_plugin/copr_config.hpp b/dnf5-plugins/copr_plugin/copr_config.hpp
@@ -23,8 +23,8 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #include "os_release.hpp"
 
 #include <glob.h>
-#include <libdnf/base/base.hpp>
-#include <libdnf/conf/config_parser.hpp>
+#include <libdnf5/base/base.hpp>
+#include <libdnf5/conf/config_parser.hpp>
 
 namespace dnf5 {
 

diff --git a/dnf5-plugins/copr_plugin/copr_disable.cpp b/dnf5-plugins/copr_plugin/copr_disable.cpp
@@ -20,7 +20,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #include "copr.hpp"
 #include "copr_repo.hpp"
 
-#include <libdnf/conf/const.hpp>
+#include <libdnf5/conf/const.hpp>
 
 using namespace libdnf5::cli;
 

diff --git a/dnf5-plugins/copr_plugin/copr_enable.cpp b/dnf5-plugins/copr_plugin/copr_enable.cpp
@@ -20,7 +20,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #include "copr.hpp"
 #include "copr_repo.hpp"
 
-#include <libdnf/conf/const.hpp>
+#include <libdnf5/conf/const.hpp>
 
 using namespace libdnf5::cli;
 

diff --git a/dnf5-plugins/copr_plugin/copr_remove.cpp b/dnf5-plugins/copr_plugin/copr_remove.cpp
@@ -20,7 +20,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #include "copr.hpp"
 #include "copr_repo.hpp"
 
-#include <libdnf/conf/const.hpp>
+#include <libdnf5/conf/const.hpp>
 
 using namespace libdnf5::cli;
 

diff --git a/dnf5-plugins/copr_plugin/copr_repo.cpp b/dnf5-plugins/copr_plugin/copr_repo.cpp
@@ -24,8 +24,8 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #include "json.hpp"
 
 #include <fnmatch.h>
-#include <libdnf-cli/utils/userconfirm.hpp>
-#include <libdnf/conf/const.hpp>
+#include <libdnf5-cli/utils/userconfirm.hpp>
+#include <libdnf5/conf/const.hpp>
 
 #include <filesystem>
 #include <fstream>

diff --git a/dnf5-plugins/copr_plugin/copr_repo.hpp b/dnf5-plugins/copr_plugin/copr_repo.hpp
@@ -25,7 +25,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #include "helpers.hpp"
 #include "json.hpp"
 
-#include <libdnf/base/base.hpp>
+#include <libdnf5/base/base.hpp>
 
 #include <filesystem>
 

diff --git a/dnf5-plugins/copr_plugin/download_file.cpp b/dnf5-plugins/copr_plugin/download_file.cpp
@@ -19,7 +19,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "download_file.hpp"
 
-#include "libdnf/repo/file_downloader.hpp"
+#include "libdnf5/repo/file_downloader.hpp"
 
 #include <filesystem>
 

diff --git a/dnf5-plugins/copr_plugin/download_file.hpp b/dnf5-plugins/copr_plugin/download_file.hpp
@@ -20,7 +20,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #ifndef DNF5_COMMANDS_COPR_DOWNLOAD_FILE_HPP
 #define DNF5_COMMANDS_COPR_DOWNLOAD_FILE_HPP
 
-#include <libdnf/base/base.hpp>
+#include <libdnf5/base/base.hpp>
 
 #include <filesystem>
 

diff --git a/dnf5-plugins/copr_plugin/helpers.hpp b/dnf5-plugins/copr_plugin/helpers.hpp
@@ -20,7 +20,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #ifndef DNF5_COMMANDS_COPR_HELPERS_HPP
 #define DNF5_COMMANDS_COPR_HELPERS_HPP
 
-#include <libdnf/utils/format.hpp>
+#include <libdnf5/utils/format.hpp>
 
 #include <iostream>
 #include <string>

diff --git a/dnf5-plugins/copr_plugin/json.hpp b/dnf5-plugins/copr_plugin/json.hpp
@@ -20,7 +20,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #ifndef DNF5_COMMANDS_COPR_JSON_HPP
 #define DNF5_COMMANDS_COPR_JSON_HPP
 
-#include "libdnf/base/base.hpp"
+#include "libdnf5/base/base.hpp"
 
 #include <json.h>
 

diff --git a/dnf5-plugins/repoclosure_plugin/repoclosure.cpp b/dnf5-plugins/repoclosure_plugin/repoclosure.cpp
@@ -19,15 +19,13 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "repoclosure.hpp"
 
+#include "libdnf5-cli/argument_parser.hpp"
+#include "libdnf5/conf/const.hpp"
+#include "libdnf5/rpm/package.hpp"
+#include "libdnf5/rpm/package_query.hpp"
+#include "libdnf5/utils/format.hpp"
 #include "utils/bgettext/bgettext-mark-domain.h"
 
-#include "libdnf-cli/argument_parser.hpp"
-
-#include "libdnf/conf/const.hpp"
-#include "libdnf/rpm/package.hpp"
-#include "libdnf/rpm/package_query.hpp"
-#include "libdnf/utils/format.hpp"
-
 #include <iostream>
 
 

diff --git a/dnf5-plugins/repoclosure_plugin/repoclosure.hpp b/dnf5-plugins/repoclosure_plugin/repoclosure.hpp
@@ -24,8 +24,8 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include <dnf5/context.hpp>
 #include <dnf5/shared_options.hpp>
-#include <libdnf-cli/session.hpp>
-#include <libdnf/conf/option_string_list.hpp>
+#include <libdnf5-cli/session.hpp>
+#include <libdnf5/conf/option_string_list.hpp>
 
 #include <vector>
 

diff --git a/dnf5/cmdline_aliases.cpp b/dnf5/cmdline_aliases.cpp
@@ -19,7 +19,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "cmdline_aliases.hpp"
 
-#include <libdnf/common/preserve_order_map.hpp>
+#include <libdnf5/common/preserve_order_map.hpp>
 #include <toml.hpp>
 
 #include <iostream>

diff --git a/dnf5/commands/advisory/advisory_info.cpp b/dnf5/commands/advisory/advisory_info.cpp
@@ -19,8 +19,8 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "advisory_info.hpp"
 
-#include <libdnf-cli/output/advisoryinfo.hpp>
-#include <libdnf/rpm/package_query.hpp>
+#include <libdnf5-cli/output/advisoryinfo.hpp>
+#include <libdnf5/rpm/package_query.hpp>
 
 #include <iostream>
 

diff --git a/dnf5/commands/advisory/advisory_list.cpp b/dnf5/commands/advisory/advisory_list.cpp
@@ -19,10 +19,10 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "advisory_list.hpp"
 
-#include "libdnf-cli/output/advisorylist.hpp"
+#include "libdnf5-cli/output/advisorylist.hpp"
 
-#include <libdnf/advisory/advisory_package.hpp>
-#include <libdnf/rpm/package_query.hpp>
+#include <libdnf5/advisory/advisory_package.hpp>
+#include <libdnf5/rpm/package_query.hpp>
 
 namespace dnf5 {
 

diff --git a/dnf5/commands/advisory/advisory_subcommand.cpp b/dnf5/commands/advisory/advisory_subcommand.cpp
@@ -21,9 +21,9 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "dnf5/context.hpp"
 
-#include <libdnf-cli/output/advisorysummary.hpp>
-#include <libdnf/conf/const.hpp>
-#include <libdnf/rpm/package_query.hpp>
+#include <libdnf5-cli/output/advisorysummary.hpp>
+#include <libdnf5/conf/const.hpp>
+#include <libdnf5/rpm/package_query.hpp>
 
 namespace dnf5 {
 

diff --git a/dnf5/commands/advisory/advisory_subcommand.hpp b/dnf5/commands/advisory/advisory_subcommand.hpp
@@ -24,7 +24,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #include "arguments.hpp"
 
 #include <dnf5/context.hpp>
-#include <libdnf/advisory/advisory_query.hpp>
+#include <libdnf5/advisory/advisory_query.hpp>
 
 #include <memory>
 

diff --git a/dnf5/commands/advisory/advisory_summary.cpp b/dnf5/commands/advisory/advisory_summary.cpp
@@ -19,8 +19,8 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "advisory_summary.hpp"
 
-#include <libdnf-cli/output/advisorysummary.hpp>
-#include <libdnf/rpm/package_query.hpp>
+#include <libdnf5-cli/output/advisorysummary.hpp>
+#include <libdnf5/rpm/package_query.hpp>
 
 namespace dnf5 {
 

diff --git a/dnf5/commands/advisory/arguments.hpp b/dnf5/commands/advisory/arguments.hpp
@@ -24,7 +24,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "utils/bgettext/bgettext-lib.h"
 
-#include <libdnf-cli/session.hpp>
+#include <libdnf5-cli/session.hpp>
 
 namespace dnf5 {
 

diff --git a/dnf5/commands/advisory_shared.hpp b/dnf5/commands/advisory_shared.hpp
@@ -22,13 +22,12 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #define DNF5_COMMANDS_ARGUMENTS_HPP
 
 
+#include "libdnf5/base/base_weak.hpp"
 #include "utils/bgettext/bgettext-lib.h"
 #include "utils/string.hpp"
 
-#include "libdnf/base/base_weak.hpp"
-
-#include <libdnf-cli/session.hpp>
-#include <libdnf/advisory/advisory_query.hpp>
+#include <libdnf5-cli/session.hpp>
+#include <libdnf5/advisory/advisory_query.hpp>
 
 #include <optional>
 

diff --git a/dnf5/commands/autoremove/autoremove.cpp b/dnf5/commands/autoremove/autoremove.cpp
@@ -19,7 +19,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "autoremove.hpp"
 
-#include <libdnf/rpm/package_query.hpp>
+#include <libdnf5/rpm/package_query.hpp>
 
 namespace dnf5 {
 

diff --git a/dnf5/commands/autoremove/autoremove.hpp b/dnf5/commands/autoremove/autoremove.hpp
@@ -21,7 +21,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #define DNF5_COMMANDS_AUTOREMOVE_AUTOREMOVE_HPP
 
 #include <dnf5/context.hpp>
-#include <libdnf/conf/option_bool.hpp>
+#include <libdnf5/conf/option_bool.hpp>
 
 #include <memory>
 #include <vector>

diff --git a/dnf5/commands/check-upgrade/check-upgrade.cpp b/dnf5/commands/check-upgrade/check-upgrade.cpp
@@ -22,10 +22,10 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #include "utils/bgettext/bgettext-mark-domain.h"
 
 #include <dnf5/shared_options.hpp>
-#include <libdnf-cli/output/changelogs.hpp>
-#include <libdnf-cli/output/package_list_sections.hpp>
-#include <libdnf/conf/const.hpp>
-#include <libdnf/rpm/package_query.hpp>
+#include <libdnf5-cli/output/changelogs.hpp>
+#include <libdnf5-cli/output/package_list_sections.hpp>
+#include <libdnf5/conf/const.hpp>
+#include <libdnf5/rpm/package_query.hpp>
 
 #include <iostream>
 

diff --git a/dnf5/commands/check-upgrade/check-upgrade.hpp b/dnf5/commands/check-upgrade/check-upgrade.hpp
@@ -25,9 +25,9 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include <dnf5/context.hpp>
 #include <dnf5/shared_options.hpp>
-#include <libdnf-cli/output/package_list_sections.hpp>
-#include <libdnf/conf/option_bool.hpp>
-#include <libdnf/rpm/package_set.hpp>
+#include <libdnf5-cli/output/package_list_sections.hpp>
+#include <libdnf5/conf/option_bool.hpp>
+#include <libdnf5/rpm/package_set.hpp>
 
 #include <memory>
 #include <vector>

diff --git a/dnf5/commands/clean/clean.cpp b/dnf5/commands/clean/clean.cpp
@@ -22,8 +22,8 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "utils/bgettext/bgettext-mark-domain.h"
 
-#include <libdnf-cli/argument_parser.hpp>
-#include <libdnf/repo/repo_cache.hpp>
+#include <libdnf5-cli/argument_parser.hpp>
+#include <libdnf5/repo/repo_cache.hpp>
 
 #include <filesystem>
 #include <iostream>

diff --git a/dnf5/commands/distro-sync/distro-sync.cpp b/dnf5/commands/distro-sync/distro-sync.cpp
@@ -20,7 +20,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #include "distro-sync.hpp"
 
 #include <dnf5/shared_options.hpp>
-#include <libdnf/conf/option_string.hpp>
+#include <libdnf5/conf/option_string.hpp>
 
 namespace dnf5 {
 

diff --git a/dnf5/commands/distro-sync/distro-sync.hpp b/dnf5/commands/distro-sync/distro-sync.hpp
@@ -23,7 +23,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include <dnf5/context.hpp>
 #include <dnf5/shared_options.hpp>
-#include <libdnf/conf/option_bool.hpp>
+#include <libdnf5/conf/option_bool.hpp>
 
 #include <memory>
 #include <vector>

diff --git a/dnf5/commands/download/download.cpp b/dnf5/commands/download/download.cpp
@@ -22,11 +22,11 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #include "dnf5/shared_options.hpp"
 #include "utils/bgettext/bgettext-mark-domain.h"
 
-#include <libdnf/conf/option_string.hpp>
-#include <libdnf/repo/package_downloader.hpp>
-#include <libdnf/rpm/package.hpp>
-#include <libdnf/rpm/package_query.hpp>
-#include <libdnf/rpm/package_set.hpp>
+#include <libdnf5/conf/option_string.hpp>
+#include <libdnf5/repo/package_downloader.hpp>
+#include <libdnf5/rpm/package.hpp>
+#include <libdnf5/rpm/package_query.hpp>
+#include <libdnf5/rpm/package_set.hpp>
 
 #include <iostream>
 #include <map>

diff --git a/dnf5/commands/download/download.hpp b/dnf5/commands/download/download.hpp
@@ -22,7 +22,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 #define DNF5_COMMANDS_DOWNLOAD_DOWNLOAD_HPP
 
 #include <dnf5/context.hpp>
-#include <libdnf/conf/option.hpp>
+#include <libdnf5/conf/option.hpp>
 
 #include <memory>
 #include <vector>

diff --git a/dnf5/commands/environment/arguments.hpp b/dnf5/commands/environment/arguments.hpp
@@ -23,7 +23,7 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "utils/bgettext/bgettext-lib.h"
 
-#include <libdnf-cli/session.hpp>
+#include <libdnf5-cli/session.hpp>
 
 namespace dnf5 {
 

diff --git a/dnf5/commands/environment/environment_info.cpp b/dnf5/commands/environment/environment_info.cpp
@@ -19,11 +19,11 @@ along with libdnf.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "environment_info.hpp"
 
-#include <libdnf-cli/output/environmentinfo.hpp>
-#include <libdnf/comps/comps.hpp>
-#include <libdnf/comps/environment/environment.hpp>
-#include <libdnf/comps/environment/query.hpp>
-#include <libdnf/conf/const.hpp>
+#include <libdnf5-cli/output/environmentinfo.hpp>
+#include <libdnf5/comps/comps.hpp>
+#include <libdnf5/comps/environment/environment.hpp>
+#include <libdnf5/comps/environment/query.hpp>
+#include <libdnf5/conf/const.hpp>
 
 namespace dnf5 {