From 98b85b2166736f08ae7e4a5e0014e92c8c79ebf7 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 30 May 2024 18:19:22 +0200
Subject: [PATCH] nix/main: Add AliasStatus::{Deprecated,AcceptedShorthand}

---
 src/nix/main.cc | 68 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/nix/main.cc b/src/nix/main.cc
index 541d1a1b3..3602402ae 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -42,6 +42,19 @@ void chrootHelper(int argc, char * * argv);
 
 namespace nix {
 
+enum struct AliasStatus {
+    /** Aliases that don't go away */
+    AcceptedShorthand,
+    /** Aliases that will go away */
+    Deprecated,
+};
+
+/** An alias, except for the original syntax, which is in the map key. */
+struct AliasInfo {
+    AliasStatus status;
+    std::vector<std::string> replacement;
+};
+
 /* Check if we have a non-loopback/link-local network interface. */
 static bool haveInternet()
 {
@@ -134,29 +147,29 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs, virtual RootArgs
         });
     }
 
-    std::map<std::string, std::vector<std::string>> aliases = {
-        {"add-to-store", {"store", "add-path"}},
-        {"cat-nar", {"nar", "cat"}},
-        {"cat-store", {"store", "cat"}},
-        {"copy-sigs", {"store", "copy-sigs"}},
-        {"dev-shell", {"develop"}},
-        {"diff-closures", {"store", "diff-closures"}},
-        {"dump-path", {"store", "dump-path"}},
-        {"hash-file", {"hash", "file"}},
-        {"hash-path", {"hash", "path"}},
-        {"ls-nar", {"nar", "ls"}},
-        {"ls-store", {"store", "ls"}},
-        {"make-content-addressable", {"store", "make-content-addressed"}},
-        {"optimise-store", {"store", "optimise"}},
-        {"ping-store", {"store", "ping"}},
-        {"sign-paths", {"store", "sign"}},
-        {"show-derivation", {"derivation", "show"}},
-        {"show-config", {"config", "show"}},
-        {"to-base16", {"hash", "to-base16"}},
-        {"to-base32", {"hash", "to-base32"}},
-        {"to-base64", {"hash", "to-base64"}},
-        {"verify", {"store", "verify"}},
-        {"doctor", {"config", "check"}},
+    std::map<std::string, AliasInfo> aliases = {
+        {"add-to-store", { AliasStatus::Deprecated, {"store", "add-path"}}},
+        {"cat-nar", { AliasStatus::Deprecated, {"nar", "cat"}}},
+        {"cat-store", { AliasStatus::Deprecated, {"store", "cat"}}},
+        {"copy-sigs", { AliasStatus::Deprecated, {"store", "copy-sigs"}}},
+        {"dev-shell", { AliasStatus::Deprecated, {"develop"}}},
+        {"diff-closures", { AliasStatus::Deprecated, {"store", "diff-closures"}}},
+        {"dump-path", { AliasStatus::Deprecated, {"store", "dump-path"}}},
+        {"hash-file", { AliasStatus::Deprecated, {"hash", "file"}}},
+        {"hash-path", { AliasStatus::Deprecated, {"hash", "path"}}},
+        {"ls-nar", { AliasStatus::Deprecated, {"nar", "ls"}}},
+        {"ls-store", { AliasStatus::Deprecated, {"store", "ls"}}},
+        {"make-content-addressable", { AliasStatus::Deprecated, {"store", "make-content-addressed"}}},
+        {"optimise-store", { AliasStatus::Deprecated, {"store", "optimise"}}},
+        {"ping-store", { AliasStatus::Deprecated, {"store", "ping"}}},
+        {"sign-paths", { AliasStatus::Deprecated, {"store", "sign"}}},
+        {"show-derivation", { AliasStatus::Deprecated, {"derivation", "show"}}},
+        {"show-config", { AliasStatus::Deprecated, {"config", "show"}}},
+        {"to-base16", { AliasStatus::Deprecated, {"hash", "to-base16"}}},
+        {"to-base32", { AliasStatus::Deprecated, {"hash", "to-base32"}}},
+        {"to-base64", { AliasStatus::Deprecated, {"hash", "to-base64"}}},
+        {"verify", { AliasStatus::Deprecated, {"store", "verify"}}},
+        {"doctor", { AliasStatus::Deprecated, {"config", "check"}}},
     };
 
     bool aliasUsed = false;
@@ -167,10 +180,13 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs, virtual RootArgs
         auto arg = *pos;
         auto i = aliases.find(arg);
         if (i == aliases.end()) return pos;
-        warn("'%s' is a deprecated alias for '%s'",
-            arg, concatStringsSep(" ", i->second));
+        auto & info = i->second;
+        if (info.status == AliasStatus::Deprecated) {
+            warn("'%s' is a deprecated alias for '%s'",
+                arg, concatStringsSep(" ", info.replacement));
+        }
         pos = args.erase(pos);
-        for (auto j = i->second.rbegin(); j != i->second.rend(); ++j)
+        for (auto j = info.replacement.rbegin(); j != info.replacement.rend(); ++j)
             pos = args.insert(pos, *j);
         aliasUsed = true;
         return pos;