Merge branch 'master' into master

1 files changed, 71 insertions, 51 deletions

diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp
index eabf2b9ae..a9f1b2564 100644
--- a/toolsrc/src/commands_remove.cpp
+++ b/toolsrc/src/commands_remove.cpp
@@ -17,15 +17,21 @@ namespace vcpkg::Commands::Remove
     void remove_package(const VcpkgPaths& paths, const PackageSpec& spec, StatusParagraphs* status_db)
     {
         auto& fs = paths.get_filesystem();
-        StatusParagraph& pkg = **status_db->find(spec.name(), spec.triplet());
+        auto spghs = status_db->find_all(spec.name(), spec.triplet());
+        const auto core_pkg = **status_db->find(spec.name(), spec.triplet(), Strings::EMPTY);
 
-        pkg.want = Want::PURGE;
-        pkg.state = InstallState::HALF_INSTALLED;
-        write_update(paths, pkg);
+        for (auto&& spgh : spghs)
+        {
+            StatusParagraph& pkg = **spgh;
+            if (pkg.state != InstallState::INSTALLED) continue;
+            pkg.want = Want::PURGE;
+            pkg.state = InstallState::HALF_INSTALLED;
+            write_update(paths, pkg);
+        }
 
-        auto maybe_lines = fs.read_lines(paths.listfile_path(pkg.package));
+        auto maybe_lines = fs.read_lines(paths.listfile_path(core_pkg.package));
 
-        if (auto lines = maybe_lines.get())
+        if (const auto lines = maybe_lines.get())
         {
             std::vector<fs::path> dirs_touched;
             for (auto&& suffix : *lines)
@@ -36,7 +42,7 @@ namespace vcpkg::Commands::Remove
 
                 auto target = paths.installed / suffix;
 
-                auto status = fs.status(target, ec);
+                const auto status = fs.status(target, ec);
                 if (ec)
                 {
                     System::println(System::Color::error, "failed: %s", ec.message());
@@ -66,7 +72,7 @@ namespace vcpkg::Commands::Remove
             }
 
             auto b = dirs_touched.rbegin();
-            auto e = dirs_touched.rend();
+            const auto e = dirs_touched.rend();
             for (; b != e; ++b)
             {
                 if (fs.is_empty(*b))
@@ -80,20 +86,25 @@ namespace vcpkg::Commands::Remove
                 }
             }
 
-            fs.remove(paths.listfile_path(pkg.package));
+            fs.remove(paths.listfile_path(core_pkg.package));
         }
 
