Merge remote-tracking branch 'origin/master' into flakes

3 files changed, 7 insertions, 2 deletions

diff --git a/src/libutil/args.cc b/src/libutil/args.cc
index 8667bd450..24b8ca66b 100644
--- a/src/libutil/args.cc
+++ b/src/libutil/args.cc
@@ -303,6 +303,10 @@ MultiCommand::MultiCommand(const Commands & commands)
         .optional = true,
         .handler = {[=](std::string s) {
             assert(!command);
+            if (auto alias = get(deprecatedAliases, s)) {
+                warn("'%s' is a deprecated alias for '%s'", s, *alias);
+                s = *alias;
+            }
             if (auto prefix = needsCompletion(s)) {
                 for (auto & [name, command] : commands)
                     if (hasPrefix(name, *prefix))
diff --git a/src/libutil/args.hh b/src/libutil/args.hh
index 405ec3d47..59541df99 100644
--- a/src/libutil/args.hh
+++ b/src/libutil/args.hh
@@ -248,6 +248,8 @@ public:
 
     std::map<Command::Category, std::string> categories;
 
+    std::map<std::string, std::string> deprecatedAliases;
+
     // Selected command, if any.
     std::optional<std::pair<std::string, ref<Command>>> command;
 
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 52ca804a0..194a3ed4a 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -463,8 +463,7 @@ string base64Encode(const string & s);
 string base64Decode(const string & s);
 
 
-/* Get a value for the specified key from an associate container, or a
-   default value if the key doesn't exist. */
+/* Get a value for the specified key from an associate container. */
 template <class T>
 std::optional<typename T::mapped_type> get(const T & map, const typename T::key_type & key)
 {