deprecate cd, up, reset-root, add find-in

also hides unimplemented `update.builtins`

removing some unnecessary `cd`s from these files produced different slurp output,
because we are no longer moving away to typecheck, meaning different names are in scope at slurp time
- propagate.md
- sum-type-update-conflicts.md

similarly, in `todo.md` it shifted the hashes for the same reason

Author: aryairani

scripts/check.sh

@@ -6,4 +6,4 @@ true \
   && stack exec transcripts \
   && stack exec unison transcript unison-src/transcripts-round-trip/main.md \
   && stack exec unison transcript unison-src/transcripts-manual/rewrites.md \
-  && stack exec integration-tests
+  && stack exec cli-integration-tests

unison-cli/src/Unison/Codebase/Editor/HandleInput.hs

@@ -1437,6 +1437,12 @@ handleFindI isVerbose fscope ws input = do
       -- results may contain things in lib.
       pped <- Cli.currentPrettyPrintEnvDecl
       pure (pped, names)
+    FindLocalSubnamespace p -> do
+      path <- Cli.resolvePath p
+      branch0 <- Cli.getBranch0At path
+      let names = Branch.toNames branch0
+      pped <- Cli.currentPrettyPrintEnvDecl
+      pure (pped, names)
     FindLocalAndDeps -> do
       let names = Branch.toNames (Branch.withoutTransitiveLibs currentBranch0)
       -- Don't exclude anything from the pretty printer, since the type signatures we print for

unison-cli/src/Unison/Codebase/Editor/Input.hs

@@ -35,7 +35,7 @@ import Data.These (These)
 import U.Codebase.HashTags (CausalHash)
 import Unison.Codebase.Branch.Merge qualified as Branch
 import Unison.Codebase.Editor.RemoteRepo (ReadRemoteNamespace, WriteGitRepo, WriteRemoteNamespace)