-        pkg.state = InstallState::NOT_INSTALLED;
-        write_update(paths, pkg);
+        for (auto&& spgh : spghs)
+        {
+            StatusParagraph& pkg = **spgh;
+            if (pkg.state != InstallState::HALF_INSTALLED) continue;
+            pkg.state = InstallState::NOT_INSTALLED;
+            write_update(paths, pkg);
+        }
     }
 
     static void print_plan(const std::map<RemovePlanType, std::vector<const RemovePlanAction*>>& group_by_plan_type)
     {
-        static constexpr std::array<RemovePlanType, 2> order = {RemovePlanType::NOT_INSTALLED, RemovePlanType::REMOVE};
+        static constexpr std::array<RemovePlanType, 2> ORDER = {RemovePlanType::NOT_INSTALLED, RemovePlanType::REMOVE};
 
-        for (const RemovePlanType plan_type : order)
+        for (const RemovePlanType plan_type : ORDER)
         {
-            auto it = group_by_plan_type.find(plan_type);
+            const auto it = group_by_plan_type.find(plan_type);
             if (it == group_by_plan_type.cend())
             {
                 continue;
@@ -118,6 +129,37 @@ namespace vcpkg::Commands::Remove
         }
     }
 
+    void perform_remove_plan_action(const VcpkgPaths& paths,
+                                    const RemovePlanAction& action,
+                                    const Purge purge,
+                                    StatusParagraphs& status_db)
+    {
+        const std::string display_name = action.spec.to_string();
+
+        switch (action.plan_type)
+        {
+            case RemovePlanType::NOT_INSTALLED:
+                System::println(System::Color::success, "Package %s is not installed", display_name);
+                break;
+            case RemovePlanType::REMOVE:
+                System::println("Removing package %s... ", display_name);
+                remove_package(paths, action.spec, &status_db);
+                System::println(System::Color::success, "Removing package %s... done", display_name);
+                break;
+            case RemovePlanType::UNKNOWN:
+            default: Checks::unreachable(VCPKG_LINE_INFO);
+        }
+
+        if (purge == Purge::YES)
+        {
+            System::println("Purging package %s... ", display_name);
+            Files::Filesystem& fs = paths.get_filesystem();
+            std::error_code ec;
+            fs.remove_all(paths.packages / action.spec.dir(), ec);
+            System::println(System::Color::success, "Purging package %s... done", display_name);
+        }
+    }
+
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
     {
         static const std::string OPTION_PURGE = "--purge";
@@ -125,7 +167,7 @@ namespace vcpkg::Commands::Remove
         static const std::string OPTION_RECURSE = "--recurse";
         static const std::string OPTION_DRY_RUN = "--dry-run";
         static const std::string OPTION_OUTDATED = "--outdated";
-        static const std::string example =
+        static const std::string EXAMPLE =
             Commands::Help::create_example_string("remove zlib zlib:x64-windows curl boost");
         const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments(
             {OPTION_PURGE, OPTION_NO_PURGE, OPTION_RECURSE, OPTION_DRY_RUN, OPTION_OUTDATED});
@@ -134,37 +176,38 @@ namespace vcpkg::Commands::Remove
         std::vector<PackageSpec> specs;
         if (options.find(OPTION_OUTDATED) != options.cend())
         {
-            args.check_exact_arg_count(0, example);
+            args.check_exact_arg_count(0, EXAMPLE);
             specs = Util::fmap(Update::find_outdated_packages(paths, status_db),
                                [](auto&& outdated) { return outdated.spec; });
 
             if (specs.empty())
             {
-                System::println(System::Color::success, "There are no oudated packages.");
+                System::println(System::Color::success, "There are no outdated packages.");
                 Checks::exit_success(VCPKG_LINE_INFO);
             }
         }
         else
         {
-            args.check_min_arg_count(1, example);
+            args.check_min_arg_count(1, EXAMPLE);
             specs = Util::fmap(args.command_arguments, [&](auto&& arg) {
-                return Input::check_and_get_package_spec(arg, default_triplet, example);
+                return Input::check_and_get_package_spec(arg, default_triplet, EXAMPLE);
             });
 
             for (auto&& spec : specs)
                 Input::check_triplet(spec.triplet(), paths);
         }
 
-        const bool alsoRemoveFolderFromPackages = options.find(OPTION_NO_PURGE) == options.end();
-        if (options.find(OPTION_PURGE) != options.end() && !alsoRemoveFolderFromPackages)
+        const bool no_purge_was_passed = options.find(OPTION_NO_PURGE) != options.end();
+        const bool purge_was_passed = options.find(OPTION_PURGE) != options.end();
+        if (purge_was_passed && no_purge_was_passed)
         {
-            // User specified --purge and --no-purge
             System::println(System::Color::error, "Error: cannot specify both --no-purge and --purge.");
-            System::print(example);
+            System::print(EXAMPLE);
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
-        const bool isRecursive = options.find(OPTION_RECURSE) != options.cend();
-        const bool dryRun = options.find(OPTION_DRY_RUN) != options.cend();
+        const Purge purge = to_purge(purge_was_passed || !no_purge_was_passed);
+        const bool is_recursive = options.find(OPTION_RECURSE) != options.cend();
+        const bool dry_run = options.find(OPTION_DRY_RUN) != options.cend();
 
         const std::vector<RemovePlanAction> remove_plan = Dependencies::create_remove_plan(specs, status_db);
         Checks::check_exit(VCPKG_LINE_INFO, !remove_plan.empty(), "Remove plan cannot be empty");
@@ -183,7 +226,7 @@ namespace vcpkg::Commands::Remove
             System::println(System::Color::warning,
                             "Additional packages (*) need to be removed to complete this operation.");
 
-            if (!isRecursive)
+            if (!is_recursive)
             {
                 System::println(System::Color::warning,
                                 "If you are sure you want to remove them, run the command with the --recurse option");
@@ -191,37 +234,14 @@ namespace vcpkg::Commands::Remove
             }
         }
 
-        if (dryRun)
+        if (dry_run)
         {
             Checks::exit_success(VCPKG_LINE_INFO);
         }
 
         for (const RemovePlanAction& action : remove_plan)
         {
-            const std::string display_name = action.spec.to_string();
-
-            switch (action.plan_type)
-            {
-                case RemovePlanType::NOT_INSTALLED:
-                    System::println(System::Color::success, "Package %s is not installed", display_name);
-                    break;
-                case RemovePlanType::REMOVE:
-                    System::println("Removing package %s... ", display_name);
-                    remove_package(paths, action.spec, &status_db);
-                    System::println(System::Color::success, "Removing package %s... done", display_name);
-                    break;
-                case RemovePlanType::UNKNOWN:
-                default: Checks::unreachable(VCPKG_LINE_INFO);
-            }
-
-            if (alsoRemoveFolderFromPackages)
-            {
-                System::println("Purging package %s... ", display_name);
-                Files::Filesystem& fs = paths.get_filesystem();
-                std::error_code ec;
-                fs.remove_all(paths.packages / action.spec.dir(), ec);
-                System::println(System::Color::success, "Purging package %s... done", display_name);
-            }
+            perform_remove_plan_action(paths, action, purge, status_db);
         }
 
         Checks::exit_success(VCPKG_LINE_INFO);