From 0e47ea372ec99284ec5764495e5a099d5608e38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@tweag.io>
Date: Wed, 15 Nov 2023 09:23:26 +0100
Subject: [PATCH] Add a new `nix store add` command

Deprecate `nix store add-file` and `nix store add-path`, and replace
them with a single `nix store add` command.
---
 src/nix/add-file.md     | 28 --------------------
 src/nix/add-path.md     |  2 +-
 src/nix/add-to-store.cc | 58 +++++++++++++++++++++++++++++------------
 tests/functional/add.sh | 17 ++++++++++++
 4 files changed, 60 insertions(+), 45 deletions(-)
 delete mode 100644 src/nix/add-file.md

diff --git a/src/nix/add-file.md b/src/nix/add-file.md
deleted file mode 100644
index ed237a035004..000000000000
--- a/src/nix/add-file.md
+++ /dev/null
@@ -1,28 +0,0 @@
-R""(
-
-# Description
-
-Copy the regular file *path* to the Nix store, and print the resulting
-store path on standard output.
-
-> **Warning**
->
-> The resulting store path is not registered as a garbage
-> collector root, so it could be deleted before you have a
-> chance to register it.
-
-# Examples
-
-Add a regular file to the store:
-
-```console
-# echo foo > bar
-
-# nix store add-file ./bar
-/nix/store/cbv2s4bsvzjri77s2gb8g8bpcb6dpa8w-bar
-
-# cat /nix/store/cbv2s4bsvzjri77s2gb8g8bpcb6dpa8w-bar
-foo
-```
-
-)""
diff --git a/src/nix/add-path.md b/src/nix/add-path.md
index 87473611df4d..d38cd21d87f6 100644
--- a/src/nix/add-path.md
+++ b/src/nix/add-path.md
@@ -19,7 +19,7 @@ Add a directory to the store:
 # mkdir dir
 # echo foo > dir/bar
 
-# nix store add-path ./dir
+# nix store add ./dir
 /nix/store/6pmjx56pm94n66n4qw1nff0y1crm8nqg-dir
 
 # cat /nix/store/6pmjx56pm94n66n4qw1nff0y1crm8nqg-dir/bar
diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc
index 39e5cc99dd2f..921dbc92bf1d 100644
--- a/src/nix/add-to-store.cc
+++ b/src/nix/add-to-store.cc
@@ -5,11 +5,22 @@
 
 using namespace nix;
 
+static FileIngestionMethod parseIngestionMethod(std::string_view input)
+{
+    if (input == "flat") {
+        return FileIngestionMethod::Flat;
+    } else if (input == "nar") {
+        return FileIngestionMethod::Recursive;
+    } else {
+        throw UsageError("Unknown hash mode '%s', expect `flat` or `nar`");
+    }
+}
+
 struct CmdAddToStore : MixDryRun, StoreCommand
 {
     Path path;
     std::optional<std::string> namePart;
-    FileIngestionMethod ingestionMethod;
+    FileIngestionMethod ingestionMethod = FileIngestionMethod::Recursive;
 
     CmdAddToStore()
     {
@@ -23,6 +34,23 @@ struct CmdAddToStore : MixDryRun, StoreCommand
             .labels = {"name"},
             .handler = {&namePart},
         });
+
+        addFlag({
+            .longName  = "mode",
+            .shortName = 'n',
+            .description = R"(
+    How to compute the hash of the input.
+    One of:
+
+    - `nar` (the default): Serialises the input as an archive (following the [_Nix Archive Format_](https://edolstra.github.io/pubs/phd-thesis.pdf#page=101)) and passes that to the hash function.
+
+    - `flat`: Assumes that the input is directly a single file and directly passes it to the hash function;
+            )",
+            .labels = {"hash-mode"},
+            .handler = {[this](std::string s) {
+                this->ingestionMethod = parseIngestionMethod(s);
+            }},
+        });
     }
 
     void run(ref<Store> store) override
@@ -62,45 +90,43 @@ struct CmdAddToStore : MixDryRun, StoreCommand
     }
 };
 
-struct CmdAddFile : CmdAddToStore
+struct CmdAdd : CmdAddToStore
 {
-    CmdAddFile()
-    {
-        ingestionMethod = FileIngestionMethod::Flat;
-    }
 
     std::string description() override
     {
-        return "add a regular file to the Nix store";
+        return "Add a file or directory to the Nix store";
     }
 
     std::string doc() override
     {
         return
-          #include "add-file.md"
+          #include "add-path.md"
           ;
     }
 };
 
-struct CmdAddPath : CmdAddToStore
+struct CmdAddFile : CmdAddToStore
 {
-    CmdAddPath()
+    CmdAddFile()
     {
-        ingestionMethod = FileIngestionMethod::Recursive;
+        ingestionMethod = FileIngestionMethod::Flat;
     }
 
     std::string description() override
     {
-        return "add a path to the Nix store";
+        return "Deprecated. Use [`nix store add --mode flat`](@docroot@/command-ref/new-cli/nix3-store-add.md) instead.";
     }
+};
 
-    std::string doc() override
+struct CmdAddPath : CmdAddToStore
+{
+    std::string description() override
     {
-        return
-          #include "add-path.md"
-          ;
+        return "Deprecated alias to [`nix store add`](@docroot@/command-ref/new-cli/nix3-store-add.md).";
     }
 };
 
 static auto rCmdAddFile = registerCommand2<CmdAddFile>({"store", "add-file"});
 static auto rCmdAddPath = registerCommand2<CmdAddPath>({"store", "add-path"});
+static auto rCmdAdd = registerCommand2<CmdAdd>({"store", "add"});
diff --git a/tests/functional/add.sh b/tests/functional/add.sh
index 5c3eed7931a0..d0fedcb251cf 100644
--- a/tests/functional/add.sh
+++ b/tests/functional/add.sh
@@ -26,3 +26,20 @@ hash2=$(nix-hash --type sha256 --base32 ./dummy)
 echo $hash2
 
 test "$hash1" = "sha256:$hash2"
+
+#### New style commands
+
+clearStore
+
+(
+    path1=$(nix store add ./dummy)
+    path2=$(nix store add --mode nar ./dummy)
+    path3=$(nix store add-path ./dummy)
+    [[ "$path1" == "$path2" ]]
+    [[ "$path1" == "$path3" ]]
+)
+(
+    path1=$(nix store add --mode flat ./dummy)
+    path2=$(nix store add-file ./dummy)
+    [[ "$path1" == "$path2" ]]
+)