-import Unison.Codebase.Path (Path')
+import Unison.Codebase.Path (Path, Path')
 import Unison.Codebase.Path qualified as Path
 import Unison.Codebase.Path.Parse qualified as Path
 import Unison.Codebase.PushBehavior (PushBehavior)
@@ -315,6 +315,7 @@ data OutputLocation
 data FindScope
   = FindLocal
   | FindLocalAndDeps
+  | FindLocalSubnamespace Path
   | FindGlobal
   deriving stock (Eq, Show)
 

unison-cli/src/Unison/CommandLine/InputPatterns.hs

@@ -30,7 +30,7 @@ import Unison.Cli.ProjectUtils qualified as ProjectUtils
 import Unison.Codebase (Codebase)
 import Unison.Codebase qualified as Codebase
 import Unison.Codebase.Branch.Merge qualified as Branch
-import Unison.Codebase.Editor.Input (DeleteOutput (..), DeleteTarget (..), Input)
+import Unison.Codebase.Editor.Input (DeleteOutput (..), DeleteTarget (..), FindScope (FindLocalSubnamespace), Input)
 import Unison.Codebase.Editor.Input qualified as Input
 import Unison.Codebase.Editor.Output.PushPull (PushPull (Pull, Push))
 import Unison.Codebase.Editor.Output.PushPull qualified as PushPull
@@ -124,7 +124,7 @@ updateBuiltins =
   InputPattern
     "builtins.update"
     []
-    I.Visible
+    I.Hidden
     []
     ( "Adds all the builtins that are missing from this namespace, "
         <> "and deprecate the ones that don't exist in this version of Unison."
@@ -597,32 +597,55 @@ findAll = find' "find.all" Input.FindLocalAndDeps
 findGlobal :: InputPattern
 findGlobal = find' "find.global" Input.FindGlobal
 
+findIn :: InputPattern
+findIn =
+  InputPattern
+    "find-in"
+    []
+    I.Visible
+    [("namespace", Required, namespaceArg)]
+    findHelp
+    \case
+      p : args -> first P.text do
+        p <- Path.parsePath p
+        pure (Input.FindI False (FindLocalSubnamespace p) args)
+      _ -> Left (I.help updateIn)
+
+findHelp :: P.Pretty CT.ColorText
+findHelp =
+  ( P.wrapColumn2
+      [ ("`find`", "lists all definitions in the current namespace."),
+        ( "`find foo`",
+          "lists all definitions with a name similar to 'foo' in the current "
+            <> "namespace (excluding those under 'lib')."
+        ),
+        ( "`find foo bar`",
+          "lists all definitions with a name similar to 'foo' or 'bar' in the "
+            <> "current namespace (excluding those under 'lib')."
+        ),
+        ("`find-in namespace`", "lists all definitions in the specified subnamespace."),
+        ( "`find-in namespace foo bar`",
+          "lists all definitions with a name similar to 'foo' or 'bar' in the "
+            <> "specified subnamespace."
+        ),
+        ( "find.all foo",
+          "lists all definitions with a name similar to 'foo' in the current "
+            <> "namespace (including one level of 'lib')."
+        ),
+        ( "find.global foo",
+          "lists all definitions with a name similar to 'foo' in any namespace"
+        )
+      ]
+  )
+
 find' :: String -> Input.FindScope -> InputPattern
 find' cmd fscope =
   InputPattern
     cmd
     []
     I.Visible
     [("query", ZeroPlus, exactDefinitionArg)]
-    ( P.wrapColumn2
-        [ ("`find`", "lists all definitions in the current namespace."),
-          ( "`find foo`",
-            "lists all definitions with a name similar to 'foo' in the current "
-              <> "namespace (excluding those under 'lib')."
-          ),
-          ( "`find foo bar`",
-            "lists all definitions with a name similar to 'foo' or 'bar' in the "
-              <> "current namespace (excluding those under 'lib')."
-          ),
-          ( "find.all foo",
-            "lists all definitions with a name similar to 'foo' in the current "
-              <> "namespace (including one level of 'lib')."
-          ),
-          ( "find.global foo",
-            "lists all definitions with a name similar to 'foo' in any namespace"
-          )
-        ]
-    )
+    findHelp
     (pure . Input.FindI False fscope)
 
 findShallow :: InputPattern
@@ -968,11 +991,11 @@ aliasMany =
 up :: InputPattern
 up =
   InputPattern
-    "up"
+    "deprecated.up"
     []
     I.Visible
     []
-    (P.wrapColumn2 [(makeExample up [], "move current path up one level")])
+    (P.wrapColumn2 [(makeExample up [], "move current path up one level (deprecated)")])
     ( \case
         [] -> Right Input.UpI
         _ -> Left (I.help up)
@@ -981,12 +1004,12 @@ up =
 cd :: InputPattern
 cd =
   InputPattern
-    "namespace"
-    ["cd", "j"]
+    "deprecated.cd"
+    ["deprecated.namespace"]
     I.Visible
     [("namespace", Required, namespaceArg)]
     ( P.lines
-        [ "Moves your perspective to a different namespace.",
+        [ "Moves your perspective to a different namespace. Deprecated for now because too many important things depend on your perspective selection.",
           "",
           P.wrapColumn2
             [ ( makeExample cd ["foo.bar"],
@@ -1020,7 +1043,7 @@ back =
     []
     ( P.wrapColumn2
         [ ( makeExample back [],
-            "undoes the last" <> makeExample' cd <> "command."
+            "undoes the last" <> makeExample' projectSwitch <> "or" <> makeExample' cd <> "command."
           )
         ]
     )
@@ -1231,17 +1254,20 @@ reset =
 resetRoot :: InputPattern
 resetRoot =
   InputPattern
-    "reset-root"
+    "deprecated.reset-root"
     []
     I.Visible
     [("namespace or hash to reset to", Required, namespaceArg)]
-    ( P.wrapColumn2
-        [ ( makeExample resetRoot [".foo"],
-            "Reset the root namespace (along with its history) to that of the `.foo` namespace."
-          ),
-          ( makeExample resetRoot ["#9dndk3kbsk13nbpeu"],
-            "Reset the root namespace (along with its history) to that of the namespace with hash `#9dndk3kbsk13nbpeu`."
-          )
+    ( P.lines
+        [ "Deprecated because it's not compatible with the introduction of projects.",
+          P.wrapColumn2
+            [ ( makeExample resetRoot [".foo"],
+                "Reset the root namespace (along with its history) to that of the `.foo` namespace. Deprecated"
+              ),
+              ( makeExample resetRoot ["#9dndk3kbsk13nbpeu"],
+                "Reset the root namespace (along with its history) to that of the namespace with hash `#9dndk3kbsk13nbpeu`."
+              )
+            ]
         ]
     )
     \case
@@ -2982,6 +3008,7 @@ validInputs =
       editNamespace,
       execute,
       find,
+      findIn,
       findAll,
       findGlobal,
       findPatch,

unison-cli/src/Unison/CommandLine/OutputMessages.hs

@@ -971,8 +971,8 @@ notifyUser dir = \case
     pure . P.warnCallout . P.lines $
       [ "Are you sure you want to clear away everything?",
         "You could use "
-          <> IP.makeExample' IP.cd
-          <> " to switch to a new namespace instead."
+          <> IP.makeExample' IP.projectCreate
+          <> " to switch to a new project instead."
       ]
   DeleteBranchConfirmation _uniqueDeletions -> error "todo"
   -- let

unison-cli/tests/Unison/Test/GitSync.hs

@@ -286,7 +286,7 @@ test =
                       ```ucm
                       .> pull git(${repo})
                       .> history
-                      .> reset-root #l43v9nr16v
+                      .> deprecated.reset-root #l43v9nr16v
                       .> history
                       ```
                   |] -- Not sure why this hash is here.

unison-src/transcripts-using-base/_base.md

@@ -12,7 +12,6 @@ transcripts which contain less boilerplate.
 ```ucm:hide
 .> builtins.merge
 .> builtins.mergeio
-.> cd builtin
 .> load unison-src/transcripts-using-base/base.u
 .> add
 ```
@@ -55,4 +54,3 @@ testAutoClean _ =
 .> add
 .> io.test testAutoClean
 ```
-

unison-src/transcripts-using-base/binary-encoding-nats.md

@@ -2,7 +2,6 @@
 ```ucm:hide
 .> builtins.merge
 .> builtins.mergeio
-.> cd builtin
 .> load unison-src/transcripts-using-base/base.u
 .> add
 .> find

unison-src/transcripts-using-base/hashing.md

@@ -2,7 +2,6 @@
 
 ```ucm:hide
 .> builtins.merge
-.> cd builtin
 ```
 
 Unison has cryptographic builtins for hashing and computing [HMACs](https://en.wikipedia.org/wiki/HMAC) (hash-based message authentication codes). This transcript shows their usage and has some test cases.
@@ -48,8 +47,7 @@ ex5 = crypto.hmac Sha2_256 mysecret f |> hex
 And here's the full API:
 
 ```ucm
-.builtin.crypto> find
-.> cd .
+.> find-in builtin.crypto
 ```
 
 Note that the universal versions of `hash` and `hmac` are currently unimplemented and will bomb at runtime:
@@ -263,4 +261,3 @@ test> md5.tests.ex3 =
 ```ucm
 .> test
 ```
-

unison-src/transcripts-using-base/hashing.output.md

@@ -120,18 +120,18 @@ ex5 = crypto.hmac Sha2_256 mysecret f |> hex
 And here's the full API:
 
 ```ucm
-.builtin.crypto> find
+.> find-in builtin.crypto
 
   1.  type CryptoFailure
-  2.  Ed25519.sign.impl : ##Bytes
-                          -> ##Bytes
-                          -> ##Bytes
-                          -> #0o7mf021fo #r29dja8j9d ##Bytes
-  3.  Ed25519.verify.impl : ##Bytes
-                            -> ##Bytes
-                            -> ##Bytes
-                            -> #0o7mf021fo #r29dja8j9d ##Boolean
-  4.  hash : HashAlgorithm -> a -> ##Bytes
+  2.  Ed25519.sign.impl : Bytes
+                          -> Bytes
+                          -> Bytes
+                          -> Either Failure Bytes
+  3.  Ed25519.verify.impl : Bytes
+                            -> Bytes
+                            -> Bytes
+                            -> Either Failure Boolean
+  4.  hash : HashAlgorithm -> a -> Bytes
   5.  builtin type HashAlgorithm
   6.  HashAlgorithm.Blake2b_256 : HashAlgorithm
   7.  HashAlgorithm.Blake2b_512 : HashAlgorithm
@@ -142,13 +142,11 @@ And here's the full API:
   12. HashAlgorithm.Sha2_512 : HashAlgorithm
   13. HashAlgorithm.Sha3_256 : HashAlgorithm
   14. HashAlgorithm.Sha3_512 : HashAlgorithm
-  15. hashBytes : HashAlgorithm -> ##Bytes -> ##Bytes
-  16. hmac : HashAlgorithm -> ##Bytes -> a -> ##Bytes
-  17. hmacBytes : HashAlgorithm -> ##Bytes -> ##Bytes -> ##Bytes
+  15. hashBytes : HashAlgorithm -> Bytes -> Bytes
+  16. hmac : HashAlgorithm -> Bytes -> a -> Bytes
+  17. hmacBytes : HashAlgorithm -> Bytes -> Bytes -> Bytes
   
 
-.> cd .
-
 ```
 Note that the universal versions of `hash` and `hmac` are currently unimplemented and will bomb at runtime: