From efaffaa9d1de38efecb718aa7a99ba1f2e342ade Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 16 Apr 2020 13:46:37 +0200
Subject: Use Logger::stdout()

(cherry picked from commit 8f41847394524fcac40d3b5620139ca7e94a18e3)
---
 src/nix/ls.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/nix/ls.cc')

diff --git a/src/nix/ls.cc b/src/nix/ls.cc
index 3ef1f2750..8590199d7 100644
--- a/src/nix/ls.cc
+++ b/src/nix/ls.cc
@@ -34,16 +34,14 @@ struct MixLs : virtual Args, MixJSON
                         (st.isExecutable ? "-r-xr-xr-x" : "-r--r--r--") :
                     st.type == FSAccessor::Type::tSymlink ? "lrwxrwxrwx" :
                     "dr-xr-xr-x";
-                std::cout <<
-                    (format("%s %20d %s") % tp % st.fileSize % relPath);
+                auto line = fmt("%s %20d %s", tp, st.fileSize, relPath);
                 if (st.type == FSAccessor::Type::tSymlink)
-                    std::cout << " -> " << accessor->readLink(curPath)
-                    ;
-                std::cout << "\n";
+                    line += " -> " + accessor->readLink(curPath);
+                logger->stdout(line);
                 if (recursive && st.type == FSAccessor::Type::tDirectory)
                     doPath(st, curPath, relPath, false);
             } else {
-                std::cout << relPath << "\n";
+                logger->stdout(relPath);
                 if (recursive) {
                     auto st = accessor->stat(curPath);
                     if (st.type == FSAccessor::Type::tDirectory)
-- 
cgit v1.2.3


From 7afcb5af988eb0ce73c9916b809f8528dfb14c0f Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Wed, 29 Apr 2020 18:42:19 +0200
Subject: Remove the `drain` argument from `readFile`

Now it is always `drain` (see previous commit).
---
 src/nix/ls.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nix/ls.cc')

diff --git a/src/nix/ls.cc b/src/nix/ls.cc
index 8590199d7..ee308a6ec 100644
--- a/src/nix/ls.cc
+++ b/src/nix/ls.cc
@@ -136,7 +136,7 @@ struct CmdLsNar : Command, MixLs
 
     void run() override
     {
-        list(makeNarAccessor(make_ref<std::string>(readFile(narPath, true))));
+        list(makeNarAccessor(make_ref<std::string>(readFile(narPath))));
     }
 };
 
-- 
cgit v1.2.3


From f132d82a796c91fcb741c127f37c963622b4cae4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 5 May 2020 15:18:23 +0200
Subject: nix --help: Group commands

---
 src/nix/ls.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/nix/ls.cc')

diff --git a/src/nix/ls.cc b/src/nix/ls.cc
index 8590199d7..6ae4df27e 100644
--- a/src/nix/ls.cc
+++ b/src/nix/ls.cc
@@ -100,9 +100,11 @@ struct CmdLsStore : StoreCommand, MixLs
 
     std::string description() override
     {
-        return "show information about a store path";
+        return "show information about a path in the Nix store";
     }
 
+    Category category() override { return catUtility; }
+
     void run(ref<Store> store) override
     {
         list(store->getFSAccessor());
@@ -131,9 +133,11 @@ struct CmdLsNar : Command, MixLs
 
     std::string description() override
     {
-        return "show information about the contents of a NAR file";
+        return "show information about a path inside a NAR file";
     }
 
+    Category category() override { return catUtility; }
+
     void run() override
     {
         list(makeNarAccessor(make_ref<std::string>(readFile(narPath, true))));
-- 
cgit v1.2.3