diff --git a/unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md b/unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md index 3e9f360894..5ba2e787e8 100644 --- a/unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md +++ b/unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md @@ -2,7 +2,9 @@ ``` ucm :hide scratch/main> builtins.mergeio lib.builtins + scratch/main> load ./unison-src/transcripts-using-base/base.u + scratch/main> add ``` @@ -34,7 +36,6 @@ main = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -58,5 +59,6 @@ scratch/main> add type MyBool main : '{IO, Exception} () resume : Request {g, Break} x -> x + scratch/main> compile main ./unison-cli-integration/integration-tests/IntegrationTests/main ``` diff --git a/unison-cli/src/Unison/Codebase/Transcript/Runner.hs b/unison-cli/src/Unison/Codebase/Transcript/Runner.hs index 523bc88c4a..54173d45be 100644 --- a/unison-cli/src/Unison/Codebase/Transcript/Runner.hs +++ b/unison-cli/src/Unison/Codebase/Transcript/Runner.hs @@ -176,30 +176,33 @@ run isTest verbosity dir codebase runtime sbRuntime nRuntime ucmVersion baseURL let patternMap = Map.fromList $ (\p -> (patternName p, p) : ((,p) <$> aliases p)) =<< validInputs let output' :: Bool -> Stanza -> IO () output' inputEcho msg = do - hide <- readIORef isHidden - unless (hideOutput inputEcho hide) $ modifyIORef' out (<> pure msg) + hide <- hideOutput inputEcho + unless hide $ modifyIORef' out (<> pure msg) - hideOutput :: Bool -> Hidden -> Bool - hideOutput inputEcho = \case + hideOutput' :: Bool -> Hidden -> Bool + hideOutput' inputEcho = \case Shown -> False HideOutput -> not inputEcho HideAll -> True + hideOutput :: Bool -> IO Bool + hideOutput inputEcho = hideOutput' inputEcho <$> readIORef isHidden + output, outputEcho :: Stanza -> IO () output = output' False outputEcho = output' True outputUcmLine :: UcmLine -> IO () - outputUcmLine line = modifyIORef' ucmOutput (<> pure line) + outputUcmLine line = do + prev <- readIORef ucmOutput + modifyIORef' ucmOutput (<> ((if not (null prev) then pure (UcmOutputLine "\n") else mempty) <> pure line)) outputUcmResult :: Pretty.Pretty Pretty.ColorText -> IO () outputUcmResult line = do - hide <- readIORef isHidden - unless (hideOutput False hide) $ + hide <- hideOutput False + unless hide $ -- We shorten the terminal width, because "Transcript" manages a 2-space indent for output lines. - modifyIORef' - ucmOutput - (<> pure (UcmOutputLine . Text.pack $ Pretty.toPlain (terminalWidth - 2) $ "\n" <> line)) + outputUcmLine . UcmOutputLine . Text.pack $ Pretty.toPlain (terminalWidth - 2) line maybeDieWithMsg :: String -> IO () maybeDieWithMsg msg = do @@ -210,7 +213,7 @@ run isTest verbosity dir codebase runtime sbRuntime nRuntime ucmVersion baseURL apiRequest :: APIRequest -> IO [APIRequest] apiRequest req = do - hide <- readIORef isHidden + hide <- hideOutput False case req of -- We just discard this, because the runner will produce new output lines. APIResponseLine {} -> pure [] @@ -222,7 +225,7 @@ run isTest verbosity dir codebase runtime sbRuntime nRuntime ucmVersion baseURL (([] <$) . maybeDieWithMsg . (("Error decoding response from " <> Text.unpack path <> ": ") <>)) ( \(v :: Aeson.Value) -> pure $ - if hide == HideOutput + if hide then [req] else [ req, diff --git a/unison-src/builtin-tests/interpreter-tests.output.md b/unison-src/builtin-tests/interpreter-tests.output.md index 0883bb1c2c..8f313d114f 100644 --- a/unison-src/builtin-tests/interpreter-tests.output.md +++ b/unison-src/builtin-tests/interpreter-tests.output.md @@ -6,7 +6,9 @@ Before merging the PR on Github, we'll merge your branch on Share and restore `r ``` ucm :hide:error scratch/main> this is a hack to trigger an error, in order to swallow any error on the next line. + scratch/main> we delete the project to avoid any merge conflicts or complaints from ucm. + scratch/main> delete.project runtime-tests ``` @@ -18,6 +20,7 @@ scratch/main> clone @unison/runtime-tests/releases/0.0.1 runtime-tests/selected runtime-tests/selected> run tests () + runtime-tests/selected> run tests.interpreter.only () diff --git a/unison-src/transcripts-manual/docs.to-html.output.md b/unison-src/transcripts-manual/docs.to-html.output.md index 6da8205455..45528703fa 100644 --- a/unison-src/transcripts-manual/docs.to-html.output.md +++ b/unison-src/transcripts-manual/docs.to-html.output.md @@ -16,7 +16,6 @@ some.outside = 3 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -44,5 +43,6 @@ test-html-docs/main> add some.ns.pretty.deeply.nested.doc : Doc2 some.outside : Nat some.outside.doc : Doc2 + test-html-docs/main> docs.to-html some.ns unison-src/transcripts-manual/docs.to-html ``` diff --git a/unison-src/transcripts-manual/rewrites.output.md b/unison-src/transcripts-manual/rewrites.output.md index 55aeec3932..3f0a21e692 100644 --- a/unison-src/transcripts-manual/rewrites.output.md +++ b/unison-src/transcripts-manual/rewrites.output.md @@ -1,6 +1,8 @@ ``` ucm :hide scratch/main> builtins.mergeio + scratch/main> load unison-src/transcripts-using-base/base.u + scratch/main> add ``` @@ -43,6 +45,7 @@ scratch/main> rewrite rule1 I found and replaced matches in these definitions: ex1 The rewritten file has been added to the top of scratch.u + scratch/main> rewrite eitherToOptional ☝️ @@ -115,6 +118,7 @@ rule2 x = @rewrite signature Optional ==> Optional2 ``` ucm :hide scratch/main> load + scratch/main> add ``` @@ -202,6 +206,7 @@ blah2 = 456 ``` ucm :hide scratch/main> load + scratch/main> add ``` @@ -239,7 +244,9 @@ sameFileEx = ``` ucm :hide scratch/main> rewrite rule + scratch/main> load + scratch/main> add ``` @@ -421,6 +428,7 @@ scratch/main> sfind findEitherEx 1. eitherEx Tip: Try `edit 1` to bring this into your scratch file. + scratch/main> sfind findEitherFailure 🔎 @@ -435,6 +443,7 @@ scratch/main> sfind findEitherFailure Tip: Try `edit 1` or `edit 1-5` to bring these into your scratch file. + scratch/main> find 1-5 1. Exception.catch : '{g, Exception} a ->{g} Either Failure a diff --git a/unison-src/transcripts-round-trip/main.output.md b/unison-src/transcripts-round-trip/main.output.md index 3e2572416e..967044686b 100644 --- a/unison-src/transcripts-round-trip/main.output.md +++ b/unison-src/transcripts-round-trip/main.output.md @@ -2,12 +2,15 @@ This transcript verifies that the pretty-printer produces code that can be succe ``` ucm :hide scratch/main> builtins.mergeio lib.builtins + scratch/a1> builtins.mergeio lib.builtins + scratch/a2> builtins.mergeio lib.builtins ``` ``` ucm :hide scratch/a1> load unison-src/transcripts-round-trip/reparses-with-same-hash.u + scratch/a1> add ``` @@ -16,7 +19,6 @@ x = () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -833,6 +835,7 @@ scratch/a2> load ``` ucm :hide scratch/a2> add + scratch/a2> delete.namespace.force lib.builtins ``` @@ -848,7 +851,9 @@ Now check that definitions in 'reparses.u' at least parse on round trip: ``` ucm :hide scratch/a3> builtins.mergeio lib.builtins + scratch/a3> load unison-src/transcripts-round-trip/reparses.u + scratch/a3> add ``` @@ -897,9 +902,13 @@ sloppyDocEval = ``` ucm :hide scratch/a3_new> builtins.mergeio lib.builtins + scratch/a3_new> load + scratch/a3_new> add + scratch/a3> delete.namespace.force lib.builtins + scratch/a3_new> delete.namespace.force lib.builtins ``` @@ -925,6 +934,7 @@ Regression test for https://github.com/unisonweb/unison/pull/3548 scratch/regressions> alias.term ##Nat.+ plus Done. + scratch/regressions> edit.new plus ☝️ @@ -933,6 +943,7 @@ scratch/regressions> edit.new plus You can edit them there, then run `update` to replace the definitions currently in this namespace. + scratch/regressions> load Loading changes detected in scratch.u. diff --git a/unison-src/transcripts-using-base/_base.output.md b/unison-src/transcripts-using-base/_base.output.md index c096ef5d74..52910967b2 100644 --- a/unison-src/transcripts-using-base/_base.output.md +++ b/unison-src/transcripts-using-base/_base.output.md @@ -11,7 +11,9 @@ transcripts which contain less boilerplate. ``` ucm :hide scratch/main> builtins.mergeio + scratch/main> load unison-src/transcripts-using-base/base.u + scratch/main> add ``` @@ -50,7 +52,6 @@ testAutoClean _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -68,6 +69,7 @@ scratch/main> add ⍟ I've added these definitions: testAutoClean : '{IO} [Result] + scratch/main> io.test testAutoClean New test results: diff --git a/unison-src/transcripts-using-base/binary-encoding-nats.output.md b/unison-src/transcripts-using-base/binary-encoding-nats.output.md index 265a56474b..e9c27c3b8f 100644 --- a/unison-src/transcripts-using-base/binary-encoding-nats.output.md +++ b/unison-src/transcripts-using-base/binary-encoding-nats.output.md @@ -54,7 +54,6 @@ testABunchOfNats _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -90,6 +89,7 @@ scratch/main> add testABunchOfNats : ∀ _. _ ->{IO} [Result] testNat : Nat -> '{IO, Stream Result} () testRoundTrip : Nat -> EncDec ->{IO, Stream Result} () + scratch/main> io.test testABunchOfNats New test results: diff --git a/unison-src/transcripts-using-base/codeops.output.md b/unison-src/transcripts-using-base/codeops.output.md index 16753f75ae..fa807df00f 100644 --- a/unison-src/transcripts-using-base/codeops.output.md +++ b/unison-src/transcripts-using-base/codeops.output.md @@ -152,7 +152,6 @@ swapped name link = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -316,7 +315,6 @@ badLoad _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -358,6 +356,7 @@ scratch/main> add rotate : Three Nat Nat Nat -> Three Nat Nat Nat tests : '{IO} [Result] zapper : Three Nat Nat Nat -> Request {Zap} r -> r + scratch/main> io.test tests New test results: @@ -379,6 +378,7 @@ scratch/main> io.test tests ✅ 13 test(s) passing Tip: Use view 1 to view the source of a test. + scratch/main> io.test badLoad New test results: @@ -427,7 +427,6 @@ codeTests = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -445,6 +444,7 @@ scratch/main> add ⍟ I've added these definitions: codeTests : '{IO} [Result] + scratch/main> io.test codeTests New test results: @@ -512,7 +512,6 @@ vtests _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -532,6 +531,7 @@ scratch/main> add validateTest : Link.Term ->{IO} Result vtests : '{IO} [Result] + scratch/main> io.test vtests New test results: diff --git a/unison-src/transcripts-using-base/doc.output.md b/unison-src/transcripts-using-base/doc.output.md index 420cbd8875..aca445303c 100644 --- a/unison-src/transcripts-using-base/doc.output.md +++ b/unison-src/transcripts-using-base/doc.output.md @@ -29,7 +29,6 @@ unique type time.DayOfWeek = Sun | Mon | Tue | Wed | Thu | Fri | Sat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -54,9 +53,11 @@ You can preview what docs will look like when rendered to the console using the scratch/main> display d1 Hello there Alice! + scratch/main> docs ImportantConstant An important constant, equal to `42` + scratch/main> docs DayOfWeek The 7 days of the week, defined as: @@ -131,6 +132,7 @@ scratch/main> view basicFormatting __Next up:__ {lists} }} + scratch/main> display basicFormatting # Basic formatting @@ -155,6 +157,7 @@ scratch/main> display basicFormatting documents. *Next up:* lists + scratch/main> view lists lists : Doc2 @@ -197,6 +200,7 @@ scratch/main> view lists 2. Take shower. 3. Get dressed. }} + scratch/main> display lists # Lists @@ -235,6 +239,7 @@ scratch/main> display lists * In this nested list. 2. Take shower. 3. Get dressed. + scratch/main> view evaluation evaluation : Doc2 @@ -269,6 +274,7 @@ scratch/main> view evaluation cube x = x * x * x ``` }} + scratch/main> display evaluation # Evaluation @@ -296,6 +302,7 @@ scratch/main> display evaluation use Nat * cube : Nat -> Nat cube x = x * x * x + scratch/main> view includingSource includingSource : Doc2 @@ -336,6 +343,7 @@ scratch/main> view includingSource so: ``sqr x``. This is equivalent to {{ docExample 1 do x -> sqr x }}. }} + scratch/main> display includingSource # Including Unison source code @@ -381,6 +389,7 @@ scratch/main> display includingSource * If your snippet expression is just a single function application, you can put it in double backticks, like so: `sqr x`. This is equivalent to `sqr x`. + scratch/main> view nonUnisonCodeBlocks nonUnisonCodeBlocks : Doc2 @@ -413,6 +422,7 @@ scratch/main> view nonUnisonCodeBlocks xs.foldLeft(Nil : List[A])((acc,a) => a +: acc) ``` }} + scratch/main> display nonUnisonCodeBlocks # Non-Unison code blocks @@ -441,6 +451,7 @@ scratch/main> display nonUnisonCodeBlocks def reverse[A](xs: List[A]) = xs.foldLeft(Nil : List[A])((acc,a) => a +: acc) ``` + scratch/main> view otherElements otherElements : Doc2 @@ -497,6 +508,7 @@ scratch/main> view otherElements , [{{ Some text }}, {{ More text }}, {{ Zounds! }}] ] }} }} + scratch/main> display otherElements There are also asides, callouts, tables, tooltips, and more. @@ -559,6 +571,7 @@ scratch/main> view doc.guide {{ otherElements }} }} + scratch/main> display doc.guide # Unison computable documentation diff --git a/unison-src/transcripts-using-base/failure-tests.output.md b/unison-src/transcripts-using-base/failure-tests.output.md index f60045f67d..5087b2d934 100644 --- a/unison-src/transcripts-using-base/failure-tests.output.md +++ b/unison-src/transcripts-using-base/failure-tests.output.md @@ -19,7 +19,6 @@ test2 = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts-using-base/fix2158-1.output.md b/unison-src/transcripts-using-base/fix2158-1.output.md index 28aa5997fd..d3d4ce972e 100644 --- a/unison-src/transcripts-using-base/fix2158-1.output.md +++ b/unison-src/transcripts-using-base/fix2158-1.output.md @@ -12,7 +12,6 @@ Async.parMap f as = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts-using-base/fix2297.output.md b/unison-src/transcripts-using-base/fix2297.output.md index f4225a9109..69dae77fac 100644 --- a/unison-src/transcripts-using-base/fix2297.output.md +++ b/unison-src/transcripts-using-base/fix2297.output.md @@ -25,7 +25,6 @@ wat = handleTrivial testAction -- Somehow this completely forgets about Excepti ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. The expression in red needs the {IO} ability, but this location does not have access to any abilities. diff --git a/unison-src/transcripts-using-base/fix2358.output.md b/unison-src/transcripts-using-base/fix2358.output.md index cd119e6da0..73f94c3761 100644 --- a/unison-src/transcripts-using-base/fix2358.output.md +++ b/unison-src/transcripts-using-base/fix2358.output.md @@ -9,7 +9,6 @@ timingApp2 _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts-using-base/fix3166.output.md b/unison-src/transcripts-using-base/fix3166.output.md index 1408f6c690..a370eeb8e4 100644 --- a/unison-src/transcripts-using-base/fix3166.output.md +++ b/unison-src/transcripts-using-base/fix3166.output.md @@ -32,7 +32,6 @@ increment n = 1 + n ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -83,7 +82,6 @@ foo _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -127,7 +125,6 @@ hmm = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts-using-base/fix3542.output.md b/unison-src/transcripts-using-base/fix3542.output.md index 38018f78f3..df71ed5a37 100644 --- a/unison-src/transcripts-using-base/fix3542.output.md +++ b/unison-src/transcripts-using-base/fix3542.output.md @@ -14,7 +14,6 @@ arrayList v n = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts-using-base/fix3939.output.md b/unison-src/transcripts-using-base/fix3939.output.md index c28c8b089e..c9e6d16bc6 100644 --- a/unison-src/transcripts-using-base/fix3939.output.md +++ b/unison-src/transcripts-using-base/fix3939.output.md @@ -6,7 +6,6 @@ meh = 9 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -26,10 +25,12 @@ scratch/main> add meh : Nat meh.doc : Doc2 + scratch/main> find meh 1. meh : Nat 2. meh.doc : Doc2 + scratch/main> docs 1 A simple doc. diff --git a/unison-src/transcripts-using-base/fix4746.output.md b/unison-src/transcripts-using-base/fix4746.output.md index 36719b8539..8a93ee1c0b 100644 --- a/unison-src/transcripts-using-base/fix4746.output.md +++ b/unison-src/transcripts-using-base/fix4746.output.md @@ -36,7 +36,6 @@ run s = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts-using-base/fix5129.output.md b/unison-src/transcripts-using-base/fix5129.output.md index 8510d11ec7..ce5c89a5de 100644 --- a/unison-src/transcripts-using-base/fix5129.output.md +++ b/unison-src/transcripts-using-base/fix5129.output.md @@ -27,7 +27,6 @@ go = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found an ability mismatch when checking the application @@ -60,7 +59,6 @@ fancyTryEval = reraise << catchAll.impl ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. The expression in red diff --git a/unison-src/transcripts-using-base/hashing.output.md b/unison-src/transcripts-using-base/hashing.output.md index 33119da0d8..4bf5506a8b 100644 --- a/unison-src/transcripts-using-base/hashing.output.md +++ b/unison-src/transcripts-using-base/hashing.output.md @@ -75,7 +75,6 @@ ex5 = crypto.hmac Sha2_256 mysecret f |> hex ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -159,7 +158,6 @@ Note that the universal versions of `hash` and `hmac` are currently unimplemente ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ @@ -382,7 +380,6 @@ test> hmac_sha2_512.tests.ex2 = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -445,7 +442,6 @@ test> md5.tests.ex3 = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts-using-base/mvar.output.md b/unison-src/transcripts-using-base/mvar.output.md index e4ffde23d5..7e18b62f4b 100644 --- a/unison-src/transcripts-using-base/mvar.output.md +++ b/unison-src/transcripts-using-base/mvar.output.md @@ -51,7 +51,6 @@ testMvars _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -71,6 +70,7 @@ scratch/main> add eitherCk : (a ->{g} Boolean) -> Either e a ->{g} Boolean testMvars : '{IO} [Result] + scratch/main> io.test testMvars New test results: diff --git a/unison-src/transcripts-using-base/nat-coersion.output.md b/unison-src/transcripts-using-base/nat-coersion.output.md index dcc38b1778..1fe0ce8e34 100644 --- a/unison-src/transcripts-using-base/nat-coersion.output.md +++ b/unison-src/transcripts-using-base/nat-coersion.output.md @@ -33,7 +33,6 @@ test = 'let ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -59,6 +58,7 @@ scratch/main> add -> Optional Int -> Optional Float ->{Stream Result} () + scratch/main> io.test test New test results: diff --git a/unison-src/transcripts-using-base/net.output.md b/unison-src/transcripts-using-base/net.output.md index 78d568ad0d..7d6e6ba63c 100644 --- a/unison-src/transcripts-using-base/net.output.md +++ b/unison-src/transcripts-using-base/net.output.md @@ -97,7 +97,6 @@ testDefaultPort _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -119,6 +118,7 @@ scratch/main> add testDefaultHost : '{IO} [Result] testDefaultPort : '{IO} [Result] testExplicitHost : '{IO} [Result] + scratch/main> io.test testDefaultPort New test results: @@ -184,7 +184,6 @@ testTcpConnect = 'let ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -206,6 +205,7 @@ scratch/main> add clientThread : MVar Nat -> MVar Text -> '{IO} () serverThread : MVar Nat -> Text -> '{IO} () testTcpConnect : '{IO} [Result] + scratch/main> io.test testTcpConnect New test results: diff --git a/unison-src/transcripts-using-base/random-deserial.output.md b/unison-src/transcripts-using-base/random-deserial.output.md index 32d52e2181..9b02b35804 100644 --- a/unison-src/transcripts-using-base/random-deserial.output.md +++ b/unison-src/transcripts-using-base/random-deserial.output.md @@ -56,7 +56,6 @@ serialTests = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -84,6 +83,7 @@ scratch/main> add runTestCase : Text ->{IO, Exception} (Text, Result) serialTests : '{IO, Exception} [Result] shuffle : Nat -> [a] -> [a] + scratch/main> io.test serialTests New test results: diff --git a/unison-src/transcripts-using-base/ref-promise.output.md b/unison-src/transcripts-using-base/ref-promise.output.md index 8cc4d2faa8..6ee80cacd3 100644 --- a/unison-src/transcripts-using-base/ref-promise.output.md +++ b/unison-src/transcripts-using-base/ref-promise.output.md @@ -19,7 +19,6 @@ casTest = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -37,6 +36,7 @@ scratch/main> add ⍟ I've added these definitions: casTest : '{IO} [Result] + scratch/main> io.test casTest New test results: @@ -80,7 +80,6 @@ promiseConcurrentTest = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -100,6 +99,7 @@ scratch/main> add promiseConcurrentTest : '{IO} [Result] promiseSequentialTest : '{IO} [Result] + scratch/main> io.test promiseSequentialTest New test results: @@ -110,6 +110,7 @@ scratch/main> io.test promiseSequentialTest ✅ 2 test(s) passing Tip: Use view 1 to view the source of a test. + scratch/main> io.test promiseConcurrentTest New test results: @@ -132,7 +133,6 @@ atomicUpdate ref f = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -171,7 +171,6 @@ spawnN n fa = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -220,7 +219,6 @@ fullTest = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -238,6 +236,7 @@ scratch/main> add ⍟ I've added these definitions: fullTest : '{IO} [Result] + scratch/main> io.test fullTest New test results: diff --git a/unison-src/transcripts-using-base/serial-test-00.output.md b/unison-src/transcripts-using-base/serial-test-00.output.md index 42c5b1ef6c..a116fcc248 100644 --- a/unison-src/transcripts-using-base/serial-test-00.output.md +++ b/unison-src/transcripts-using-base/serial-test-00.output.md @@ -68,7 +68,6 @@ mkTestCase = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -114,6 +113,7 @@ scratch/main> add tree1 : Tree Nat tree2 : Tree Nat tree3 : Tree Text + scratch/main> run mkTestCase () diff --git a/unison-src/transcripts-using-base/serial-test-01.output.md b/unison-src/transcripts-using-base/serial-test-01.output.md index 78374f38ba..d7deff53f2 100644 --- a/unison-src/transcripts-using-base/serial-test-01.output.md +++ b/unison-src/transcripts-using-base/serial-test-01.output.md @@ -16,7 +16,6 @@ mkTestCase = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -42,6 +41,7 @@ scratch/main> add l2 : [Int] l3 : [Char] mkTestCase : '{IO, Exception} () + scratch/main> run mkTestCase () diff --git a/unison-src/transcripts-using-base/serial-test-02.output.md b/unison-src/transcripts-using-base/serial-test-02.output.md index 0a5df2b091..9b91fe1aac 100644 --- a/unison-src/transcripts-using-base/serial-test-02.output.md +++ b/unison-src/transcripts-using-base/serial-test-02.output.md @@ -30,7 +30,6 @@ mkTestCase = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -60,6 +59,7 @@ scratch/main> add mkTestCase : '{IO, Exception} () prod : [Nat] -> Nat products : ([Nat], [Nat], [Nat]) -> Text + scratch/main> run mkTestCase () diff --git a/unison-src/transcripts-using-base/serial-test-03.output.md b/unison-src/transcripts-using-base/serial-test-03.output.md index d57b485bf6..72c15ebbdf 100644 --- a/unison-src/transcripts-using-base/serial-test-03.output.md +++ b/unison-src/transcripts-using-base/serial-test-03.output.md @@ -44,7 +44,6 @@ mkTestCase = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -83,6 +82,7 @@ scratch/main> add mkTestCase : '{IO, Exception} () reset : '{DC r} r -> r suspSum : [Nat] -> Delayed Nat + scratch/main> run mkTestCase () diff --git a/unison-src/transcripts-using-base/serial-test-04.output.md b/unison-src/transcripts-using-base/serial-test-04.output.md index 53bc5d8d14..9e45041b57 100644 --- a/unison-src/transcripts-using-base/serial-test-04.output.md +++ b/unison-src/transcripts-using-base/serial-test-04.output.md @@ -14,7 +14,6 @@ mkTestCase = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -36,6 +35,7 @@ scratch/main> add mkTestCase : '{IO, Exception} () mutual0 : Nat -> Text mutual1 : Nat -> Text + scratch/main> run mkTestCase () diff --git a/unison-src/transcripts-using-base/stm.output.md b/unison-src/transcripts-using-base/stm.output.md index 0180e654c8..3edffadcf8 100644 --- a/unison-src/transcripts-using-base/stm.output.md +++ b/unison-src/transcripts-using-base/stm.output.md @@ -29,7 +29,6 @@ body k out v = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -91,7 +90,6 @@ tests = '(map spawn nats) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -115,6 +113,7 @@ scratch/main> add nats : [Nat] spawn : Nat ->{IO} Result tests : '{IO} [Result] + scratch/main> io.test tests New test results: diff --git a/unison-src/transcripts-using-base/test-watch-dependencies.output.md b/unison-src/transcripts-using-base/test-watch-dependencies.output.md index 06592ae138..c4f43b9263 100644 --- a/unison-src/transcripts-using-base/test-watch-dependencies.output.md +++ b/unison-src/transcripts-using-base/test-watch-dependencies.output.md @@ -20,7 +20,6 @@ test> mytest = checks [x + 1 == 1001] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -66,7 +65,6 @@ test> useY = checks [y + 1 == 43] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts-using-base/thread.output.md b/unison-src/transcripts-using-base/thread.output.md index c98eb4dbc1..8f4924e69d 100644 --- a/unison-src/transcripts-using-base/thread.output.md +++ b/unison-src/transcripts-using-base/thread.output.md @@ -17,7 +17,6 @@ testBasicFork = 'let ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -34,6 +33,7 @@ See if we can get another thread to stuff a value into a MVar ``` ucm :hide scratch/main> add + scratch/main> io.test testBasicFork ``` @@ -62,7 +62,6 @@ testBasicMultiThreadMVar = 'let ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -82,6 +81,7 @@ scratch/main> add testBasicMultiThreadMVar : '{IO} [Result] thread1 : Nat -> MVar Nat -> '{IO} () + scratch/main> io.test testBasicMultiThreadMVar New test results: @@ -132,7 +132,6 @@ testTwoThreads = 'let ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -156,6 +155,7 @@ scratch/main> add sendingThread : Nat -> MVar Nat -> '{IO} () (also named thread1) testTwoThreads : '{IO} [Result] + scratch/main> io.test testTwoThreads New test results: diff --git a/unison-src/transcripts-using-base/tls.output.md b/unison-src/transcripts-using-base/tls.output.md index 0877987a09..a475223453 100644 --- a/unison-src/transcripts-using-base/tls.output.md +++ b/unison-src/transcripts-using-base/tls.output.md @@ -32,7 +32,6 @@ what_should_work _ = this_should_work ++ this_should_not_work ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -54,6 +53,7 @@ scratch/main> add this_should_not_work : [Result] this_should_work : [Result] what_should_work : ∀ _. _ -> [Result] + scratch/main> io.test what_should_work New test results: @@ -221,7 +221,6 @@ testCNReject _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -253,6 +252,7 @@ scratch/main> add -> MVar Nat -> '{IO, Exception} Text testConnectSelfSigned : '{IO} [Result] + scratch/main> io.test testConnectSelfSigned New test results: @@ -262,6 +262,7 @@ scratch/main> io.test testConnectSelfSigned ✅ 1 test(s) passing Tip: Use view 1 to view the source of a test. + scratch/main> io.test testCAReject New test results: @@ -271,6 +272,7 @@ scratch/main> io.test testCAReject ✅ 1 test(s) passing Tip: Use view 1 to view the source of a test. + scratch/main> io.test testCNReject New test results: diff --git a/unison-src/transcripts-using-base/utf8.output.md b/unison-src/transcripts-using-base/utf8.output.md index 5f67d71f69..75404e1eb4 100644 --- a/unison-src/transcripts-using-base/utf8.output.md +++ b/unison-src/transcripts-using-base/utf8.output.md @@ -21,7 +21,6 @@ ascii = "ABCDE" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -51,7 +50,6 @@ greek = "ΑΒΓΔΕ" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -86,7 +84,6 @@ test> greekTest = checkRoundTrip greek ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -121,7 +118,6 @@ greek_bytes = Bytes.fromList [206, 145, 206, 146, 206, 147, 206, 148, 206] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/alias-many.output.md b/unison-src/transcripts/alias-many.output.md index 118f196a68..a4cf25a46b 100644 --- a/unison-src/transcripts/alias-many.output.md +++ b/unison-src/transcripts/alias-many.output.md @@ -49,6 +49,7 @@ scratch/main> alias.many List.adjacentPairs List.all List.any List.chunk List.ch Tip: You can use `undo` or use a hash from `reflog` to undo this change. + scratch/main> find-in mylib 1. List.adjacentPairs : [a] -> [(a, a)] diff --git a/unison-src/transcripts/errors/dont-hide-unexpected-ucm-errors.output.md b/unison-src/transcripts/errors/dont-hide-unexpected-ucm-errors.output.md index f2ed9f0446..218f5288a2 100644 --- a/unison-src/transcripts/errors/dont-hide-unexpected-ucm-errors.output.md +++ b/unison-src/transcripts/errors/dont-hide-unexpected-ucm-errors.output.md @@ -2,6 +2,7 @@ Since this code block is expecting an error, we still hide it. It seems unusual ``` ucm :hide:error scratch/main> help pull + scratch/main> not.a.command ``` @@ -32,6 +33,7 @@ scratch/main> help pull Project Branch `@unison/base/feature` Contributor Branch `@unison/base/@johnsmith/feature` Project Release `@unison/base/releases/1.0.0` + scratch/main> not.a.command ⚠️ diff --git a/unison-src/transcripts/errors/dont-hide-unexpected-unison-errors.output.md b/unison-src/transcripts/errors/dont-hide-unexpected-unison-errors.output.md index 8069556a7a..b0874d13e7 100644 --- a/unison-src/transcripts/errors/dont-hide-unexpected-unison-errors.output.md +++ b/unison-src/transcripts/errors/dont-hide-unexpected-unison-errors.output.md @@ -11,7 +11,6 @@ x + x + ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I got confused here: diff --git a/unison-src/transcripts/fix-5402.output.md b/unison-src/transcripts/fix-5402.output.md index b220a92a86..a52e697869 100644 --- a/unison-src/transcripts/fix-5402.output.md +++ b/unison-src/transcripts/fix-5402.output.md @@ -7,7 +7,6 @@ x = 10 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -26,7 +25,6 @@ x = 10 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/hello.output.md b/unison-src/transcripts/hello.output.md index a8e3cf478b..c7564924b7 100644 --- a/unison-src/transcripts/hello.output.md +++ b/unison-src/transcripts/hello.output.md @@ -30,7 +30,6 @@ x = 42 ``` ``` ucm :added-by-ucm - Loading changes detected in myfile.u. I found and typechecked these definitions in myfile.u. If you @@ -50,6 +49,7 @@ scratch/main> add ⍟ I've added these definitions: x : Nat + scratch/main> view x x : Nat @@ -84,7 +84,6 @@ hmm = "Not, in fact, a number" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found a value of type: Text diff --git a/unison-src/transcripts/idempotent/ability-order-doesnt-affect-hash.md b/unison-src/transcripts/idempotent/ability-order-doesnt-affect-hash.md index d0cbce1e96..3656daaba2 100644 --- a/unison-src/transcripts/idempotent/ability-order-doesnt-affect-hash.md +++ b/unison-src/transcripts/idempotent/ability-order-doesnt-affect-hash.md @@ -23,6 +23,7 @@ scratch/main> add ability Foo term1 : '{Bar, Foo} () term2 : '{Bar, Foo} () + scratch/main> names term1 Term diff --git a/unison-src/transcripts/idempotent/ability-term-conflicts-on-update.md b/unison-src/transcripts/idempotent/ability-term-conflicts-on-update.md index 0945af447a..83ecb5c59d 100644 --- a/unison-src/transcripts/idempotent/ability-term-conflicts-on-update.md +++ b/unison-src/transcripts/idempotent/ability-term-conflicts-on-update.md @@ -15,7 +15,6 @@ unique ability Channels where ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -51,7 +50,6 @@ thing _ = send 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -80,6 +78,7 @@ scratch/main> update.old patch Channels.send term/ctor collision Channels.send : a -> () Tip: Use `help filestatus` to learn more. + scratch/main> update.old patch thing ⍟ I've added these definitions: @@ -106,7 +105,6 @@ thing _ = send 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -137,6 +135,7 @@ scratch/main> update.old.preview patch Channels.send new definition: Channels.send : a ->{Channels} () + scratch/main> update.old.preview patch thing I found and typechecked these definitions in scratch.u. If you @@ -176,7 +175,6 @@ X.x = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -202,7 +200,6 @@ structural ability X where ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/add-run.md b/unison-src/transcripts/idempotent/add-run.md index 8181861e7c..46e1ffccfc 100644 --- a/unison-src/transcripts/idempotent/add-run.md +++ b/unison-src/transcripts/idempotent/add-run.md @@ -77,7 +77,6 @@ main _ = y ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -95,6 +94,7 @@ main _ = y scratch/main> run main a b -> a Nat.+ b Nat.+ z 10 + scratch/main> add.run result ⍟ I've added these definitions: @@ -111,7 +111,6 @@ inc x = x + 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -140,11 +139,13 @@ main _ x = inc x scratch/main> run main inc + scratch/main> add.run natfoo ⍟ I've added these definitions: natfoo : Nat -> Nat + scratch/main> view natfoo natfoo : Nat -> Nat @@ -160,7 +161,6 @@ main = 'y ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -192,6 +192,7 @@ scratch/main> add.run xres ⍟ I've added these definitions: xres : Nat + scratch/main> view xres xres : Nat @@ -208,6 +209,7 @@ main = '5 scratch/main> run main 5 + scratch/main> add.run xres x These definitions failed: @@ -228,11 +230,13 @@ main = '5 scratch/main> run main 5 + scratch/main> add.run .an.absolute.name ⍟ I've added these definitions: .an.absolute.name : Nat + scratch/main> view .an.absolute.name .an.absolute.name : Nat diff --git a/unison-src/transcripts/idempotent/add-test-watch-roundtrip.md b/unison-src/transcripts/idempotent/add-test-watch-roundtrip.md index c2ce7b7fb3..846cd1537d 100644 --- a/unison-src/transcripts/idempotent/add-test-watch-roundtrip.md +++ b/unison-src/transcripts/idempotent/add-test-watch-roundtrip.md @@ -15,6 +15,7 @@ scratch/main> add ⍟ I've added these definitions: foo : [Result] + scratch/main> view foo foo : [Result] diff --git a/unison-src/transcripts/idempotent/addupdatemessages.md b/unison-src/transcripts/idempotent/addupdatemessages.md index 3cf4b245f2..a91b32bfa3 100644 --- a/unison-src/transcripts/idempotent/addupdatemessages.md +++ b/unison-src/transcripts/idempotent/addupdatemessages.md @@ -15,7 +15,6 @@ structural type Y = Two Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -52,7 +51,6 @@ structural type Z = One Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -89,7 +87,6 @@ structural type X = Three Nat Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -128,7 +125,6 @@ structural type X = Two Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/alias-term.md b/unison-src/transcripts/idempotent/alias-term.md index 5fde538677..553afa52b3 100644 --- a/unison-src/transcripts/idempotent/alias-term.md +++ b/unison-src/transcripts/idempotent/alias-term.md @@ -8,6 +8,7 @@ project/main> builtins.mergeio lib.builtins project/main> alias.term lib.builtins.bug foo Done. + project/main> ls 1. foo (a -> b) @@ -37,6 +38,7 @@ You can use `debug.alias.term.force` for that. project/main> debug.alias.term.force lib.builtins.todo foo Done. + project/main> ls 1. foo (a -> b) diff --git a/unison-src/transcripts/idempotent/alias-type.md b/unison-src/transcripts/idempotent/alias-type.md index 2740753e46..98a7de829b 100644 --- a/unison-src/transcripts/idempotent/alias-type.md +++ b/unison-src/transcripts/idempotent/alias-type.md @@ -8,6 +8,7 @@ project/main> builtins.mergeio lib.builtins project/main> alias.type lib.builtins.Nat Foo Done. + project/main> ls 1. Foo (builtin type) @@ -37,6 +38,7 @@ You can use `debug.alias.type.force` for that. project/main> debug.alias.type.force lib.builtins.Int Foo Done. + project/main> ls 1. Foo (builtin type) diff --git a/unison-src/transcripts/idempotent/anf-tests.md b/unison-src/transcripts/idempotent/anf-tests.md index 9bd5080fe3..18cca0ade1 100644 --- a/unison-src/transcripts/idempotent/anf-tests.md +++ b/unison-src/transcripts/idempotent/anf-tests.md @@ -30,7 +30,6 @@ foo _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/any-extract.md b/unison-src/transcripts/idempotent/any-extract.md index b17ca9b6f1..a6621b64ba 100644 --- a/unison-src/transcripts/idempotent/any-extract.md +++ b/unison-src/transcripts/idempotent/any-extract.md @@ -2,7 +2,9 @@ ``` ucm :hide scratch/main> builtins.mergeio + scratch/main> load unison-src/transcripts-using-base/base.u + scratch/main> add ``` @@ -19,7 +21,6 @@ test> Any.unsafeExtract.works = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/api-find.md b/unison-src/transcripts/idempotent/api-find.md index d08334aa0a..33fab9d0bb 100644 --- a/unison-src/transcripts/idempotent/api-find.md +++ b/unison-src/transcripts/idempotent/api-find.md @@ -8,7 +8,6 @@ joey.yaml.zz = 45 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/api-list-projects-branches.md b/unison-src/transcripts/idempotent/api-list-projects-branches.md index 9d5952766b..02d2d2541f 100644 --- a/unison-src/transcripts/idempotent/api-list-projects-branches.md +++ b/unison-src/transcripts/idempotent/api-list-projects-branches.md @@ -2,10 +2,15 @@ ``` ucm :hide scratch/main> project.create-empty project-one + scratch/main> project.create-empty project-two + scratch/main> project.create-empty project-three + project-one/main> branch branch-one + project-one/main> branch branch-two + project-one/main> branch branch-three ``` diff --git a/unison-src/transcripts/idempotent/api-namespace-details.md b/unison-src/transcripts/idempotent/api-namespace-details.md index 5e2db50a07..4cbbd01c51 100644 --- a/unison-src/transcripts/idempotent/api-namespace-details.md +++ b/unison-src/transcripts/idempotent/api-namespace-details.md @@ -14,7 +14,6 @@ Here's a *README*! ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/api-namespace-list.md b/unison-src/transcripts/idempotent/api-namespace-list.md index 5139f87319..7287cec514 100644 --- a/unison-src/transcripts/idempotent/api-namespace-list.md +++ b/unison-src/transcripts/idempotent/api-namespace-list.md @@ -12,7 +12,6 @@ nested.names.readme = {{ I'm a readme! }} ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/api-summaries.md b/unison-src/transcripts/idempotent/api-summaries.md index 039efb04b9..d10db43d61 100644 --- a/unison-src/transcripts/idempotent/api-summaries.md +++ b/unison-src/transcripts/idempotent/api-summaries.md @@ -25,7 +25,9 @@ structural ability Stream s where ``` ucm :hide scratch/main> add + scratch/main> alias.type ##Nat Nat + scratch/main> alias.term ##IO.putBytes.impl.v3 putBytesImpl ``` diff --git a/unison-src/transcripts/idempotent/block-on-required-update.md b/unison-src/transcripts/idempotent/block-on-required-update.md index be0e05764d..4f69704692 100644 --- a/unison-src/transcripts/idempotent/block-on-required-update.md +++ b/unison-src/transcripts/idempotent/block-on-required-update.md @@ -11,7 +11,6 @@ x = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -39,7 +38,6 @@ y = x + 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/blocks.md b/unison-src/transcripts/idempotent/blocks.md index 9645fffd9b..167c580bb3 100644 --- a/unison-src/transcripts/idempotent/blocks.md +++ b/unison-src/transcripts/idempotent/blocks.md @@ -20,7 +20,6 @@ ex thing = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -53,7 +52,6 @@ ex thing = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -88,7 +86,6 @@ ex thing = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -120,7 +117,6 @@ ex thing = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -159,7 +155,6 @@ ex n = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -186,7 +181,6 @@ ex n = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -210,7 +204,6 @@ ex n = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. These definitions depend on each other cyclically but aren't guarded by a lambda: pong8 @@ -227,7 +220,6 @@ ex n = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. These definitions depend on each other cyclically but aren't guarded by a lambda: loop8 @@ -243,7 +235,6 @@ ex n = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -272,7 +263,6 @@ ex n = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. The expression in red needs the {SpaceAttack} ability, but this location does not have access to any abilities. @@ -295,7 +285,6 @@ ex n = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -324,7 +313,6 @@ ex n = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -351,7 +339,6 @@ ex n = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/boolean-op-pretty-print-2819.md b/unison-src/transcripts/idempotent/boolean-op-pretty-print-2819.md index 4af3c7d061..420466b531 100644 --- a/unison-src/transcripts/idempotent/boolean-op-pretty-print-2819.md +++ b/unison-src/transcripts/idempotent/boolean-op-pretty-print-2819.md @@ -12,7 +12,6 @@ hangExample = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -30,6 +29,7 @@ scratch/main> add ⍟ I've added these definitions: hangExample : Boolean + scratch/main> view hangExample hangExample : Boolean diff --git a/unison-src/transcripts/idempotent/branch-command.md b/unison-src/transcripts/idempotent/branch-command.md index 00ad35f4e5..67e97a1b4c 100644 --- a/unison-src/transcripts/idempotent/branch-command.md +++ b/unison-src/transcripts/idempotent/branch-command.md @@ -2,6 +2,7 @@ The `branch` command creates a new branch. ``` ucm :hide scratch/main> project.create-empty foo + scratch/main> project.create-empty bar ``` @@ -15,6 +16,7 @@ someterm = 18 scratch/main> builtins.merge lib.builtins Done. + scratch/main> add ⍟ I've added these definitions: @@ -34,99 +36,118 @@ foo/main> branch topic1 Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic1`. + foo/main> branch /topic2 Done. I've created the topic2 branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic2`. + foo/main> branch foo/topic3 Done. I've created the topic3 branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic3`. + foo/main> branch main topic4 Done. I've created the topic4 branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic4`. + foo/main> branch main /topic5 Done. I've created the topic5 branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic5`. + foo/main> branch main foo/topic6 Done. I've created the topic6 branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic6`. + foo/main> branch /main topic7 Done. I've created the topic7 branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic7`. + foo/main> branch /main /topic8 Done. I've created the topic8 branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic8`. + foo/main> branch /main foo/topic9 Done. I've created the topic9 branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic9`. + foo/main> branch foo/main topic10 Done. I've created the topic10 branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic10`. + foo/main> branch foo/main /topic11 Done. I've created the topic11 branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic11`. + scratch/main> branch foo/main foo/topic12 Done. I've created the topic12 branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic12`. + foo/main> branch bar/topic Done. I've created the bar/topic branch based off foo/main. + bar/main> branch foo/main topic2 Done. I've created the bar/topic2 branch based off foo/main. + bar/main> branch foo/main /topic3 Done. I've created the bar/topic3 branch based off foo/main. + scratch/main> branch foo/main bar/topic4 Done. I've created the bar/topic4 branch based off foo/main. + foo/main> branch.empty empty1 Done. I've created an empty branch foo/empty1. Tip: Use `merge /somebranch` to initialize this branch. + foo/main> branch.empty /empty2 Done. I've created an empty branch foo/empty2. Tip: Use `merge /somebranch` to initialize this branch. + foo/main> branch.empty foo/empty3 Done. I've created an empty branch foo/empty3. Tip: Use `merge /somebranch` to initialize this branch. + scratch/main> branch.empty foo/empty4 Done. I've created an empty branch foo/empty4. @@ -144,6 +165,7 @@ foo/main> branch releases/drafts/1.2.3 Tip: To merge your work back into the main branch, first `switch /main` then `merge /releases/drafts/1.2.3`. + foo/main> switch /releases/drafts/1.2.3 ``` @@ -158,6 +180,7 @@ foo/main> branch releases/1.2.3 `clone /releases/1.2.3`. Tip: to draft a new release, try `release.draft 1.2.3`. + foo/main> switch /releases/1.2.3 foo/releases/1.2.3 does not exist. diff --git a/unison-src/transcripts/idempotent/branch-relative-path.md b/unison-src/transcripts/idempotent/branch-relative-path.md index 336d4c232b..67775adbb8 100644 --- a/unison-src/transcripts/idempotent/branch-relative-path.md +++ b/unison-src/transcripts/idempotent/branch-relative-path.md @@ -4,7 +4,6 @@ foo.bar = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -32,7 +31,6 @@ donk.bonk = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -54,32 +52,40 @@ p1/main> add bonk : ##Nat donk.bonk : ##Nat + p1/main> fork p0/main: zzz Done. + p1/main> find zzz 1. zzz.foo : ##Nat 2. zzz.foo.bar : ##Nat + p1/main> fork p0/main:foo yyy Done. + p1/main> find yyy 1. yyy.bar : ##Nat + p0/main> fork p1/main: p0/main:p1 Done. + p0/main> ls p1 1. bonk (##Nat) 2. donk/ (1 term) 3. yyy/ (1 term) 4. zzz/ (2 terms) + p0/main> ls p1.zzz 1. foo (##Nat) 2. foo/ (1 term) + p0/main> ls p1.yyy 1. bar (##Nat) diff --git a/unison-src/transcripts/idempotent/bug-fix-4354.md b/unison-src/transcripts/idempotent/bug-fix-4354.md index d662783099..878dfce1f7 100644 --- a/unison-src/transcripts/idempotent/bug-fix-4354.md +++ b/unison-src/transcripts/idempotent/bug-fix-4354.md @@ -13,7 +13,6 @@ bonk x = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/bug-strange-closure.md b/unison-src/transcripts/idempotent/bug-strange-closure.md index 23a5fc90db..15c5aace2d 100644 --- a/unison-src/transcripts/idempotent/bug-strange-closure.md +++ b/unison-src/transcripts/idempotent/bug-strange-closure.md @@ -1,5 +1,6 @@ ``` ucm :hide scratch/main> builtins.mergeio lib.builtins + scratch/main> load unison-src/transcripts-using-base/doc.md.files/syntax.u ``` @@ -203,6 +204,7 @@ scratch/main> display doc.guide row occupies multiple lines in the rendered table. Some text More text Zounds! + scratch/main> add ⍟ I've added these definitions: @@ -215,6 +217,7 @@ scratch/main> add nonUnisonCodeBlocks : Doc2 otherElements : Doc2 sqr : Nat -> Nat + scratch/main> display doc.guide # Unison computable documentation @@ -421,7 +424,6 @@ rendered = Pretty.get (docFormatConsole doc.guide) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -631,11 +633,13 @@ scratch/main> display rendered row occupies multiple lines in the rendered table. Some text More text Zounds! + scratch/main> add ⍟ I've added these definitions: rendered : Annotated () (Either SpecialForm ConsoleText) + scratch/main> display rendered # Unison computable documentation @@ -833,6 +837,7 @@ scratch/main> display rendered row occupies multiple lines in the rendered table. Some text More text Zounds! + scratch/main> undo Here are the changes I undid @@ -851,7 +856,6 @@ rendered = Pretty.get (docFormatConsole doc.guide) ``` ```` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/builtins-merge.md b/unison-src/transcripts/idempotent/builtins-merge.md index 0c709fe1d3..27da76caaa 100644 --- a/unison-src/transcripts/idempotent/builtins-merge.md +++ b/unison-src/transcripts/idempotent/builtins-merge.md @@ -4,6 +4,7 @@ The `builtins.merge` command adds the known builtins to the specified subnamespa scratch/main> builtins.merge builtins Done. + scratch/main> ls builtins 1. Any (builtin type) diff --git a/unison-src/transcripts/idempotent/builtins.md b/unison-src/transcripts/idempotent/builtins.md index 298ac7816e..e36c81246d 100644 --- a/unison-src/transcripts/idempotent/builtins.md +++ b/unison-src/transcripts/idempotent/builtins.md @@ -2,7 +2,9 @@ ``` ucm :hide scratch/main> builtins.mergeio + scratch/main> load unison-src/transcripts-using-base/base.u + scratch/main> add ``` @@ -394,7 +396,6 @@ test> Any.test2 = checks [(not (Any "hi" == Any 42))] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -450,7 +451,6 @@ openFile] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -507,7 +507,6 @@ openFilesIO = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -525,6 +524,7 @@ scratch/main> add ⍟ I've added these definitions: openFilesIO : '{IO} [Result] + scratch/main> io.test openFilesIO New test results: @@ -546,7 +546,6 @@ test> Universal.murmurHash.tests = checks [Universal.murmurHash [1,2,3] == Unive ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/bytesFromList.md b/unison-src/transcripts/idempotent/bytesFromList.md index 664c9dff1b..4640272396 100644 --- a/unison-src/transcripts/idempotent/bytesFromList.md +++ b/unison-src/transcripts/idempotent/bytesFromList.md @@ -9,7 +9,6 @@ This should render as `Bytes.fromList [1,2,3,4]`, not `##Bytes.fromSequence [1,2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ diff --git a/unison-src/transcripts/idempotent/check763.md b/unison-src/transcripts/idempotent/check763.md index e7943b6b20..1582be2ea7 100644 --- a/unison-src/transcripts/idempotent/check763.md +++ b/unison-src/transcripts/idempotent/check763.md @@ -10,7 +10,6 @@ scratch/main> builtins.merge ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -28,9 +27,11 @@ scratch/main> add ⍟ I've added these definitions: +-+ : Nat -> Nat -> Nat + scratch/main> move.term +-+ boppitybeep Done. + scratch/main> move.term boppitybeep +-+ Done. diff --git a/unison-src/transcripts/idempotent/check873.md b/unison-src/transcripts/idempotent/check873.md index 64b5b383be..713767620f 100644 --- a/unison-src/transcripts/idempotent/check873.md +++ b/unison-src/transcripts/idempotent/check873.md @@ -9,7 +9,6 @@ scratch/main> builtins.merge ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -34,7 +33,6 @@ baz x = x - 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/constructor-applied-to-unit.md b/unison-src/transcripts/idempotent/constructor-applied-to-unit.md index 875b92c07f..a0839b594f 100644 --- a/unison-src/transcripts/idempotent/constructor-applied-to-unit.md +++ b/unison-src/transcripts/idempotent/constructor-applied-to-unit.md @@ -1,5 +1,6 @@ ``` ucm :hide scratch/main> alias.type ##Nat Nat + scratch/main> alias.term ##Any.Any Any ``` @@ -11,7 +12,6 @@ structural type Zoink a b c = Zoink a b c ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/contrabilities.md b/unison-src/transcripts/idempotent/contrabilities.md index 0694f0e14a..717fb877c4 100644 --- a/unison-src/transcripts/idempotent/contrabilities.md +++ b/unison-src/transcripts/idempotent/contrabilities.md @@ -8,7 +8,6 @@ f x = 42 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/create-author.md b/unison-src/transcripts/idempotent/create-author.md index c440dad44a..fa8c9adaa1 100644 --- a/unison-src/transcripts/idempotent/create-author.md +++ b/unison-src/transcripts/idempotent/create-author.md @@ -14,6 +14,7 @@ scratch/main> create.author alicecoder "Alice McGee" 3. metadata.authors.alicecoder.guid : GUID Tip: Add License values for alicecoder under metadata. + scratch/main> find alicecoder 1. metadata.authors.alicecoder : Author diff --git a/unison-src/transcripts/idempotent/cycle-update-1.md b/unison-src/transcripts/idempotent/cycle-update-1.md index 84ecc32e3d..90cb99c8b3 100644 --- a/unison-src/transcripts/idempotent/cycle-update-1.md +++ b/unison-src/transcripts/idempotent/cycle-update-1.md @@ -13,7 +13,6 @@ pong _ = !ping + 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -41,7 +40,6 @@ ping _ = !pong + 3 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -65,6 +63,7 @@ scratch/main> update Everything typechecks, so I'm saving the results... Done. + scratch/main> view ping pong ping : 'Nat diff --git a/unison-src/transcripts/idempotent/cycle-update-2.md b/unison-src/transcripts/idempotent/cycle-update-2.md index 9e35071030..30c05de9f2 100644 --- a/unison-src/transcripts/idempotent/cycle-update-2.md +++ b/unison-src/transcripts/idempotent/cycle-update-2.md @@ -13,7 +13,6 @@ pong _ = !ping + 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -41,7 +40,6 @@ ping _ = 3 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -65,6 +63,7 @@ scratch/main> update Everything typechecks, so I'm saving the results... Done. + scratch/main> view ping pong ping : 'Nat diff --git a/unison-src/transcripts/idempotent/cycle-update-3.md b/unison-src/transcripts/idempotent/cycle-update-3.md index 3047e61a1e..f9821b96b1 100644 --- a/unison-src/transcripts/idempotent/cycle-update-3.md +++ b/unison-src/transcripts/idempotent/cycle-update-3.md @@ -13,7 +13,6 @@ pong _ = !ping + 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -41,7 +40,6 @@ ping = 3 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -60,6 +58,7 @@ scratch/main> update.old ⍟ I've updated these names to your new definition: ping : Nat + scratch/main> view ping pong ping : Nat diff --git a/unison-src/transcripts/idempotent/cycle-update-4.md b/unison-src/transcripts/idempotent/cycle-update-4.md index 77b977c934..8bfc423b3c 100644 --- a/unison-src/transcripts/idempotent/cycle-update-4.md +++ b/unison-src/transcripts/idempotent/cycle-update-4.md @@ -13,7 +13,6 @@ pong _ = !ping + 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -44,7 +43,6 @@ clang _ = !pong + 3 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -72,6 +70,7 @@ scratch/main> update.old ping ping : 'Nat pong : 'Nat + scratch/main> view ping pong clang clang : 'Nat diff --git a/unison-src/transcripts/idempotent/debug-definitions.md b/unison-src/transcripts/idempotent/debug-definitions.md index f6aa5a0228..5bba3af74f 100644 --- a/unison-src/transcripts/idempotent/debug-definitions.md +++ b/unison-src/transcripts/idempotent/debug-definitions.md @@ -26,12 +26,15 @@ scratch/main> add (also named builtin.Optional) x : Nat y : Nat + scratch/main> debug.term.abt Nat.+ Builtin term: ##Nat.+ + scratch/main> debug.term.abt y (let Ref(ReferenceBuiltin "Nat.+") Ref(ReferenceDerived (Id "qpo3o788girkkbb43uf6ggqberfduhtnqbt7096eojlrp27jieco09mdasb7b0b06ej9hj60a00nnbbdo8he0b4e0m7vtopifiuhdig" 0)) 2 in (User "z". Ref(ReferenceBuiltin "Nat.+") (Var User "z") 10)):ReferenceBuiltin "Nat" + scratch/main> debug.term.abt Some Constructor #0 of the following type: @@ -61,6 +64,7 @@ scratch/main> debug.term.abt Some ) ] } + scratch/main> debug.term.abt ask Constructor #0 of the following type: @@ -89,9 +93,11 @@ scratch/main> debug.term.abt ask ] } } + scratch/main> debug.type.abt Nat Builtin type: ##Nat + scratch/main> debug.type.abt Optional DataDeclaration @@ -120,6 +126,7 @@ scratch/main> debug.type.abt Optional ) ] } + scratch/main> debug.type.abt Ask EffectDeclaration diff --git a/unison-src/transcripts/idempotent/debug-name-diffs.md b/unison-src/transcripts/idempotent/debug-name-diffs.md index 6a452995f4..8790c7db5e 100644 --- a/unison-src/transcripts/idempotent/debug-name-diffs.md +++ b/unison-src/transcripts/idempotent/debug-name-diffs.md @@ -10,7 +10,6 @@ structural type a.b.Baz = Boo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -38,6 +37,7 @@ scratch/main> add a.two : ##Nat a.x.four : ##Nat a.x.three : ##Nat + scratch/main> delete.term.verbose a.b.one Removed definitions: @@ -46,12 +46,15 @@ scratch/main> delete.term.verbose a.b.one Tip: You can use `undo` or use a hash from `reflog` to undo this change. + scratch/main> alias.term a.two a.newtwo Done. + scratch/main> move.namespace a.x a.y Done. + scratch/main> history Note: The most recent namespace hash is immediately below this @@ -86,6 +89,7 @@ scratch/main> history a.b.one □ 4. #gss5s88mo3 (start of history) + scratch/main> debug.name-diff 4 1 Kind Name Change Ref diff --git a/unison-src/transcripts/idempotent/deep-names.md b/unison-src/transcripts/idempotent/deep-names.md index e40dda1c04..34d842859d 100644 --- a/unison-src/transcripts/idempotent/deep-names.md +++ b/unison-src/transcripts/idempotent/deep-names.md @@ -14,7 +14,9 @@ http.z = 8 ``` ucm :hide scratch/main> add + scratch/main> branch /app1 + scratch/main> branch /app2 ``` @@ -24,18 +26,23 @@ Our `app1` project includes the text library twice and the http library twice as scratch/app1> fork text lib.text_v1 Done. + scratch/app1> fork text lib.text_v2 Done. + scratch/app1> delete.namespace text Done. + scratch/app1> fork http lib.http_v3 Done. + scratch/app1> fork http lib.http_v4 Done. + scratch/app1> delete.namespace http Done. @@ -49,6 +56,7 @@ scratch/app1> names a Term Hash: #gjmq673r1v Names: lib.text_v1.a lib.text_v2.a + scratch/app1> names x Term @@ -63,21 +71,27 @@ It also includes the `text` library twice as indirect dependencies via `webutil` scratch/app2> fork http lib.http_v1 Done. + scratch/app2> fork http lib.http_v2 Done. + scratch/app2> fork text lib.webutil.lib.text_v1 Done. + scratch/app2> fork text lib.webutil.lib.text_v2 Done. + scratch/app2> fork http lib.webutil.lib.http Done. + scratch/app2> delete.namespace http Done. + scratch/app2> delete.namespace text Done. @@ -92,6 +106,7 @@ scratch/app2> names a Term Hash: #gjmq673r1v Names: lib.webutil.lib.text_v1.a + scratch/app2> names x Term diff --git a/unison-src/transcripts/idempotent/definition-diff-api.md b/unison-src/transcripts/idempotent/definition-diff-api.md index d8ecc6fb35..a73ed6caa4 100644 --- a/unison-src/transcripts/idempotent/definition-diff-api.md +++ b/unison-src/transcripts/idempotent/definition-diff-api.md @@ -2,9 +2,11 @@ diffs/main> builtins.mergeio lib.builtins Done. + diffs/main> alias.term lib.builtins.Nat.gt lib.builtins.Nat.> Done. + diffs/main> alias.term lib.builtins.Nat.drop lib.builtins.Nat.- Done. @@ -33,7 +35,6 @@ take n s = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -57,6 +58,7 @@ diffs/main> add type Type take : Nat -> '{g} t ->{g, Stream a} Optional t term : Nat + diffs/main> branch.create new Done. I've created the new branch based off of main. @@ -90,7 +92,6 @@ take n s = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/delete-namespace-dependents-check.md b/unison-src/transcripts/idempotent/delete-namespace-dependents-check.md index 55bbbc526c..0ded266003 100644 --- a/unison-src/transcripts/idempotent/delete-namespace-dependents-check.md +++ b/unison-src/transcripts/idempotent/delete-namespace-dependents-check.md @@ -15,7 +15,6 @@ dependent = dependency + 99 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -35,12 +34,14 @@ myproject/main> add dependent : Nat sub.dependency : Nat + myproject/main> branch /new Done. I've created the new branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /new`. + myproject/new> delete.namespace sub ⚠️ @@ -53,6 +54,7 @@ myproject/new> delete.namespace sub If you want to proceed anyways and leave those definitions without names, use delete.namespace.force + myproject/new> view dependent dependent : Nat diff --git a/unison-src/transcripts/idempotent/delete-namespace.md b/unison-src/transcripts/idempotent/delete-namespace.md index 3360102d47..c3afeb7cb8 100644 --- a/unison-src/transcripts/idempotent/delete-namespace.md +++ b/unison-src/transcripts/idempotent/delete-namespace.md @@ -88,12 +88,15 @@ scratch/main> delete.namespace . Are you sure you want to clear away everything? You could use `project.create` to switch to a new project instead, or delete the current branch with `delete.branch` + scratch/main> delete.namespace . Okay, I deleted everything except the history. Use `undo` to undo, or `builtins.merge` to restore the absolute basics to the current path. + -- Should have an empty history + scratch/main> history . Note: The most recent namespace hash is immediately below this @@ -112,7 +115,9 @@ scratch/main> delete.namespace.force . Okay, I deleted everything except the history. Use `undo` to undo, or `builtins.merge` to restore the absolute basics to the current path. + -- Should have an empty history + scratch/main> history . Note: The most recent namespace hash is immediately below this diff --git a/unison-src/transcripts/idempotent/delete-project-branch.md b/unison-src/transcripts/idempotent/delete-project-branch.md index 9ed4a06a7e..62f93b38b0 100644 --- a/unison-src/transcripts/idempotent/delete-project-branch.md +++ b/unison-src/transcripts/idempotent/delete-project-branch.md @@ -8,6 +8,7 @@ foo/main> branch topic Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic`. + foo/topic> delete.branch /topic ``` @@ -20,6 +21,7 @@ foo/main> branch topic Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic`. + foo/topic> delete.branch topic ``` @@ -32,6 +34,7 @@ foo/main> branch topic Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic`. + scratch/main> delete.branch foo/topic ``` @@ -45,6 +48,7 @@ You can delete the last branch in the project, a new one will be created. ``` ucm scratch/main> delete.branch scratch/main + scratch/main> branches Branch Remote branch @@ -56,7 +60,9 @@ If the the last branch isn't /main, then /main will be created. ``` ucm scratch/main2> delete.branch /main + scratch/main2> delete.branch /main2 + scratch/other> branches Branch Remote branch diff --git a/unison-src/transcripts/idempotent/delete-project.md b/unison-src/transcripts/idempotent/delete-project.md index 3830718958..3a9a3b90c6 100644 --- a/unison-src/transcripts/idempotent/delete-project.md +++ b/unison-src/transcripts/idempotent/delete-project.md @@ -16,6 +16,7 @@ scratch/main> project.create-empty foo 3. In UCM, type `add` to save it to your new project. 🎉 🥳 Happy coding! + scratch/main> project.create-empty bar 🎉 I've created the project bar. @@ -31,26 +32,39 @@ scratch/main> project.create-empty bar 3. In UCM, type `add` to save it to your new project. 🎉 🥳 Happy coding! + -- I can delete the project I'm currently on + scratch/main> delete.project scratch + foo/main> projects 1. bar 2. foo + -- I can delete a different project + foo/main> delete.project bar + foo/main> projects 1. foo + -- I can delete the last project, a new scratch project will be created + foo/main> delete.project foo + project/main> projects 1. project 2. scratch + -- If the last project is scratch, a scratch2 project will be created. + scratch/main> delete.project project + scratch/main> delete.project scratch + project/main> projects 1. project diff --git a/unison-src/transcripts/idempotent/delete-silent.md b/unison-src/transcripts/idempotent/delete-silent.md index a12f718915..0afc953732 100644 --- a/unison-src/transcripts/idempotent/delete-silent.md +++ b/unison-src/transcripts/idempotent/delete-silent.md @@ -19,12 +19,15 @@ scratch/main> add structural type Foo foo : ##Nat + scratch/main> delete foo Done. + scratch/main> delete.type Foo Done. + scratch/main> delete.term Foo.Foo Done. diff --git a/unison-src/transcripts/idempotent/delete.md b/unison-src/transcripts/idempotent/delete.md index 89e8019007..45ed52aba8 100644 --- a/unison-src/transcripts/idempotent/delete.md +++ b/unison-src/transcripts/idempotent/delete.md @@ -33,6 +33,7 @@ scratch/main> add structural type Foo foo : Nat + scratch/main> delete.verbose foo Removed definitions: @@ -41,6 +42,7 @@ scratch/main> delete.verbose foo Tip: You can use `undo` or use a hash from `reflog` to undo this change. + scratch/main> delete.verbose Foo Removed definitions: @@ -49,6 +51,7 @@ scratch/main> delete.verbose Foo Tip: You can use `undo` or use a hash from `reflog` to undo this change. + scratch/main> delete.verbose Foo.Foo Removed definitions: @@ -73,6 +76,7 @@ scratch/main> add a.bar : Nat a.foo : Nat + scratch/main> debug.alias.term.force a.bar a.foo Done. @@ -95,6 +99,7 @@ scratch/main> delete.verbose a.foo Tip: You can use `undo` or use a hash from `reflog` to undo this change. + scratch/main> ls a 1. bar (Nat) @@ -115,9 +120,11 @@ scratch/main> add structural type a.Bar (also named lib.builtins.Unit) structural type a.Foo + scratch/main> debug.alias.type.force a.Bar a.Foo Done. + scratch/main> delete.verbose a.Foo Removed definitions: @@ -133,6 +140,7 @@ scratch/main> delete.verbose a.Foo Tip: You can use `undo` or use a hash from `reflog` to undo this change. + scratch/main> delete.verbose a.Foo.Foo Removed definitions: @@ -157,6 +165,7 @@ scratch/main> add structural type foo foo : Nat + scratch/main> delete.verbose foo Removed definitions: @@ -184,6 +193,7 @@ scratch/main> add a : Text b : Text c : Text + scratch/main> delete.verbose a b c Removed definitions: @@ -214,6 +224,7 @@ scratch/main> add a : Text b : Text c : Text + scratch/main> delete.verbose a b c Foo Removed definitions: @@ -225,6 +236,7 @@ scratch/main> delete.verbose a b c Foo Tip: You can use `undo` or use a hash from `reflog` to undo this change. + scratch/main> delete.verbose Foo.Foo Name changes: @@ -249,6 +261,7 @@ scratch/main> add ⍟ I've added these definitions: structural type Foo + scratch/main> delete.verbose Foo Foo.Foo Removed definitions: @@ -284,6 +297,7 @@ scratch/main> add (also named a.bar) c : Nat d : Nat + scratch/main> delete.verbose a b c ⚠️ @@ -315,6 +329,7 @@ scratch/main> add f : Nat g : Nat h : Nat + scratch/main> delete.verbose e f g h Removed definitions: @@ -345,6 +360,7 @@ scratch/main> add structural type Foo incrementFoo : Foo -> Nat + scratch/main> delete.verbose Foo Foo.Foo incrementFoo Removed definitions: @@ -375,6 +391,7 @@ scratch/main> add f : Nat g : Nat h : Nat + scratch/main> delete.verbose e f gg ⚠️ @@ -397,6 +414,7 @@ scratch/main> add ping : 'Nat pong : 'Nat + scratch/main> delete.verbose ping Removed definitions: @@ -405,6 +423,7 @@ scratch/main> delete.verbose ping Tip: You can use `undo` or use a hash from `reflog` to undo this change. + scratch/main> view pong pong : 'Nat diff --git a/unison-src/transcripts/idempotent/dependents-dependencies-debugfile.md b/unison-src/transcripts/idempotent/dependents-dependencies-debugfile.md index b41edea0f1..715aefd5b9 100644 --- a/unison-src/transcripts/idempotent/dependents-dependencies-debugfile.md +++ b/unison-src/transcripts/idempotent/dependents-dependencies-debugfile.md @@ -52,9 +52,11 @@ scratch/main> add inside.r : Boolean outside.c : Nat outside.d : Boolean + scratch/main> dependents q q has no dependents. + scratch/main> dependencies q Dependencies of: q @@ -71,6 +73,7 @@ scratch/main> dependencies q Tip: Try `view 4` to see the source of any numbered item in the above list. + scratch/main> dependencies B Dependencies of: type B, B @@ -82,6 +85,7 @@ scratch/main> dependencies B Tip: Try `view 2` to see the source of any numbered item in the above list. + scratch/main> dependencies d Dependencies of: d @@ -100,6 +104,7 @@ scratch/main> dependencies d Tip: Try `view 6` to see the source of any numbered item in the above list. + scratch/main> dependents d Dependents of: d diff --git a/unison-src/transcripts/idempotent/destructuring-binds.md b/unison-src/transcripts/idempotent/destructuring-binds.md index fcaa949d26..e18e80649a 100644 --- a/unison-src/transcripts/idempotent/destructuring-binds.md +++ b/unison-src/transcripts/idempotent/destructuring-binds.md @@ -19,7 +19,6 @@ ex1 tup = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -39,6 +38,7 @@ scratch/main> add ex0 : Nat -> Nat ex1 : (a, b, (Nat, Nat)) -> Nat + scratch/main> view ex0 ex1 ex0 : Nat -> Nat @@ -62,7 +62,6 @@ ex2 tup = match tup with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -86,7 +85,6 @@ ex4 = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I couldn't figure out what a refers to here: @@ -120,7 +118,6 @@ ex5a _ = match (99 + 1, "hi") with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -140,6 +137,7 @@ scratch/main> add ex5 : 'Text ex5a : 'Text + scratch/main> view ex5 ex5a ex5 : 'Text @@ -170,6 +168,7 @@ scratch/main> add ⍟ I've added these definitions: ex6 : (Nat, Nat) -> Nat + scratch/main> view ex6 ex6 : (Nat, Nat) -> Nat diff --git a/unison-src/transcripts/idempotent/diff-namespace.md b/unison-src/transcripts/idempotent/diff-namespace.md index 08f325a6d6..64063922aa 100644 --- a/unison-src/transcripts/idempotent/diff-namespace.md +++ b/unison-src/transcripts/idempotent/diff-namespace.md @@ -1,8 +1,12 @@ ``` ucm :hide scratch/b1> builtins.merge lib.builtins + scratch/b2> builtins.merge lib.builtins + scratch/nsx> builtins.merge lib.builtins + scratch/main> builtins.merge lib.builtins + scratch/ns1> builtins.merge lib.builtins ``` @@ -34,6 +38,7 @@ scratch/b2> add abc : Nat fslkdjflskdjflksjdf : Nat x : Nat + scratch/b1> debug.alias.term.force .x .fslkdjflskdjflksjdf Done. @@ -91,12 +96,15 @@ scratch/ns1> add c : Nat fromJust : Nat helloWorld : Text + scratch/ns1> alias.term fromJust fromJust' Done. + scratch/ns1> alias.term helloWorld helloWorld2 Done. + scratch/ns1> branch /ns2 Done. I've created the ns2 branch based off of ns1. @@ -131,9 +139,11 @@ scratch/ns1> add ⍟ I've added these definitions: junk : Text + scratch/ns1> debug.alias.term.force junk fromJust Done. + scratch/ns1> delete.term junk Done. @@ -159,6 +169,7 @@ scratch/ns2> update Everything typechecks, so I'm saving the results... Done. + scratch/main> diff.namespace /ns1: /ns2: Resolved name conflicts: @@ -191,21 +202,27 @@ scratch/main> diff.namespace /ns1: /ns2: Original Changes 13. fromJust' ┐ 14. fromJust#gjmq673r1v (removed) 15. fromJust#gjmq673r1v ┘ + scratch/ns2> alias.term d d' Done. + scratch/ns2> alias.type A A' Done. + scratch/ns2> alias.term A.A A'.A Done. + scratch/ns2> alias.type X X' Done. + scratch/ns2> alias.term X.x X'.x Done. + scratch/main> diff.namespace /ns1: /ns2: Resolved name conflicts: @@ -247,27 +264,34 @@ scratch/main> diff.namespace /ns1: /ns2: 22. fromJust#gjmq673r1v ┘ 23. X.x 24. X'.x (added) + scratch/ns1> alias.type X X2 Done. + scratch/ns1> alias.term X.x X2.x Done. + scratch/ns2> alias.type A' A'' Done. + scratch/ns2> alias.term A'.A A''.A Done. + scratch/ns2> branch /ns3 Done. I've created the ns3 branch based off of ns2. Tip: To merge your work back into the ns2 branch, first `switch /ns2` then `merge /ns3`. + scratch/ns2> alias.term fromJust' yoohoo Done. + scratch/ns2> delete.term.verbose fromJust' Name changes: @@ -278,6 +302,7 @@ scratch/ns2> delete.term.verbose fromJust' Tip: You can use `undo` or use a hash from `reflog` to undo this change. + scratch/main> diff.namespace /ns3: /ns2: Name changes: @@ -298,6 +323,7 @@ scratch/ns3> update updated... Done. + scratch/main> diff.namespace /ns2: /ns3: Updates: @@ -333,12 +359,14 @@ scratch/nsx> add a : Nat b : Nat forconflicts : Nat + scratch/nsx> branch /nsy Done. I've created the nsy branch based off of nsx. Tip: To merge your work back into the nsx branch, first `switch /nsx` then `merge /nsy`. + scratch/nsx> branch /nsz Done. I've created the nsz branch based off of nsx. @@ -379,15 +407,18 @@ scratch/nsz> update Everything typechecks, so I'm saving the results... Done. + scratch/nsy> branch /nsw Done. I've created the nsw branch based off of nsy. Tip: To merge your work back into the nsy branch, first `switch /nsy` then `merge /nsw`. + scratch/nsw> debug.alias.term.force .forconflicts .a Done. + scratch/nsw> debug.alias.term.force .forconflicts .b Done. @@ -413,6 +444,7 @@ scratch/main> diff.namespace /nsx: /nsw: Original Changes 7. forconflicts 8. a#r3msrbpp1v (added) 9. b#r3msrbpp1v (added) + scratch/nsw> view a a#mdl4vqtu00 : Nat @@ -420,6 +452,7 @@ scratch/nsw> view a a#r3msrbpp1v : Nat a#r3msrbpp1v = 777 + scratch/nsw> view b b#r3msrbpp1v : Nat @@ -438,7 +471,6 @@ x = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -463,7 +495,6 @@ y = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -481,6 +512,7 @@ scratch/hashdiff> add ⍟ I've added these definitions: y : ##Nat + scratch/hashdiff> history Note: The most recent namespace hash is immediately below this @@ -493,6 +525,7 @@ scratch/hashdiff> history y □ 2. #i52j9fd57b (start of history) + scratch/hashdiff> diff.namespace 2 1 Added definitions: diff --git a/unison-src/transcripts/idempotent/doc-formatting.md b/unison-src/transcripts/idempotent/doc-formatting.md index f6404dee11..079b3d5af8 100644 --- a/unison-src/transcripts/idempotent/doc-formatting.md +++ b/unison-src/transcripts/idempotent/doc-formatting.md @@ -14,7 +14,6 @@ foo n = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -47,7 +46,6 @@ escaping = [: Docs look [: like \@this \:] :] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -83,7 +81,6 @@ commented = [: ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -122,7 +119,6 @@ doc1 = [: hi :] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -158,7 +154,6 @@ doc2 = [: hello ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -201,7 +196,6 @@ Note that because of the special treatment of the first line mentioned above, wh ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -252,7 +246,6 @@ doc4 = [: Here's another example of some paragraphs. ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -291,7 +284,6 @@ doc5 = [: - foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -327,7 +319,6 @@ doc6 = [: ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -364,7 +355,6 @@ expr = foo 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -429,7 +419,6 @@ para line lorem ipsum dolor lorem ipsum dolor lorem ipsum dolor lorem ipsum dolo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -515,7 +504,6 @@ reg1363 = [: `@List.take foo` bar ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -549,7 +537,6 @@ test2 = [: ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/doc-type-link-keywords.md b/unison-src/transcripts/idempotent/doc-type-link-keywords.md index 8e9fdb7c99..f44cb26737 100644 --- a/unison-src/transcripts/idempotent/doc-type-link-keywords.md +++ b/unison-src/transcripts/idempotent/doc-type-link-keywords.md @@ -37,12 +37,15 @@ Now we check that each doc links to the object of the correct name: scratch/main> display docs.example1 A doc that links to the abilityPatterns term + scratch/main> display docs.example2 A doc that links to the Patterns ability + scratch/main> display docs.example3 A doc that links to the typeLabels term + scratch/main> display docs.example4 A doc that links to the Labels type diff --git a/unison-src/transcripts/idempotent/doc1.md b/unison-src/transcripts/idempotent/doc1.md index 1c95c14626..85e23d20f6 100644 --- a/unison-src/transcripts/idempotent/doc1.md +++ b/unison-src/transcripts/idempotent/doc1.md @@ -31,7 +31,6 @@ Can link to definitions like @List.drop or @List ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -63,7 +62,6 @@ List.take.ex2 = take 2 [1,2,3,4,5] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -105,7 +103,6 @@ List.take.doc = [: ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/doc2markdown.md b/unison-src/transcripts/idempotent/doc2markdown.md index 9f8a946c0f..a27711ec6a 100644 --- a/unison-src/transcripts/idempotent/doc2markdown.md +++ b/unison-src/transcripts/idempotent/doc2markdown.md @@ -182,7 +182,6 @@ structural type MyStructuralType = MyStructuralType ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/dont-upgrade-refs-that-exist-in-old.md b/unison-src/transcripts/idempotent/dont-upgrade-refs-that-exist-in-old.md index 6672495a0b..69f9032168 100644 --- a/unison-src/transcripts/idempotent/dont-upgrade-refs-that-exist-in-old.md +++ b/unison-src/transcripts/idempotent/dont-upgrade-refs-that-exist-in-old.md @@ -13,7 +13,6 @@ mything = lib.old.foo + lib.old.foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -37,9 +36,11 @@ foo/main> add lib.new.other : Nat lib.old.foo : Nat mything : Nat + foo/main> upgrade old new I upgraded old to new, and removed old. + foo/main> view mything mything : Nat diff --git a/unison-src/transcripts/idempotent/duplicate-names.md b/unison-src/transcripts/idempotent/duplicate-names.md index c1834160e3..7f67014c75 100644 --- a/unison-src/transcripts/idempotent/duplicate-names.md +++ b/unison-src/transcripts/idempotent/duplicate-names.md @@ -15,7 +15,6 @@ Stream.send _ = () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ❗️ @@ -37,7 +36,6 @@ X.x _ = () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ❗️ @@ -58,7 +56,6 @@ structural ability X where ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found two types called X: @@ -78,7 +75,6 @@ X.x = () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ❗️ @@ -110,7 +106,6 @@ X = () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -132,6 +127,7 @@ scratch/main> add structural type X (also named builtin.Unit) X : () + scratch/main> view X structural type X = Z diff --git a/unison-src/transcripts/idempotent/duplicate-term-detection.md b/unison-src/transcripts/idempotent/duplicate-term-detection.md index 0e3eeebe0f..0115bf71a1 100644 --- a/unison-src/transcripts/idempotent/duplicate-term-detection.md +++ b/unison-src/transcripts/idempotent/duplicate-term-detection.md @@ -12,7 +12,6 @@ x = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ❗️ @@ -30,7 +29,6 @@ x = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ❗️ @@ -50,7 +48,6 @@ Record.x.modify = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ❗️ @@ -87,7 +84,6 @@ AnAbility.thing = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ❗️ diff --git a/unison-src/transcripts/idempotent/ed25519.md b/unison-src/transcripts/idempotent/ed25519.md index 11bfafdd77..31311d9132 100644 --- a/unison-src/transcripts/idempotent/ed25519.md +++ b/unison-src/transcripts/idempotent/ed25519.md @@ -25,7 +25,6 @@ sigOkay = match signature with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/edit-command.md b/unison-src/transcripts/idempotent/edit-command.md index e64c2eec4c..1017033416 100644 --- a/unison-src/transcripts/idempotent/edit-command.md +++ b/unison-src/transcripts/idempotent/edit-command.md @@ -11,7 +11,6 @@ mytest = [Ok "ok"] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -33,6 +32,7 @@ scratch/main> add bar : Nat foo : Nat mytest : [Result] + scratch/main> edit.new foo bar ☝️ @@ -41,6 +41,7 @@ scratch/main> edit.new foo bar You can edit them there, then run `update` to replace the definitions currently in this namespace. + scratch/main> edit.new mytest ☝️ @@ -99,7 +100,6 @@ baz = 19 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -129,7 +129,6 @@ bar = 18 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked the definitions in scratch.u. This diff --git a/unison-src/transcripts/idempotent/edit-namespace.md b/unison-src/transcripts/idempotent/edit-namespace.md index 78e8f6aa2f..3e540bb147 100644 --- a/unison-src/transcripts/idempotent/edit-namespace.md +++ b/unison-src/transcripts/idempotent/edit-namespace.md @@ -22,7 +22,6 @@ unique type Foo = { bar : Nat, baz : Nat } ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/empty-namespaces.md b/unison-src/transcripts/idempotent/empty-namespaces.md index 51807308a4..680629e332 100644 --- a/unison-src/transcripts/idempotent/empty-namespaces.md +++ b/unison-src/transcripts/idempotent/empty-namespaces.md @@ -6,6 +6,7 @@ mynamespace.x = 1 ``` ucm :hide scratch/main> add + scratch/main> delete.namespace mynamespace ``` @@ -75,6 +76,7 @@ stuff.thing = 2 ``` ucm :hide scratch/main> add + scratch/main> delete.namespace deleted ``` @@ -99,6 +101,7 @@ scratch/main> history stuff □ 1. #q2dq4tsno1 (start of history) + scratch/main> history deleted Note: The most recent namespace hash is immediately below this @@ -127,6 +130,7 @@ The history should be that of the moved namespace. scratch/main> delete.namespace moveoverme Done. + scratch/main> history moveme Note: The most recent namespace hash is immediately below this @@ -135,9 +139,11 @@ scratch/main> history moveme □ 1. #c5uisu4kll (start of history) + scratch/main> move.namespace moveme moveoverme Done. + scratch/main> history moveoverme Note: The most recent namespace hash is immediately below this diff --git a/unison-src/transcripts/idempotent/emptyCodebase.md b/unison-src/transcripts/idempotent/emptyCodebase.md index 6492740f26..3b2c7090e1 100644 --- a/unison-src/transcripts/idempotent/emptyCodebase.md +++ b/unison-src/transcripts/idempotent/emptyCodebase.md @@ -18,6 +18,7 @@ Technically, the definitions all exist, but they have no names. `builtins.merge` scratch/main> builtins.merge lib.builtins Done. + scratch/main> ls lib 1. builtins/ (469 terms, 74 types) @@ -29,6 +30,7 @@ And for a limited time, you can get even more builtin goodies: scratch/main> builtins.mergeio lib.builtinsio Done. + scratch/main> ls lib 1. builtins/ (469 terms, 74 types) diff --git a/unison-src/transcripts/idempotent/error-messages.md b/unison-src/transcripts/idempotent/error-messages.md index 1496829a52..27d45287c1 100644 --- a/unison-src/transcripts/idempotent/error-messages.md +++ b/unison-src/transcripts/idempotent/error-messages.md @@ -15,7 +15,6 @@ x = 1. -- missing some digits after the decimal ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This number isn't valid syntax: @@ -31,7 +30,6 @@ x = 1e -- missing an exponent ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This number isn't valid syntax: @@ -47,7 +45,6 @@ x = 1e- -- missing an exponent ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This number isn't valid syntax: @@ -63,7 +60,6 @@ x = 1E+ -- missing an exponent ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This number isn't valid syntax: @@ -81,7 +77,6 @@ x = 0xoogabooga -- invalid hex chars ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This number isn't valid syntax: @@ -97,7 +92,6 @@ x = 0o987654321 -- 9 and 8 are not valid octal char ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This number isn't valid syntax: @@ -113,7 +107,6 @@ x = 0b3201 -- 3 and 2 are not valid binary chars ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This number isn't valid syntax: @@ -129,7 +122,6 @@ x = 0xsf -- odd number of hex chars in a bytes literal ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This bytes literal isn't valid syntax: 0xsf @@ -145,7 +137,6 @@ x = 0xsnotvalidhexchars -- invalid hex chars in a bytes literal ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This bytes literal isn't valid syntax: 0xsnotvalidhexchars @@ -163,7 +154,6 @@ foo = else -- not matching if ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found a closing 'else' here without a matching 'then'. @@ -176,7 +166,6 @@ foo = then -- unclosed ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found a closing 'then' here without a matching 'if'. @@ -189,7 +178,6 @@ foo = with -- unclosed ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found a closing 'with' here without a matching 'handle' or 'match'. @@ -205,7 +193,6 @@ foo = match 1 with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -222,7 +209,6 @@ foo = match 1 with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I got confused here: @@ -245,7 +231,6 @@ foo = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. 😶 @@ -268,7 +253,6 @@ x = match Some a with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I got confused here: @@ -295,7 +279,6 @@ x = match Some a with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I got confused here: @@ -318,7 +301,6 @@ x = match Some a with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I got confused here: @@ -341,7 +323,6 @@ x = match Some a with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I expected a non-empty watch expression and not just ">" @@ -356,7 +337,6 @@ use.keyword.in.namespace = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. The identifier `namespace` used here is a reserved keyword: @@ -373,7 +353,6 @@ a ! b = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This looks like the start of an expression here diff --git a/unison-src/transcripts/idempotent/escape-sequences.md b/unison-src/transcripts/idempotent/escape-sequences.md index fdc05a5045..463d97e117 100644 --- a/unison-src/transcripts/idempotent/escape-sequences.md +++ b/unison-src/transcripts/idempotent/escape-sequences.md @@ -5,7 +5,6 @@ ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ diff --git a/unison-src/transcripts/idempotent/find-by-type.md b/unison-src/transcripts/idempotent/find-by-type.md index d4a8f1a26f..156b3a7f72 100644 --- a/unison-src/transcripts/idempotent/find-by-type.md +++ b/unison-src/transcripts/idempotent/find-by-type.md @@ -25,13 +25,16 @@ scratch/main> add bar : Text -> A baz : A -> Text foo : A + scratch/main> find : Text -> A 1. bar : Text -> A 2. A.A : Text -> A + scratch/main> find : A -> Text 1. baz : A -> Text + scratch/main> find : A 1. foo : A diff --git a/unison-src/transcripts/idempotent/find-command.md b/unison-src/transcripts/idempotent/find-command.md index ad1cb6727f..efe319c58a 100644 --- a/unison-src/transcripts/idempotent/find-command.md +++ b/unison-src/transcripts/idempotent/find-command.md @@ -21,16 +21,19 @@ scratch/main> find foo 1. cat.foo : Nat 2. foo : Nat + scratch/main> view 1 cat.foo : Nat cat.foo = 4 + scratch/main> find.all foo 1. cat.foo : Nat 2. cat.lib.foo : Nat 3. lib.foo : Nat 4. foo : Nat + scratch/main> view 1 cat.foo : Nat @@ -41,14 +44,17 @@ scratch/main> view 1 scratch/main> find-in cat foo 1. foo : Nat + scratch/main> view 1 cat.foo : Nat cat.foo = 4 + scratch/main> find-in.all cat foo 1. lib.foo : Nat 2. foo : Nat + scratch/main> view 1 cat.lib.foo : Nat @@ -61,6 +67,7 @@ Finding within a namespace scratch/main> find bar 1. somewhere.bar : Nat + scratch/other> debug.find.global bar Found results in scratch/main @@ -68,6 +75,7 @@ scratch/other> debug.find.global bar 1. .cat.lib.bar : Nat 2. .lib.bar : Nat 3. .somewhere.bar : Nat + scratch/main> find-in somewhere bar 1. bar : Nat diff --git a/unison-src/transcripts/idempotent/fix-5267.md b/unison-src/transcripts/idempotent/fix-5267.md index 475180d672..22cfd2bd71 100644 --- a/unison-src/transcripts/idempotent/fix-5267.md +++ b/unison-src/transcripts/idempotent/fix-5267.md @@ -11,7 +11,6 @@ bar = direct.foo + direct.foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -36,6 +35,7 @@ scratch/main> add bar : Nat lib.direct.foo : Nat lib.direct.lib.indirect.foo : Nat + scratch/main> view bar bar : Nat @@ -54,7 +54,6 @@ type Bar = MkBar direct.Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -76,6 +75,7 @@ scratch/main> add type Bar type lib.direct.Foo type lib.direct.lib.indirect.Foo + scratch/main> view Bar type Bar = MkBar Foo diff --git a/unison-src/transcripts/idempotent/fix-5301.md b/unison-src/transcripts/idempotent/fix-5301.md index be2a126470..4e6621cb46 100644 --- a/unison-src/transcripts/idempotent/fix-5301.md +++ b/unison-src/transcripts/idempotent/fix-5301.md @@ -16,7 +16,6 @@ foo = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. @@ -43,7 +42,6 @@ foo = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/idempotent/fix-5312.md b/unison-src/transcripts/idempotent/fix-5312.md index 710cf258c2..870083dcad 100644 --- a/unison-src/transcripts/idempotent/fix-5312.md +++ b/unison-src/transcripts/idempotent/fix-5312.md @@ -17,7 +17,6 @@ c = b.y + 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -48,7 +47,6 @@ x = 100 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix-5320.md b/unison-src/transcripts/idempotent/fix-5320.md index a4142f5c3a..229cab0c43 100644 --- a/unison-src/transcripts/idempotent/fix-5320.md +++ b/unison-src/transcripts/idempotent/fix-5320.md @@ -10,7 +10,6 @@ foo = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/idempotent/fix-5323.md b/unison-src/transcripts/idempotent/fix-5323.md index 873797fadc..7c658afc5a 100644 --- a/unison-src/transcripts/idempotent/fix-5323.md +++ b/unison-src/transcripts/idempotent/fix-5323.md @@ -18,7 +18,6 @@ c = b.y + 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix-5326.md b/unison-src/transcripts/idempotent/fix-5326.md index 71e7894ed9..cc5d8a12e2 100644 --- a/unison-src/transcripts/idempotent/fix-5326.md +++ b/unison-src/transcripts/idempotent/fix-5326.md @@ -9,7 +9,6 @@ x = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -28,6 +27,7 @@ scratch/main> update updated... Done. + scratch/main> branch foo Done. I've created the foo branch based off of main. @@ -47,7 +47,6 @@ x = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -67,6 +66,7 @@ scratch/main> update updated... Done. + scratch/main> branch bar Done. I've created the bar branch based off of main. @@ -88,7 +88,6 @@ x = 3 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -123,7 +122,6 @@ x = 4 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -158,7 +156,6 @@ y = 5 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix-5340.md b/unison-src/transcripts/idempotent/fix-5340.md index f4825dcdbc..1e13d6c1c0 100644 --- a/unison-src/transcripts/idempotent/fix-5340.md +++ b/unison-src/transcripts/idempotent/fix-5340.md @@ -11,7 +11,6 @@ lib.dep.lib.dep.foo = 18 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -46,7 +45,6 @@ type Bar = MkBar Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -66,7 +64,6 @@ bar = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix-5357.md b/unison-src/transcripts/idempotent/fix-5357.md index ad9c45ca93..08bbb58500 100644 --- a/unison-src/transcripts/idempotent/fix-5357.md +++ b/unison-src/transcripts/idempotent/fix-5357.md @@ -9,7 +9,6 @@ foo = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -37,7 +36,6 @@ lib.base.ignore _ = () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -57,6 +55,7 @@ scratch/main> add lib.base.ignore : a -> () (also named util.ignore) + scratch/main> edit.namespace ☝️ @@ -65,6 +64,7 @@ scratch/main> edit.namespace You can edit them there, then run `update` to replace the definitions currently in this namespace. + scratch/main> load Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/idempotent/fix-5369.md b/unison-src/transcripts/idempotent/fix-5369.md index 6559b94f26..d947810f51 100644 --- a/unison-src/transcripts/idempotent/fix-5369.md +++ b/unison-src/transcripts/idempotent/fix-5369.md @@ -13,7 +13,6 @@ two.foo = "blah" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -44,7 +43,6 @@ bar = foo + foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix-5374.md b/unison-src/transcripts/idempotent/fix-5374.md index 4b60ad1775..6cd2957351 100644 --- a/unison-src/transcripts/idempotent/fix-5374.md +++ b/unison-src/transcripts/idempotent/fix-5374.md @@ -10,7 +10,6 @@ thing = indirect.foo + indirect.foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -32,6 +31,7 @@ scratch/main> add lib.direct.foo : Nat lib.direct.lib.indirect.foo : Nat thing : Nat + scratch/main> view thing thing : Nat @@ -39,6 +39,7 @@ scratch/main> view thing use Nat + use indirect foo foo + foo + scratch/main> edit.new thing ☝️ diff --git a/unison-src/transcripts/idempotent/fix-5380.md b/unison-src/transcripts/idempotent/fix-5380.md index f24dcaa513..b9d1329db3 100644 --- a/unison-src/transcripts/idempotent/fix-5380.md +++ b/unison-src/transcripts/idempotent/fix-5380.md @@ -16,7 +16,6 @@ bar = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -36,9 +35,11 @@ scratch/main> add bar : Nat foo : Nat + scratch/main> move.term foo qux Done. + scratch/main> view bar bar : Nat diff --git a/unison-src/transcripts/idempotent/fix-5433.md b/unison-src/transcripts/idempotent/fix-5433.md index 2e8715129c..0151405618 100644 --- a/unison-src/transcripts/idempotent/fix-5433.md +++ b/unison-src/transcripts/idempotent/fix-5433.md @@ -10,7 +10,6 @@ ability foo.Bar where ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -41,7 +40,6 @@ hello = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix-big-list-crash.md b/unison-src/transcripts/idempotent/fix-big-list-crash.md index 1ab91c73a7..2f0134bd47 100644 --- a/unison-src/transcripts/idempotent/fix-big-list-crash.md +++ b/unison-src/transcripts/idempotent/fix-big-list-crash.md @@ -13,7 +13,6 @@ x = [(R,1005),(U,563),(R,417),(U,509),(L,237),(U,555),(R,397),(U,414),(L,490),(U ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix-ls.md b/unison-src/transcripts/idempotent/fix-ls.md index a6b134972c..e1ccc5862f 100644 --- a/unison-src/transcripts/idempotent/fix-ls.md +++ b/unison-src/transcripts/idempotent/fix-ls.md @@ -11,7 +11,6 @@ foo.bar.subtract x y = x Int.- y ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -31,9 +30,11 @@ test-ls/main> add foo.bar.add : Int -> Int -> Int foo.bar.subtract : Int -> Int -> Int + test-ls/main> ls foo 1. bar/ (2 terms) + test-ls/main> ls 1 1. add (Int -> Int -> Int) diff --git a/unison-src/transcripts/idempotent/fix1063.md b/unison-src/transcripts/idempotent/fix1063.md index 03399ce4a0..1ac4910678 100644 --- a/unison-src/transcripts/idempotent/fix1063.md +++ b/unison-src/transcripts/idempotent/fix1063.md @@ -13,7 +13,6 @@ noop = not `.` not ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -33,6 +32,7 @@ scratch/main> add `.` : (i1 ->{g1} o) -> (i ->{g} i1) -> i ->{g1, g} o noop : Boolean -> Boolean + scratch/main> view noop noop : Boolean -> Boolean diff --git a/unison-src/transcripts/idempotent/fix1327.md b/unison-src/transcripts/idempotent/fix1327.md index f93ab84b4c..a6f700bc83 100644 --- a/unison-src/transcripts/idempotent/fix1327.md +++ b/unison-src/transcripts/idempotent/fix1327.md @@ -5,7 +5,6 @@ bar = 5 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -29,10 +28,12 @@ scratch/main> add bar : ##Nat foo : ##Nat + scratch/main> ls 1. bar (##Nat) 2. foo (##Nat) + scratch/main> alias.many 1-2 .ns1_nohistory Here's what changed in .ns1_nohistory : diff --git a/unison-src/transcripts/idempotent/fix1334.md b/unison-src/transcripts/idempotent/fix1334.md index f0475b4de6..7d8a03e930 100644 --- a/unison-src/transcripts/idempotent/fix1334.md +++ b/unison-src/transcripts/idempotent/fix1334.md @@ -8,6 +8,7 @@ Let's make some hash-only aliases, now that we can. :mad-with-power-emoji: scratch/main> alias.type ##Nat Cat Done. + scratch/main> alias.term ##Nat.+ please_fix_763.+ Done. diff --git a/unison-src/transcripts/idempotent/fix1390.md b/unison-src/transcripts/idempotent/fix1390.md index 40ae203bca..f597292177 100644 --- a/unison-src/transcripts/idempotent/fix1390.md +++ b/unison-src/transcripts/idempotent/fix1390.md @@ -14,7 +14,6 @@ List.map f = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -32,6 +31,7 @@ scratch/main> add ⍟ I've added these definitions: List.map : (i ->{g} o) -> [i] ->{g} [o] + scratch/main> view List.map List.map : (i ->{g} o) -> [i] ->{g} [o] @@ -53,7 +53,6 @@ List.map2 f = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix1421.md b/unison-src/transcripts/idempotent/fix1421.md index d372af4910..56b592a2db 100644 --- a/unison-src/transcripts/idempotent/fix1421.md +++ b/unison-src/transcripts/idempotent/fix1421.md @@ -2,6 +2,7 @@ scratch/main> alias.type ##Nat Nat Done. + scratch/main> alias.term ##Nat.+ Nat.+ Done. @@ -13,7 +14,6 @@ unique type B = B Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix1532.md b/unison-src/transcripts/idempotent/fix1532.md index 6d44d627e5..8a7f4dd1e8 100644 --- a/unison-src/transcripts/idempotent/fix1532.md +++ b/unison-src/transcripts/idempotent/fix1532.md @@ -13,7 +13,6 @@ bar.z = x + y ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -81,6 +80,7 @@ We can then delete the dependent term, and then delete `foo`. scratch/main> delete.term 1 Done. + scratch/main> delete.namespace foo Done. diff --git a/unison-src/transcripts/idempotent/fix1696.md b/unison-src/transcripts/idempotent/fix1696.md index 4461c47c64..44c796315f 100644 --- a/unison-src/transcripts/idempotent/fix1696.md +++ b/unison-src/transcripts/idempotent/fix1696.md @@ -21,7 +21,6 @@ dialog = Ask.provide 'zoot '("Awesome number: " ++ Nat.toText Ask.ask ++ "!") ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. The expression in red needs the {Zoot} ability, but this location does not have access to any abilities. diff --git a/unison-src/transcripts/idempotent/fix1709.md b/unison-src/transcripts/idempotent/fix1709.md index 5b73cc3a96..324e2564c5 100644 --- a/unison-src/transcripts/idempotent/fix1709.md +++ b/unison-src/transcripts/idempotent/fix1709.md @@ -7,7 +7,6 @@ id2 x = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -34,7 +33,6 @@ scratch/main> add ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ diff --git a/unison-src/transcripts/idempotent/fix1731.md b/unison-src/transcripts/idempotent/fix1731.md index 45341bc675..b64f221eeb 100644 --- a/unison-src/transcripts/idempotent/fix1731.md +++ b/unison-src/transcripts/idempotent/fix1731.md @@ -21,7 +21,6 @@ repro = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix1800.md b/unison-src/transcripts/idempotent/fix1800.md index ee969c0eed..f47a148448 100644 --- a/unison-src/transcripts/idempotent/fix1800.md +++ b/unison-src/transcripts/idempotent/fix1800.md @@ -28,12 +28,15 @@ Testing a few variations here: scratch/main> run main1 () + scratch/main> run main2 () + scratch/main> run main3 () + scratch/main> add ⍟ I've added these definitions: @@ -42,12 +45,15 @@ scratch/main> add main2 : ∀ _. _ ->{IO} () main3 : '{IO} () printLine : Text ->{IO} () + scratch/main> rename.term main1 code.main1 Done. + scratch/main> rename.term main2 code.main2 Done. + scratch/main> rename.term main3 code.main3 Done. @@ -59,9 +65,11 @@ The renaming just ensures that when running `code.main1`, it has to get that mai scratch/main> run code.main1 () + scratch/main> run code.main2 () + scratch/main> run code.main3 () diff --git a/unison-src/transcripts/idempotent/fix1844.md b/unison-src/transcripts/idempotent/fix1844.md index 60a97a6e2f..0188dd0c8a 100644 --- a/unison-src/transcripts/idempotent/fix1844.md +++ b/unison-src/transcripts/idempotent/fix1844.md @@ -10,7 +10,6 @@ snoc k aN = match k with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix1926.md b/unison-src/transcripts/idempotent/fix1926.md index 0363045c97..001e7f7ba7 100644 --- a/unison-src/transcripts/idempotent/fix1926.md +++ b/unison-src/transcripts/idempotent/fix1926.md @@ -11,7 +11,6 @@ sq = 2934892384 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -37,7 +36,6 @@ sq = 2934892384 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2026.md b/unison-src/transcripts/idempotent/fix2026.md index eb9ec090e5..5aa3edabf4 100644 --- a/unison-src/transcripts/idempotent/fix2026.md +++ b/unison-src/transcripts/idempotent/fix2026.md @@ -40,7 +40,6 @@ Exception.unsafeRun! e _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2027.md b/unison-src/transcripts/idempotent/fix2027.md index fe4095adbf..3a4088f2a0 100644 --- a/unison-src/transcripts/idempotent/fix2027.md +++ b/unison-src/transcripts/idempotent/fix2027.md @@ -49,7 +49,6 @@ myServer = unsafeRun! '(hello "127.0.0.1" "0") ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2049.md b/unison-src/transcripts/idempotent/fix2049.md index 21686574b7..4c13479448 100644 --- a/unison-src/transcripts/idempotent/fix2049.md +++ b/unison-src/transcripts/idempotent/fix2049.md @@ -53,7 +53,6 @@ Fold.Stream.fold = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -111,7 +110,6 @@ tests _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -131,6 +129,7 @@ scratch/main> add catcher : '{IO} () ->{IO} Result tests : ∀ _. _ ->{IO} [Result] + scratch/main> io.test tests New test results: diff --git a/unison-src/transcripts/idempotent/fix2156.md b/unison-src/transcripts/idempotent/fix2156.md index e0823b9652..b90eebc481 100644 --- a/unison-src/transcripts/idempotent/fix2156.md +++ b/unison-src/transcripts/idempotent/fix2156.md @@ -13,7 +13,6 @@ sqr n = n * n ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2167.md b/unison-src/transcripts/idempotent/fix2167.md index 58613b9685..04b01deb66 100644 --- a/unison-src/transcripts/idempotent/fix2167.md +++ b/unison-src/transcripts/idempotent/fix2167.md @@ -20,7 +20,6 @@ R.near1 region loc = match R.near 42 with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2187.md b/unison-src/transcripts/idempotent/fix2187.md index 9357219032..16d3275dc5 100644 --- a/unison-src/transcripts/idempotent/fix2187.md +++ b/unison-src/transcripts/idempotent/fix2187.md @@ -19,7 +19,6 @@ lexicalScopeEx = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2231.md b/unison-src/transcripts/idempotent/fix2231.md index c6230bfa08..871f5e2b89 100644 --- a/unison-src/transcripts/idempotent/fix2231.md +++ b/unison-src/transcripts/idempotent/fix2231.md @@ -25,7 +25,6 @@ txt = foldl (Text.++) "" ["a", "b", "c"] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2238.md b/unison-src/transcripts/idempotent/fix2238.md index 2e8c2f3a98..623cbdf3f2 100644 --- a/unison-src/transcripts/idempotent/fix2238.md +++ b/unison-src/transcripts/idempotent/fix2238.md @@ -11,7 +11,6 @@ ex = {{ @eval{abort} }} ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. The expression in red needs the {Abort} ability, but this location does not have access to any abilities. @@ -33,7 +32,6 @@ abort + 1 ```` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. The expression in red needs the {Abort} ability, but this location does not have access to any abilities. diff --git a/unison-src/transcripts/idempotent/fix2244.md b/unison-src/transcripts/idempotent/fix2244.md index 6a223fb14e..ba3c1077fc 100644 --- a/unison-src/transcripts/idempotent/fix2244.md +++ b/unison-src/transcripts/idempotent/fix2244.md @@ -18,7 +18,6 @@ let ```` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2254.md b/unison-src/transcripts/idempotent/fix2254.md index dcb8e9668d..694c90acb4 100644 --- a/unison-src/transcripts/idempotent/fix2254.md +++ b/unison-src/transcripts/idempotent/fix2254.md @@ -47,6 +47,7 @@ scratch/a> add f2 : A Nat Nat Nat Nat -> Nat f3 : NeedsA Nat Nat -> Nat g : A Nat Nat Nat Nat -> Nat + scratch/a> branch /a2 Done. I've created the a2 branch based off of a. @@ -79,6 +80,7 @@ scratch/a2> update Everything typechecks, so I'm saving the results... Done. + scratch/a2> view A NeedsA f f2 f3 g type A a b c d @@ -112,6 +114,7 @@ scratch/a2> view A NeedsA f f2 f3 g g = cases D n -> n _ -> 43 + scratch/a2> todo You have no pending todo items. Good work! ✅ @@ -132,7 +135,6 @@ combine r = uno r + dos r ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -164,6 +166,7 @@ scratch/r1> add Rec.uno.modify : (Nat ->{g} Nat) -> Rec ->{g} Rec Rec.uno.set : Nat -> Rec -> Rec combine : Rec -> Nat + scratch/r1> branch r2 Done. I've created the r2 branch based off of r1. @@ -177,7 +180,6 @@ structural type Rec = { uno : Nat, dos : Nat, tres : Text } ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -215,6 +217,7 @@ scratch/r2> update Everything typechecks, so I'm saving the results... Done. + scratch/r2> todo You have no pending todo items. Good work! ✅ diff --git a/unison-src/transcripts/idempotent/fix2268.md b/unison-src/transcripts/idempotent/fix2268.md index b75a1ac3c4..afe51a4072 100644 --- a/unison-src/transcripts/idempotent/fix2268.md +++ b/unison-src/transcripts/idempotent/fix2268.md @@ -20,7 +20,6 @@ test _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2334.md b/unison-src/transcripts/idempotent/fix2334.md index 7235d10d6b..c5e126d113 100644 --- a/unison-src/transcripts/idempotent/fix2334.md +++ b/unison-src/transcripts/idempotent/fix2334.md @@ -19,7 +19,6 @@ f = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2344.md b/unison-src/transcripts/idempotent/fix2344.md index ebf6ec6399..47c0c09d67 100644 --- a/unison-src/transcripts/idempotent/fix2344.md +++ b/unison-src/transcripts/idempotent/fix2344.md @@ -21,7 +21,6 @@ sneezy dee _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2350.md b/unison-src/transcripts/idempotent/fix2350.md index 4eda0fee4f..8a741ff4bf 100644 --- a/unison-src/transcripts/idempotent/fix2350.md +++ b/unison-src/transcripts/idempotent/fix2350.md @@ -29,7 +29,6 @@ save a = !(save.impl a) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2353.md b/unison-src/transcripts/idempotent/fix2353.md index 5d404425c2..2c68391d65 100644 --- a/unison-src/transcripts/idempotent/fix2353.md +++ b/unison-src/transcripts/idempotent/fix2353.md @@ -16,7 +16,6 @@ pure.run a0 a = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2354.md b/unison-src/transcripts/idempotent/fix2354.md index 7a0eeea719..abdbbbde67 100644 --- a/unison-src/transcripts/idempotent/fix2354.md +++ b/unison-src/transcripts/idempotent/fix2354.md @@ -13,7 +13,6 @@ x = 'f ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found a value of type: (a1 ->{𝕖} a1) ->{𝕖} Nat diff --git a/unison-src/transcripts/idempotent/fix2355.md b/unison-src/transcripts/idempotent/fix2355.md index e04b76fa87..c0d7eb8cbf 100644 --- a/unison-src/transcripts/idempotent/fix2355.md +++ b/unison-src/transcripts/idempotent/fix2355.md @@ -24,7 +24,6 @@ example = 'let ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I tried to infer a cyclic ability. diff --git a/unison-src/transcripts/idempotent/fix2378.md b/unison-src/transcripts/idempotent/fix2378.md index e8003d95c4..b9e8b28575 100644 --- a/unison-src/transcripts/idempotent/fix2378.md +++ b/unison-src/transcripts/idempotent/fix2378.md @@ -43,7 +43,6 @@ x _ = Ex.catch '(C.pure.run '(A.pure.run ex)) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2423.md b/unison-src/transcripts/idempotent/fix2423.md index 4d80a93472..6dd068d1f2 100644 --- a/unison-src/transcripts/idempotent/fix2423.md +++ b/unison-src/transcripts/idempotent/fix2423.md @@ -31,7 +31,6 @@ Split.zipSame sa sb _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2474.md b/unison-src/transcripts/idempotent/fix2474.md index 6ddb859310..b2c4ba25c4 100644 --- a/unison-src/transcripts/idempotent/fix2474.md +++ b/unison-src/transcripts/idempotent/fix2474.md @@ -38,7 +38,6 @@ Stream.uncons s = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2628.md b/unison-src/transcripts/idempotent/fix2628.md index 02a9894f11..f7c62a4826 100644 --- a/unison-src/transcripts/idempotent/fix2628.md +++ b/unison-src/transcripts/idempotent/fix2628.md @@ -21,6 +21,7 @@ scratch/main> add foo.bar.baz.MyRecord.value.set : Nat -> MyRecord -> MyRecord + scratch/main> find : Nat -> MyRecord 1. foo.bar.baz.MyRecord.MyRecord : Nat -> MyRecord diff --git a/unison-src/transcripts/idempotent/fix2663.md b/unison-src/transcripts/idempotent/fix2663.md index 59667660af..7412c7a8ca 100644 --- a/unison-src/transcripts/idempotent/fix2663.md +++ b/unison-src/transcripts/idempotent/fix2663.md @@ -25,7 +25,6 @@ bad x = match Some (Some x) with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2693.md b/unison-src/transcripts/idempotent/fix2693.md index 31ca467e57..c095fe7447 100644 --- a/unison-src/transcripts/idempotent/fix2693.md +++ b/unison-src/transcripts/idempotent/fix2693.md @@ -13,7 +13,6 @@ range = loop [] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -40,7 +39,6 @@ scratch/main> add ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ @@ -2062,7 +2060,6 @@ Should be cached: ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ diff --git a/unison-src/transcripts/idempotent/fix2712.md b/unison-src/transcripts/idempotent/fix2712.md index 2787499d1a..88e111877a 100644 --- a/unison-src/transcripts/idempotent/fix2712.md +++ b/unison-src/transcripts/idempotent/fix2712.md @@ -10,7 +10,6 @@ mapWithKey f m = Tip ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -46,7 +45,6 @@ naiomi = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2795.md b/unison-src/transcripts/idempotent/fix2795.md index 6dcde3bad3..ff161f91d7 100644 --- a/unison-src/transcripts/idempotent/fix2795.md +++ b/unison-src/transcripts/idempotent/fix2795.md @@ -20,7 +20,6 @@ t1 = "hi" ```` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2822.md b/unison-src/transcripts/idempotent/fix2822.md index 8dadc1c54c..95e396946a 100644 --- a/unison-src/transcripts/idempotent/fix2822.md +++ b/unison-src/transcripts/idempotent/fix2822.md @@ -13,7 +13,6 @@ b = _a.blah + 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -35,7 +34,6 @@ x = _b + 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -58,7 +56,6 @@ c = A ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -80,7 +77,6 @@ doStuff = _value.modify ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -105,7 +101,6 @@ dontMap f = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I couldn't figure out what _used refers to here: @@ -131,7 +126,6 @@ dontMap f = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix2826.md b/unison-src/transcripts/idempotent/fix2826.md index 4605a38467..29ab08d8c3 100644 --- a/unison-src/transcripts/idempotent/fix2826.md +++ b/unison-src/transcripts/idempotent/fix2826.md @@ -15,7 +15,6 @@ doc = {{ ```` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -35,6 +34,7 @@ scratch/main> add ⍟ I've added these definitions: doc : Doc2 + scratch/main> edit.new doc ☝️ @@ -43,6 +43,7 @@ scratch/main> edit.new doc You can edit them there, then run `update` to replace the definitions currently in this namespace. + scratch/main> load scratch.u Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/idempotent/fix2970.md b/unison-src/transcripts/idempotent/fix2970.md index bcbbf93c4f..fbae0cdc4b 100644 --- a/unison-src/transcripts/idempotent/fix2970.md +++ b/unison-src/transcripts/idempotent/fix2970.md @@ -12,7 +12,6 @@ foo.+.doc = 10 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix3037.md b/unison-src/transcripts/idempotent/fix3037.md index b3bd705af6..d709d8984c 100644 --- a/unison-src/transcripts/idempotent/fix3037.md +++ b/unison-src/transcripts/idempotent/fix3037.md @@ -18,7 +18,6 @@ runner = pureRunner ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found an ability mismatch when checking the expression in red @@ -51,7 +50,6 @@ h _ = () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found an ability mismatch when checking the application diff --git a/unison-src/transcripts/idempotent/fix3171.md b/unison-src/transcripts/idempotent/fix3171.md index e15ba83254..b01d751fee 100644 --- a/unison-src/transcripts/idempotent/fix3171.md +++ b/unison-src/transcripts/idempotent/fix3171.md @@ -14,7 +14,6 @@ f x y z _ = x + y * z ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix3196.md b/unison-src/transcripts/idempotent/fix3196.md index 02f78449f7..a64b3d79f0 100644 --- a/unison-src/transcripts/idempotent/fix3196.md +++ b/unison-src/transcripts/idempotent/fix3196.md @@ -34,7 +34,6 @@ w2 = cases W -> W ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix3215.md b/unison-src/transcripts/idempotent/fix3215.md index 43f652eb67..714b93434c 100644 --- a/unison-src/transcripts/idempotent/fix3215.md +++ b/unison-src/transcripts/idempotent/fix3215.md @@ -21,7 +21,6 @@ f = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix3244.md b/unison-src/transcripts/idempotent/fix3244.md index 8159eb8b28..6f0f947f4a 100644 --- a/unison-src/transcripts/idempotent/fix3244.md +++ b/unison-src/transcripts/idempotent/fix3244.md @@ -21,7 +21,6 @@ foo t = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix3265.md b/unison-src/transcripts/idempotent/fix3265.md index 11547b8bf3..f900a74015 100644 --- a/unison-src/transcripts/idempotent/fix3265.md +++ b/unison-src/transcripts/idempotent/fix3265.md @@ -26,7 +26,6 @@ are three cases that need to be 'fixed up.' ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ @@ -71,7 +70,6 @@ discard its arguments, where `f` also occurs. ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ diff --git a/unison-src/transcripts/idempotent/fix3424.md b/unison-src/transcripts/idempotent/fix3424.md index 95a1b880ea..dbd2e089f6 100644 --- a/unison-src/transcripts/idempotent/fix3424.md +++ b/unison-src/transcripts/idempotent/fix3424.md @@ -18,6 +18,7 @@ scratch/main> add a : 'Text b : Text c : Text + scratch/main> run a "Hello, World!" @@ -39,6 +40,7 @@ scratch/main> update Everything typechecks, so I'm saving the results... Done. + scratch/main> run a "Hello, Unison!" diff --git a/unison-src/transcripts/idempotent/fix3634.md b/unison-src/transcripts/idempotent/fix3634.md index fcd46aade7..57c398d09d 100644 --- a/unison-src/transcripts/idempotent/fix3634.md +++ b/unison-src/transcripts/idempotent/fix3634.md @@ -15,7 +15,6 @@ d = {{ ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -37,6 +36,7 @@ scratch/main> add structural type M a (also named builtin.Optional) d : Doc2 + scratch/main> display d `x -> J x` diff --git a/unison-src/transcripts/idempotent/fix3678.md b/unison-src/transcripts/idempotent/fix3678.md index f8c1dff0fb..d2eb422079 100644 --- a/unison-src/transcripts/idempotent/fix3678.md +++ b/unison-src/transcripts/idempotent/fix3678.md @@ -13,7 +13,6 @@ arr = Scope.run do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix3752.md b/unison-src/transcripts/idempotent/fix3752.md index 25d17717ba..c017e69933 100644 --- a/unison-src/transcripts/idempotent/fix3752.md +++ b/unison-src/transcripts/idempotent/fix3752.md @@ -21,7 +21,6 @@ bar = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix3773.md b/unison-src/transcripts/idempotent/fix3773.md index b781453bb3..52258f5ff9 100644 --- a/unison-src/transcripts/idempotent/fix3773.md +++ b/unison-src/transcripts/idempotent/fix3773.md @@ -12,7 +12,6 @@ foo = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix3977.md b/unison-src/transcripts/idempotent/fix3977.md index a5fa87d3e2..f779785cf4 100644 --- a/unison-src/transcripts/idempotent/fix3977.md +++ b/unison-src/transcripts/idempotent/fix3977.md @@ -17,6 +17,7 @@ scratch/main> add failure : Text -> context -> Failure foo : Either Failure b + scratch/main> edit.new foo ☝️ @@ -25,6 +26,7 @@ scratch/main> edit.new foo You can edit them there, then run `update` to replace the definitions currently in this namespace. + scratch/main> load scratch.u Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/idempotent/fix4172.md b/unison-src/transcripts/idempotent/fix4172.md index e87835951c..8a4009a499 100644 --- a/unison-src/transcripts/idempotent/fix4172.md +++ b/unison-src/transcripts/idempotent/fix4172.md @@ -16,7 +16,6 @@ allowDebug = debug [1,2,3] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -47,6 +46,7 @@ scratch/main> add bool : Boolean debug : a -> Text t1 : [Result] + scratch/main> test Cached test results (`help testcache` to learn more) @@ -63,7 +63,6 @@ bool = false ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -82,6 +81,7 @@ scratch/main> update.old ⍟ I've updated these names to your new definition: bool : Boolean + scratch/main> test ✅ diff --git a/unison-src/transcripts/idempotent/fix4280.md b/unison-src/transcripts/idempotent/fix4280.md index 8d7ff2c2d0..5f5d6d2a9a 100644 --- a/unison-src/transcripts/idempotent/fix4280.md +++ b/unison-src/transcripts/idempotent/fix4280.md @@ -12,7 +12,6 @@ bonk = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix4397.md b/unison-src/transcripts/idempotent/fix4397.md index fa95e4a577..6757d22342 100644 --- a/unison-src/transcripts/idempotent/fix4397.md +++ b/unison-src/transcripts/idempotent/fix4397.md @@ -8,7 +8,6 @@ unique type Bar ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Kind mismatch arising from diff --git a/unison-src/transcripts/idempotent/fix4415.md b/unison-src/transcripts/idempotent/fix4415.md index 541d736413..2f6087477e 100644 --- a/unison-src/transcripts/idempotent/fix4415.md +++ b/unison-src/transcripts/idempotent/fix4415.md @@ -4,7 +4,6 @@ unique type sub.Foo = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix4482.md b/unison-src/transcripts/idempotent/fix4482.md index 8cabe342e1..ef8705ba8d 100644 --- a/unison-src/transcripts/idempotent/fix4482.md +++ b/unison-src/transcripts/idempotent/fix4482.md @@ -11,7 +11,6 @@ mybar = bar + bar ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -37,6 +36,7 @@ myproj/main> add lib.foo1.lib.bonk2.qux : Nat lib.foo1.zonk : Nat mybar : Nat + myproj/main> upgrade foo0 foo1 I couldn't automatically upgrade foo0 to foo1. However, I've diff --git a/unison-src/transcripts/idempotent/fix4498.md b/unison-src/transcripts/idempotent/fix4498.md index 00614c6a9e..350fa8cdf1 100644 --- a/unison-src/transcripts/idempotent/fix4498.md +++ b/unison-src/transcripts/idempotent/fix4498.md @@ -10,7 +10,6 @@ myterm = foo + 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -34,6 +33,7 @@ scratch/main> add lib.dep0.lib.dep1.foo : Nat lib.dep0.zonk.foo : Text myterm : Nat + scratch/main> view myterm myterm : Nat diff --git a/unison-src/transcripts/idempotent/fix4515.md b/unison-src/transcripts/idempotent/fix4515.md index 87e3c19cea..534be7e156 100644 --- a/unison-src/transcripts/idempotent/fix4515.md +++ b/unison-src/transcripts/idempotent/fix4515.md @@ -13,7 +13,6 @@ useBar = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -44,7 +43,6 @@ unique type Foo = Foo1 | Foo2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix4528.md b/unison-src/transcripts/idempotent/fix4528.md index 6c7f76915f..d91b7f016e 100644 --- a/unison-src/transcripts/idempotent/fix4528.md +++ b/unison-src/transcripts/idempotent/fix4528.md @@ -10,7 +10,6 @@ main _ = MkFoo 5 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -30,6 +29,7 @@ foo/main> add structural type Foo main : 'Foo + foo/main> run main MkFoo 5 diff --git a/unison-src/transcripts/idempotent/fix4556.md b/unison-src/transcripts/idempotent/fix4556.md index 30048e4bb3..6b991bddb9 100644 --- a/unison-src/transcripts/idempotent/fix4556.md +++ b/unison-src/transcripts/idempotent/fix4556.md @@ -10,7 +10,6 @@ hey = foo.hello ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -41,7 +40,6 @@ thing = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix4592.md b/unison-src/transcripts/idempotent/fix4592.md index 4379da14a5..f3e903cfdd 100644 --- a/unison-src/transcripts/idempotent/fix4592.md +++ b/unison-src/transcripts/idempotent/fix4592.md @@ -8,7 +8,6 @@ doc = {{ {{ bug "bug" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix4618.md b/unison-src/transcripts/idempotent/fix4618.md index b8e775dc2a..5e1f55a800 100644 --- a/unison-src/transcripts/idempotent/fix4618.md +++ b/unison-src/transcripts/idempotent/fix4618.md @@ -8,7 +8,6 @@ unique type Bugs.Zonk = Bugs ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -36,7 +35,6 @@ unique type Bugs = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix4711.md b/unison-src/transcripts/idempotent/fix4711.md index 60898eb914..9365bf01aa 100644 --- a/unison-src/transcripts/idempotent/fix4711.md +++ b/unison-src/transcripts/idempotent/fix4711.md @@ -11,7 +11,6 @@ thisDoesNotWork = ['(+1)] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -33,6 +32,7 @@ scratch/main> add thisDoesNotWork : ['{g} Int] thisWorks : 'Int + scratch/main> edit.new thisWorks thisDoesNotWork ☝️ @@ -41,6 +41,7 @@ scratch/main> edit.new thisWorks thisDoesNotWork You can edit them there, then run `update` to replace the definitions currently in this namespace. + scratch/main> load Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/idempotent/fix4722.md b/unison-src/transcripts/idempotent/fix4722.md index b7568064f7..cf5cbc7545 100644 --- a/unison-src/transcripts/idempotent/fix4722.md +++ b/unison-src/transcripts/idempotent/fix4722.md @@ -39,7 +39,6 @@ foo = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix4731.md b/unison-src/transcripts/idempotent/fix4731.md index 23b743a42e..3c259c5973 100644 --- a/unison-src/transcripts/idempotent/fix4731.md +++ b/unison-src/transcripts/idempotent/fix4731.md @@ -3,7 +3,6 @@ structural type Void = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -31,7 +30,6 @@ Void.absurdly v = match !v with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -49,7 +47,6 @@ Void.absurdly v = match v with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -69,7 +66,6 @@ Void.absurdly = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -89,7 +85,6 @@ Void.absurd x = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I expected a block after this (in red), but there wasn't one. Maybe check your indentation: diff --git a/unison-src/transcripts/idempotent/fix4780.md b/unison-src/transcripts/idempotent/fix4780.md index 266ac610d6..bec569e265 100644 --- a/unison-src/transcripts/idempotent/fix4780.md +++ b/unison-src/transcripts/idempotent/fix4780.md @@ -10,7 +10,6 @@ builtins decompile properly. ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ diff --git a/unison-src/transcripts/idempotent/fix4898.md b/unison-src/transcripts/idempotent/fix4898.md index f8c1948545..f414695494 100644 --- a/unison-src/transcripts/idempotent/fix4898.md +++ b/unison-src/transcripts/idempotent/fix4898.md @@ -13,7 +13,6 @@ redouble x = double x + double x ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -33,6 +32,7 @@ scratch/main> add double : Int -> Int redouble : Int -> Int + scratch/main> dependents double Dependents of: double @@ -43,6 +43,7 @@ scratch/main> dependents double Tip: Try `view 1` to see the source of any numbered item in the above list. + scratch/main> delete.term 1 Done. diff --git a/unison-src/transcripts/idempotent/fix5055.md b/unison-src/transcripts/idempotent/fix5055.md index a19493dce8..55a3fc4d5d 100644 --- a/unison-src/transcripts/idempotent/fix5055.md +++ b/unison-src/transcripts/idempotent/fix5055.md @@ -11,7 +11,6 @@ foo.subtract x y = x Int.- y ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -31,10 +30,12 @@ test-5055/main> add foo.add : Int -> Int -> Int foo.subtract : Int -> Int -> Int + test-5055/main> ls foo 1. add (Int -> Int -> Int) 2. subtract (Int -> Int -> Int) + test-5055/main> view 1 foo.add : Int -> Int -> Int diff --git a/unison-src/transcripts/idempotent/fix5076.md b/unison-src/transcripts/idempotent/fix5076.md index 4fadef5b75..0eebc63a89 100644 --- a/unison-src/transcripts/idempotent/fix5076.md +++ b/unison-src/transcripts/idempotent/fix5076.md @@ -12,7 +12,6 @@ x = {{ ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix5080.md b/unison-src/transcripts/idempotent/fix5080.md index 97accafa83..b71516e10d 100644 --- a/unison-src/transcripts/idempotent/fix5080.md +++ b/unison-src/transcripts/idempotent/fix5080.md @@ -8,7 +8,6 @@ test> fix5080.tests.failure = [Fail "fail"] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -39,6 +38,7 @@ scratch/main> add fix5080.tests.failure : [Result] fix5080.tests.success : [Result] + scratch/main> test Cached test results (`help testcache` to learn more) @@ -56,6 +56,7 @@ scratch/main> test scratch/main> delete.term 2 Done. + scratch/main> test Cached test results (`help testcache` to learn more) diff --git a/unison-src/transcripts/idempotent/fix5168.md b/unison-src/transcripts/idempotent/fix5168.md index b5ece8dc7a..f6b197aadc 100644 --- a/unison-src/transcripts/idempotent/fix5168.md +++ b/unison-src/transcripts/idempotent/fix5168.md @@ -5,7 +5,6 @@ b = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix5349.md b/unison-src/transcripts/idempotent/fix5349.md index 6d9b0d4b99..48e16991e4 100644 --- a/unison-src/transcripts/idempotent/fix5349.md +++ b/unison-src/transcripts/idempotent/fix5349.md @@ -12,7 +12,6 @@ README = {{ ```` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I expected a block after this (in red), but there wasn't one. Maybe check your indentation: @@ -24,7 +23,6 @@ README = {{ {{ }} }} ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I got confused here: @@ -54,7 +52,6 @@ README = {{ `` `` }} ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I got confused here: diff --git a/unison-src/transcripts/idempotent/fix5419.md b/unison-src/transcripts/idempotent/fix5419.md index 93fb03ef7b..b59561855f 100644 --- a/unison-src/transcripts/idempotent/fix5419.md +++ b/unison-src/transcripts/idempotent/fix5419.md @@ -17,7 +17,6 @@ foo w = match (5, w) with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -56,7 +55,6 @@ bar x = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix614.md b/unison-src/transcripts/idempotent/fix614.md index ebd58ef50c..121ae4df94 100644 --- a/unison-src/transcripts/idempotent/fix614.md +++ b/unison-src/transcripts/idempotent/fix614.md @@ -16,7 +16,6 @@ ex1 = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -42,7 +41,6 @@ ex2 = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found a value of type: a ->{Stream a} Unit @@ -64,7 +62,6 @@ ex3 = do ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -87,7 +84,6 @@ ex4 = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -109,7 +105,6 @@ ex4 = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found a value of type: [Nat] diff --git a/unison-src/transcripts/idempotent/fix689.md b/unison-src/transcripts/idempotent/fix689.md index c3ff7cdc80..c6afe171c4 100644 --- a/unison-src/transcripts/idempotent/fix689.md +++ b/unison-src/transcripts/idempotent/fix689.md @@ -12,7 +12,6 @@ tomorrow = '(SystemTime.systemTime + 24 * 60 * 60) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix693.md b/unison-src/transcripts/idempotent/fix693.md index 1680e443ca..7f28372497 100644 --- a/unison-src/transcripts/idempotent/fix693.md +++ b/unison-src/transcripts/idempotent/fix693.md @@ -11,7 +11,6 @@ structural ability Abort where ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -46,7 +45,6 @@ h0 req = match req with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Each case of a match / with expression need to have the same @@ -73,7 +71,6 @@ h1 req = match req with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Each case of a match / with expression need to have the same @@ -101,7 +98,6 @@ h2 req = match req with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. The 1st argument to `k` @@ -123,7 +119,6 @@ h3 = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix845.md b/unison-src/transcripts/idempotent/fix845.md index d837030803..57c5dc7fcd 100644 --- a/unison-src/transcripts/idempotent/fix845.md +++ b/unison-src/transcripts/idempotent/fix845.md @@ -13,7 +13,6 @@ Text.zonk txt = txt ++ "!! " ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -38,7 +37,6 @@ Now, typecheck a file with a reference to `Blah.zonk` (which doesn't exist in th ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I couldn't figure out what Blah.zonk refers to here: @@ -70,7 +68,6 @@ ex = baz ++ ", world!" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -100,7 +97,6 @@ ex = zonk "hi" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -132,7 +128,6 @@ ex = zonk "hi" -- should resolve to Text.zonk, from the codebase ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix849.md b/unison-src/transcripts/idempotent/fix849.md index 12321025e4..1f799f68e1 100644 --- a/unison-src/transcripts/idempotent/fix849.md +++ b/unison-src/transcripts/idempotent/fix849.md @@ -11,7 +11,6 @@ x = 42 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/fix942.md b/unison-src/transcripts/idempotent/fix942.md index fc2522afef..af26d19d25 100644 --- a/unison-src/transcripts/idempotent/fix942.md +++ b/unison-src/transcripts/idempotent/fix942.md @@ -11,7 +11,6 @@ z = y + 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -42,7 +41,6 @@ x = 7 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -66,6 +64,7 @@ scratch/main> update Everything typechecks, so I'm saving the results... Done. + scratch/main> view x y z x : Nat @@ -89,7 +88,6 @@ test> t1 = if z == 3 then [Fail "nooo!!!"] else [Ok "great"] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -114,6 +112,7 @@ scratch/main> add ⍟ I've added these definitions: t1 : [Result] + scratch/main> test Cached test results (`help testcache` to learn more) diff --git a/unison-src/transcripts/idempotent/fix987.md b/unison-src/transcripts/idempotent/fix987.md index 524ade93ae..e17e1d1974 100644 --- a/unison-src/transcripts/idempotent/fix987.md +++ b/unison-src/transcripts/idempotent/fix987.md @@ -15,7 +15,6 @@ spaceAttack1 x = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -49,7 +48,6 @@ spaceAttack2 x = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/formatter.md b/unison-src/transcripts/idempotent/formatter.md index 186695e07e..ac170b1b5e 100644 --- a/unison-src/transcripts/idempotent/formatter.md +++ b/unison-src/transcripts/idempotent/formatter.md @@ -176,7 +176,6 @@ brokenDoc = {{ hello }} + 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I couldn't figure out what + refers to here: diff --git a/unison-src/transcripts/idempotent/fuzzy-options.md b/unison-src/transcripts/idempotent/fuzzy-options.md index 544cadeb34..0e6ae51d30 100644 --- a/unison-src/transcripts/idempotent/fuzzy-options.md +++ b/unison-src/transcripts/idempotent/fuzzy-options.md @@ -4,6 +4,7 @@ If an argument is required but doesn't have a fuzzy resolver, the command should ``` ucm :error -- The second argument of move.term is a 'new-name' and doesn't have a fuzzy resolver + scratch/main> move.term `move.term foo bar` renames `foo` to `bar`. @@ -35,6 +36,7 @@ scratch/main> add nested.optionTwo : ##Nat optionOne : ##Nat + scratch/main> debug.fuzzy-options view _ Select a definition to view: @@ -49,6 +51,7 @@ scratch/main> add ⊡ Ignored previously added definitions: nested.optionTwo optionOne + scratch/main> debug.fuzzy-options find-in _ Select a namespace: @@ -64,6 +67,7 @@ myproject/main> branch mybranch Tip: To merge your work back into the main branch, first `switch /main` then `merge /mybranch`. + scratch/main> debug.fuzzy-options switch _ Select a project or branch to switch to: diff --git a/unison-src/transcripts/idempotent/generic-parse-errors.md b/unison-src/transcripts/idempotent/generic-parse-errors.md index 38da7ff587..e68aeaa8ff 100644 --- a/unison-src/transcripts/idempotent/generic-parse-errors.md +++ b/unison-src/transcripts/idempotent/generic-parse-errors.md @@ -6,7 +6,6 @@ x = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I got confused here: @@ -27,7 +26,6 @@ namespace.blah = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I got confused here: @@ -63,7 +61,6 @@ x = 1 ] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found a closing ']' here without a matching '['. @@ -76,7 +73,6 @@ x = a.#abc ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I got confused here: @@ -110,7 +106,6 @@ x = "hi ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I got confused here: @@ -130,7 +125,6 @@ y : a ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I got confused here: diff --git a/unison-src/transcripts/idempotent/help.md b/unison-src/transcripts/idempotent/help.md index b9750065d2..ce432238f8 100644 --- a/unison-src/transcripts/idempotent/help.md +++ b/unison-src/transcripts/idempotent/help.md @@ -882,6 +882,7 @@ scratch/main> help view.global `view.global foo` prints definitions of `foo` within your codebase. `view.global` without arguments invokes a search to select definitions to view, which requires that `fzf` can be found within your PATH. + scratch/main> help-topics 🌻 @@ -896,6 +897,7 @@ scratch/main> help-topics testcache Example: use `help-topics filestatus` to learn more about that topic. + scratch/main> help-topic filestatus 📓 @@ -926,6 +928,7 @@ scratch/main> help-topic filestatus extra dependency This definition was added because it was a dependency of a definition explicitly selected. + scratch/main> help-topic messages.disallowedAbsolute 🤖 @@ -937,6 +940,7 @@ scratch/main> help-topic messages.disallowedAbsolute As a workaround, you can give definitions with a relative name temporarily (like `exports.blah.foo`) and then use `move.*`. + scratch/main> help-topic namespaces 🧐 @@ -962,6 +966,7 @@ scratch/main> help-topic namespaces elsewhere in your code. For instance: answerToLifeTheUniverseAndEverything = .foo.bar.x + 1 + scratch/main> help-topic projects A project is a versioned collection of code that can be @@ -982,6 +987,7 @@ scratch/main> help-topic projects For full documentation, see https://unison-lang.org/learn/projects + scratch/main> help-topic remotes 🤖 @@ -996,6 +1002,7 @@ scratch/main> help-topic remotes This association is created automatically on when a project is created by `clone`. If the project was created locally then the relationship will be established on the first `push`. + scratch/main> help-topic testcache 🎈 diff --git a/unison-src/transcripts/idempotent/higher-rank.md b/unison-src/transcripts/idempotent/higher-rank.md index cedbd148dc..5ac44083de 100644 --- a/unison-src/transcripts/idempotent/higher-rank.md +++ b/unison-src/transcripts/idempotent/higher-rank.md @@ -2,7 +2,9 @@ This transcript does some testing of higher-rank types. Regression tests related ``` ucm :hide scratch/main> alias.type ##Nat Nat + scratch/main> alias.type ##Text Text + scratch/main> alias.type ##IO IO ``` @@ -16,7 +18,6 @@ f id = (id 1, id "hi") ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -45,7 +46,6 @@ f id _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -73,7 +73,6 @@ Functor.blah = cases Functor f -> ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -117,7 +116,6 @@ Loc.transform2 nt = cases Loc f -> ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -151,6 +149,7 @@ scratch/main> add ⍟ I've added these definitions: structural type HigherRanked + scratch/main> view HigherRanked structural type HigherRanked = HigherRanked (∀ a. a -> a) diff --git a/unison-src/transcripts/idempotent/input-parse-errors.md b/unison-src/transcripts/idempotent/input-parse-errors.md index 73f99779a3..2b497f5372 100644 --- a/unison-src/transcripts/idempotent/input-parse-errors.md +++ b/unison-src/transcripts/idempotent/input-parse-errors.md @@ -30,16 +30,20 @@ scratch/main> add . You can run `help add` for more information on using `add`. + scratch/main> ls 1. lib/ (469 terms, 74 types) 2. x (Nat) + scratch/main> add 1 + scratch/main> ls 1. lib/ (469 terms, 74 types) 2. x (Nat) + scratch/main> add 2 ⊡ Ignored previously added definitions: x diff --git a/unison-src/transcripts/idempotent/io-test-command.md b/unison-src/transcripts/idempotent/io-test-command.md index a2012915ba..395ac149b3 100644 --- a/unison-src/transcripts/idempotent/io-test-command.md +++ b/unison-src/transcripts/idempotent/io-test-command.md @@ -35,6 +35,7 @@ scratch/main> io.test ioAndExceptionTest ✅ 1 test(s) passing Tip: Use view 1 to view the source of a test. + scratch/main> io.test ioTest New test results: diff --git a/unison-src/transcripts/idempotent/io.md b/unison-src/transcripts/idempotent/io.md index 4d0be24599..314a76e1b4 100644 --- a/unison-src/transcripts/idempotent/io.md +++ b/unison-src/transcripts/idempotent/io.md @@ -2,8 +2,11 @@ ``` ucm :hide scratch/main> builtins.merge + scratch/main> builtins.mergeio + scratch/main> load unison-src/transcripts-using-base/base.u + scratch/main> add ``` @@ -59,7 +62,6 @@ testCreateRename _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -77,6 +79,7 @@ scratch/main> add ⍟ I've added these definitions: testCreateRename : '{IO} [Result] + scratch/main> io.test testCreateRename New test results: @@ -142,7 +145,6 @@ testOpenClose _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -160,6 +162,7 @@ scratch/main> add ⍟ I've added these definitions: testOpenClose : '{IO} [Result] + scratch/main> io.test testOpenClose New test results: @@ -233,7 +236,6 @@ testGetSomeBytes _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -251,6 +253,7 @@ scratch/main> add ⍟ I've added these definitions: testGetSomeBytes : '{IO} [Result] + scratch/main> io.test testGetSomeBytes New test results: @@ -341,7 +344,6 @@ testAppend _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -361,6 +363,7 @@ scratch/main> add testAppend : '{IO} [Result] testSeek : '{IO} [Result] + scratch/main> io.test testSeek New test results: @@ -376,6 +379,7 @@ scratch/main> io.test testSeek ✅ 7 test(s) passing Tip: Use view 1 to view the source of a test. + scratch/main> io.test testAppend New test results: @@ -400,7 +404,6 @@ testSystemTime _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -418,6 +421,7 @@ scratch/main> add ⍟ I've added these definitions: testSystemTime : '{IO} [Result] + scratch/main> io.test testSystemTime New test results: @@ -447,6 +451,7 @@ scratch/main> add ⍟ I've added these definitions: testGetTempDirectory : '{IO} [Result] + scratch/main> io.test testGetTempDirectory New test results: @@ -477,6 +482,7 @@ scratch/main> add ⍟ I've added these definitions: testGetCurrentDirectory : '{IO} [Result] + scratch/main> io.test testGetCurrentDirectory New test results: @@ -509,6 +515,7 @@ scratch/main> add ⍟ I've added these definitions: testDirContents : '{IO} [Result] + scratch/main> io.test testDirContents New test results: @@ -541,6 +548,7 @@ scratch/main> add ⍟ I've added these definitions: testGetEnv : '{IO} [Result] + scratch/main> io.test testGetEnv New test results: @@ -598,12 +606,15 @@ scratch/main> add testGetArgs.runMeWithNoArgs : '{IO, Exception} () testGetArgs.runMeWithOneArg : '{IO, Exception} () testGetArgs.runMeWithTwoArgs : '{IO, Exception} () + scratch/main> run runMeWithNoArgs () + scratch/main> run runMeWithOneArg foo () + scratch/main> run runMeWithTwoArgs foo bar () @@ -679,6 +690,7 @@ scratch/main> add ⍟ I've added these definitions: testTimeZone : '{IO} () + scratch/main> run testTimeZone () @@ -701,6 +713,7 @@ scratch/main> add ⍟ I've added these definitions: testRandom : '{IO} [Result] + scratch/main> io.test testGetEnv New test results: diff --git a/unison-src/transcripts/idempotent/kind-inference.md b/unison-src/transcripts/idempotent/kind-inference.md index eb80e6a616..cc12acd30d 100644 --- a/unison-src/transcripts/idempotent/kind-inference.md +++ b/unison-src/transcripts/idempotent/kind-inference.md @@ -11,7 +11,6 @@ unique type T a = T a (a Nat) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Kind mismatch arising from @@ -29,7 +28,6 @@ unique type T a ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Kind mismatch arising from @@ -49,7 +47,6 @@ unique type Pong = Pong (Ping Optional) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -71,7 +68,6 @@ unique type Pong = Pong (Ping Optional) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Kind mismatch arising from @@ -90,7 +86,6 @@ unique ability Pong a where ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -112,7 +107,6 @@ unique ability Pong a where ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Kind mismatch arising from @@ -131,7 +125,6 @@ unique type S = S (T Nat) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -155,7 +148,6 @@ unique type S = S (T Optional) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -177,7 +169,6 @@ unique type S = S (T Optional) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Kind mismatch arising from @@ -197,7 +188,6 @@ test = 0 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Kind mismatch arising from @@ -215,7 +205,6 @@ test _ = () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Kind mismatch arising from @@ -235,7 +224,6 @@ test _ = () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Kind mismatch arising from @@ -259,7 +247,6 @@ test _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Kind mismatch arising from @@ -282,7 +269,6 @@ test _ = () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Kind mismatch arising from @@ -300,7 +286,6 @@ test _ = () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Kind mismatch arising from @@ -318,7 +303,6 @@ unique type T a = T (a a) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Cannot construct infinite kind @@ -334,7 +318,6 @@ unique type T a b = T (a b) (b a) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Cannot construct infinite kind @@ -351,7 +334,6 @@ unique type Pong a = Pong (a Ping) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Cannot construct infinite kind diff --git a/unison-src/transcripts/idempotent/lambdacase.md b/unison-src/transcripts/idempotent/lambdacase.md index 28f46ed248..c85050e2ec 100644 --- a/unison-src/transcripts/idempotent/lambdacase.md +++ b/unison-src/transcripts/idempotent/lambdacase.md @@ -13,7 +13,6 @@ isEmpty x = match x with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -38,7 +37,6 @@ isEmpty2 = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -99,7 +97,6 @@ merge2 = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -148,7 +145,6 @@ blorf = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -189,7 +185,6 @@ merge3 = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -207,6 +202,7 @@ scratch/main> add ⍟ I've added these definitions: merge3 : [a] -> [a] -> [a] + scratch/main> view merge3 merge3 : [a] -> [a] -> [a] @@ -230,7 +226,6 @@ merge4 a b = match (a,b) with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/move-all.md b/unison-src/transcripts/idempotent/move-all.md index 927fadf5e0..5601aafa68 100644 --- a/unison-src/transcripts/idempotent/move-all.md +++ b/unison-src/transcripts/idempotent/move-all.md @@ -16,7 +16,6 @@ unique type Foo.T = T ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -48,7 +47,6 @@ unique type Foo.T = T1 | T2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -78,18 +76,21 @@ Should be able to move the term, type, and namespace, including its types, terms scratch/main> move Foo Bar Done. + scratch/main> ls 1. Bar (Nat) 2. Bar (type) 3. Bar/ (4 terms, 1 type) 4. builtin/ (469 terms, 74 types) + scratch/main> ls Bar 1. Foo (Bar) 2. T (type) 3. T/ (2 terms) 4. termInA (Nat) + scratch/main> history Bar Note: The most recent namespace hash is immediately below this @@ -115,7 +116,6 @@ bonk = 5 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -131,14 +131,17 @@ bonk = 5 z/main> builtins.merge Done. + z/main> add ⍟ I've added these definitions: bonk : Nat + z/main> move bonk zonk Done. + z/main> ls 1. builtin/ (469 terms, 74 types) @@ -152,7 +155,6 @@ bonk.zonk = 5 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -169,18 +171,22 @@ bonk.zonk = 5 a/main> builtins.merge Done. + a/main> add ⍟ I've added these definitions: bonk.zonk : Nat + a/main> move bonk zonk Done. + a/main> ls 1. builtin/ (469 terms, 74 types) 2. zonk/ (1 term) + a/main> view zonk.zonk zonk.zonk : Nat diff --git a/unison-src/transcripts/idempotent/move-namespace.md b/unison-src/transcripts/idempotent/move-namespace.md index 4a2fcd117e..59a1e7ae71 100644 --- a/unison-src/transcripts/idempotent/move-namespace.md +++ b/unison-src/transcripts/idempotent/move-namespace.md @@ -14,19 +14,24 @@ scratch/main> add ⍟ I've added these definitions: foo : ##Nat + -- Should request confirmation + scratch/main> move.namespace . .root.at.path ⚠️ Moves which affect the root branch cannot be undone, are you sure? Re-run the same command to proceed. + scratch/main> move.namespace . .root.at.path Done. + scratch/main> ls 1. root/ (1 term) + scratch/main> history Note: The most recent namespace hash is immediately below this @@ -41,6 +46,7 @@ scratch/main> history scratch/main> ls .root.at.path 1. foo (##Nat) + scratch/main> history .root.at.path Note: The most recent namespace hash is immediately below this @@ -55,18 +61,22 @@ I should be able to move a sub namespace *over* the root. ``` ucm -- Should request confirmation + scratch/main> move.namespace .root.at.path . ⚠️ Moves which affect the root branch cannot be undone, are you sure? Re-run the same command to proceed. + scratch/main> move.namespace .root.at.path . Done. + scratch/main> ls 1. foo (##Nat) + scratch/main> history Note: The most recent namespace hash is immediately below this @@ -79,9 +89,11 @@ scratch/main> history ``` ucm :error -- should be empty + scratch/main> ls .root.at.path nothing to show + scratch/main> history .root.at.path Note: The most recent namespace hash is immediately below this @@ -106,7 +118,6 @@ unique type a.T = T ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -134,7 +145,6 @@ unique type a.T = T1 | T2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -163,11 +173,13 @@ Should be able to move the namespace, including its types, terms, and sub-namesp scratch/happy> move.namespace a b Done. + scratch/happy> ls b 1. T (type) 2. T/ (2 terms) 3. termInA (Nat) + scratch/happy> history b Note: The most recent namespace hash is immediately below this @@ -200,7 +212,6 @@ b.termInB = 10 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -228,7 +239,6 @@ b.termInB = 11 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -259,10 +269,13 @@ of the moved namespace. scratch/history> delete.namespace b Done. + scratch/history> move.namespace a b Done. + -- Should be the history from 'a' + scratch/history> history b Note: The most recent namespace hash is immediately below this @@ -275,7 +288,9 @@ scratch/history> history b termInA □ 2. #m8smmmgjso (start of history) + -- Should be empty + scratch/history> history a Note: The most recent namespace hash is immediately below this @@ -300,7 +315,6 @@ b.termInB = 10 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -328,7 +342,6 @@ b.termInB = 11 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -349,6 +362,7 @@ scratch/existing> update updated... Done. + scratch/existing> move.namespace a b ⚠️ diff --git a/unison-src/transcripts/idempotent/name-resolution.md b/unison-src/transcripts/idempotent/name-resolution.md index 59a40fdcc3..2354c16dce 100644 --- a/unison-src/transcripts/idempotent/name-resolution.md +++ b/unison-src/transcripts/idempotent/name-resolution.md @@ -14,7 +14,6 @@ type Namespace.Foo = Bar ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -40,7 +39,6 @@ type UsesFoo = UsesFoo Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. @@ -63,7 +61,6 @@ type UsesFoo = UsesFoo Namespace.Foo File.Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -96,7 +93,6 @@ type Foo = Bar ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -122,7 +118,6 @@ type UsesFoo = UsesFoo Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -142,6 +137,7 @@ scratch/main> add type File.Foo type UsesFoo + scratch/main> view UsesFoo type UsesFoo = UsesFoo Foo @@ -167,7 +163,6 @@ type Namespace.Foo = Bar ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -193,7 +188,6 @@ type UsesFoo = UsesFoo Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -213,6 +207,7 @@ scratch/main> add type Foo type UsesFoo + scratch/main> view UsesFoo type UsesFoo = UsesFoo Foo @@ -239,7 +234,6 @@ ns.foo = 42 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -268,7 +262,6 @@ bar = foo ++ "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -302,7 +295,6 @@ ns.foo = 42 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -331,7 +323,6 @@ bar = foo + 42 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -365,7 +356,6 @@ ns.foo = 42 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -394,7 +384,6 @@ bar = foo + 10 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I couldn't figure out what foo refers to here: @@ -419,7 +408,6 @@ bar = file.foo + ns.foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -439,6 +427,7 @@ scratch/main> add bar : Nat file.foo : Nat + scratch/main> view bar bar : Nat diff --git a/unison-src/transcripts/idempotent/name-segment-escape.md b/unison-src/transcripts/idempotent/name-segment-escape.md index da62438c48..4df8f773a9 100644 --- a/unison-src/transcripts/idempotent/name-segment-escape.md +++ b/unison-src/transcripts/idempotent/name-segment-escape.md @@ -7,6 +7,7 @@ scratch/main> view `match` The following names were not found in the codebase. Check your spelling. `match` + scratch/main> view `=` ⚠️ @@ -26,6 +27,7 @@ scratch/main> view `.` The following names were not found in the codebase. Check your spelling. `.` + scratch/main> view `()` ⚠️ diff --git a/unison-src/transcripts/idempotent/name-selection.md b/unison-src/transcripts/idempotent/name-selection.md index 34690c9855..bc89c80b6b 100644 --- a/unison-src/transcripts/idempotent/name-selection.md +++ b/unison-src/transcripts/idempotent/name-selection.md @@ -6,6 +6,7 @@ This transcript shows how the pretty-printer picks names for a hash when multipl ``` ucm :hide scratch/main> builtins.merge lib.builtins + scratch/biasing> builtins.merge lib.builtins ``` @@ -25,6 +26,7 @@ scratch/main> add a.a : Nat a.aaa.but.more.segments : Nat a.b : Nat + scratch/main> view a.a a.a : Nat @@ -74,9 +76,11 @@ scratch/main> add a3.c : Nat a3.d : Nat a3.long.name.but.shortest.suffixification : Nat + scratch/main> debug.alias.term.force a2.c a3.c Done. + scratch/main> debug.alias.term.force a2.d a3.d Done. @@ -128,7 +132,6 @@ a = 10 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -150,9 +153,13 @@ scratch/biasing> add a : Nat deeply.nested.num : Nat deeply.nested.term : Nat + -- Despite being saved with name `a`, + -- the pretty printer should prefer the suffixified 'deeply.nested.num name' over the shallow 'a'. + -- It's closer to the term being printed. + scratch/biasing> view deeply.nested.term deeply.nested.term : Nat @@ -168,7 +175,6 @@ other.num = 20 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -186,8 +192,11 @@ scratch/biasing> add ⍟ I've added these definitions: other.num : Nat + -- nested.num should be preferred over the shorter name `a` due to biasing + -- because `deeply.nested.num` is nearby to the term being viewed. + scratch/biasing> view deeply.nested.term deeply.nested.term : Nat diff --git a/unison-src/transcripts/idempotent/names.md b/unison-src/transcripts/idempotent/names.md index 254a1cd2c8..ca74561ba8 100644 --- a/unison-src/transcripts/idempotent/names.md +++ b/unison-src/transcripts/idempotent/names.md @@ -19,7 +19,6 @@ somewhere.y = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -51,6 +50,7 @@ scratch/main> add ``` ucm -- We can search by suffix and find all definitions named 'x', and each of their aliases respectively. + scratch/main> names x Terms @@ -59,13 +59,17 @@ scratch/main> names x Hash: #pi25gcdv0o Names: some.otherplace.x + -- We can search by hash, and see all aliases of that hash + scratch/main> names #gjmq673r1v Term Hash: #gjmq673r1v Names: some.otherplace.y some.place.x somewhere.z + -- Works with absolute names too + scratch/main> names .some.place.x Term @@ -77,6 +81,7 @@ scratch/main> names .some.place.x ``` ucm -- We can search from a different branch and find all names in the codebase named 'x', and each of their aliases respectively. + scratch/other> debug.names.global x Found results in scratch/main @@ -87,7 +92,9 @@ scratch/other> debug.names.global x Hash: #pi25gcdv0o Names: some.otherplace.x + -- We can search by hash, and see all aliases of that hash in the codebase + scratch/other> debug.names.global #gjmq673r1v Found results in scratch/main @@ -95,7 +102,9 @@ scratch/other> debug.names.global #gjmq673r1v Term Hash: #gjmq673r1v Names: some.otherplace.y some.place.x somewhere.z + -- We can search using an absolute name + scratch/other> debug.names.global .some.place.x Found results in scratch/main diff --git a/unison-src/transcripts/idempotent/namespace-deletion-regression.md b/unison-src/transcripts/idempotent/namespace-deletion-regression.md index fa3adfbe0b..86e07b4d48 100644 --- a/unison-src/transcripts/idempotent/namespace-deletion-regression.md +++ b/unison-src/transcripts/idempotent/namespace-deletion-regression.md @@ -11,15 +11,19 @@ unexpectedly 😬. scratch/main> alias.term ##Nat.+ Nat.+ Done. + scratch/main> ls Nat 1. + (##Nat -> ##Nat -> ##Nat) + scratch/main> move.namespace Nat Nat.operators Done. + scratch/main> ls Nat 1. operators/ (1 term) + scratch/main> ls Nat.operators 1. + (##Nat -> ##Nat -> ##Nat) diff --git a/unison-src/transcripts/idempotent/namespace-dependencies.md b/unison-src/transcripts/idempotent/namespace-dependencies.md index c803a2009a..672c0b76f6 100644 --- a/unison-src/transcripts/idempotent/namespace-dependencies.md +++ b/unison-src/transcripts/idempotent/namespace-dependencies.md @@ -20,6 +20,7 @@ scratch/main> add const : a -> b -> a external.mynat : Nat mynamespace.dependsOnText : Nat + scratch/main> namespace.dependencies mynamespace External dependency Dependents in scratch/main:.mynamespace diff --git a/unison-src/transcripts/idempotent/namespace-directive.md b/unison-src/transcripts/idempotent/namespace-directive.md index fa3c5f67b7..f9eabb86c0 100644 --- a/unison-src/transcripts/idempotent/namespace-directive.md +++ b/unison-src/transcripts/idempotent/namespace-directive.md @@ -19,7 +19,6 @@ baz = 17 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -47,7 +46,6 @@ longer.evil.factorial n = n ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -67,6 +65,7 @@ scratch/main> add foo.factorial : Int -> Int foo.longer.evil.factorial : Int -> Int + scratch/main> view factorial foo.factorial : Int -> Int @@ -92,7 +91,6 @@ type longer.foo.Baz = { qux : Nat } ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -141,7 +139,6 @@ hasTypeLink = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -179,6 +176,7 @@ scratch/main> add foo.hasTypeLink : Doc2 foo.refersToBar : foo.Foo -> Nat foo.refersToQux : foo.Baz -> Nat + scratch/main> view RefersToFoo refersToBar refersToQux hasTypeLink type foo.RefersToFoo = RefersToFoo foo.Foo @@ -194,6 +192,7 @@ scratch/main> view RefersToFoo refersToBar refersToQux hasTypeLink use Nat + use foo.Baz qux qux baz + qux baz + scratch/main> todo You have no pending todo items. Good work! ✅ diff --git a/unison-src/transcripts/idempotent/numbered-args.md b/unison-src/transcripts/idempotent/numbered-args.md index 27f26ebfa2..1b6166f0d4 100644 --- a/unison-src/transcripts/idempotent/numbered-args.md +++ b/unison-src/transcripts/idempotent/numbered-args.md @@ -16,7 +16,6 @@ corge = "corge" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -73,6 +72,7 @@ scratch/main> find 5. quux : Text 6. qux : Text 7. builtin type Text + scratch/main> view 2 baz : Text @@ -91,6 +91,7 @@ scratch/main> find 5. quux : Text 6. qux : Text 7. builtin type Text + scratch/main> view 2 3 5 baz : Text @@ -115,6 +116,7 @@ scratch/main> find 5. quux : Text 6. qux : Text 7. builtin type Text + scratch/main> view 2-4 baz : Text @@ -139,6 +141,7 @@ scratch/main> find 5. quux : Text 6. qux : Text 7. builtin type Text + scratch/main> view 1-3 4 5-6 bar : Text diff --git a/unison-src/transcripts/idempotent/old-fold-right.md b/unison-src/transcripts/idempotent/old-fold-right.md index a73bcebd0e..fe321cb955 100644 --- a/unison-src/transcripts/idempotent/old-fold-right.md +++ b/unison-src/transcripts/idempotent/old-fold-right.md @@ -16,7 +16,6 @@ pecan = 'let ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/pattern-match-coverage.md b/unison-src/transcripts/idempotent/pattern-match-coverage.md index 75c628b11e..90bf569876 100644 --- a/unison-src/transcripts/idempotent/pattern-match-coverage.md +++ b/unison-src/transcripts/idempotent/pattern-match-coverage.md @@ -15,7 +15,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -41,7 +40,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -70,7 +68,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This case would be ignored because it's already covered by the preceding case(s): @@ -91,7 +88,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This case would be ignored because it's already covered by the preceding case(s): @@ -113,7 +109,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -137,7 +132,6 @@ test0 = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This case would be ignored because it's already covered by the preceding case(s): @@ -156,7 +150,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This case would be ignored because it's already covered by the preceding case(s): @@ -175,7 +168,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -196,7 +188,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -222,7 +213,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -249,7 +239,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -273,7 +262,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -302,7 +290,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -323,7 +310,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -347,7 +333,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -369,7 +354,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -394,7 +378,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This case would be ignored because it's already covered by the preceding case(s): @@ -413,7 +396,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This case would be ignored because it's already covered by the preceding case(s): @@ -433,7 +415,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -454,7 +435,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -473,7 +453,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -492,7 +471,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -512,7 +490,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -533,7 +510,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -559,7 +535,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -591,7 +566,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -616,7 +590,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This case would be ignored because it's already covered by the preceding case(s): @@ -641,7 +614,6 @@ test = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This case would be ignored because it's already covered by the preceding case(s): @@ -660,7 +632,6 @@ unit2t = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -697,7 +668,6 @@ witht = match unit2t () with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -717,7 +687,6 @@ evil = bug "" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -746,7 +715,6 @@ withV = match evil () with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This case would be ignored because it's already covered by the preceding case(s): @@ -759,7 +727,6 @@ unique type SomeType = A ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -787,7 +754,6 @@ get x = match x with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -805,7 +771,6 @@ unique type R = { someType : SomeType } ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -836,7 +801,6 @@ result f = handle !f with cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -863,7 +827,6 @@ result f = handle !f with cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -894,7 +857,6 @@ result f = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -924,7 +886,6 @@ handleMulti c = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -952,7 +913,6 @@ result f = handle !f with cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -979,7 +939,6 @@ result f = handle !f with cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -1005,7 +964,6 @@ result f = handle !f with cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -1035,7 +993,6 @@ handleMulti c = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -1064,7 +1021,6 @@ result f = handle !f with cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This case would be ignored because it's already covered by the preceding case(s): @@ -1088,7 +1044,6 @@ result f = handle !f with cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -1116,7 +1071,6 @@ result f = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -1144,7 +1098,6 @@ result f = handle !f with cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -1184,7 +1137,6 @@ result f = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. Pattern match doesn't cover all possible cases: @@ -1213,7 +1165,6 @@ result f = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -1241,7 +1192,6 @@ result f = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -1270,7 +1220,6 @@ result f = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This case would be ignored because it's already covered by the preceding case(s): @@ -1300,7 +1249,6 @@ result f = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. This case would be ignored because it's already covered by the preceding case(s): @@ -1328,7 +1276,6 @@ result f = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/pattern-pretty-print-2345.md b/unison-src/transcripts/idempotent/pattern-pretty-print-2345.md index c09675c9c1..860329390d 100644 --- a/unison-src/transcripts/idempotent/pattern-pretty-print-2345.md +++ b/unison-src/transcripts/idempotent/pattern-pretty-print-2345.md @@ -64,7 +64,6 @@ doc = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -110,80 +109,94 @@ scratch/main> add sneezy : Int -> () throaty : Request {g, Ab} x -> () tremulous : (Nat, Nat) -> () + scratch/main> view dopey dopey : Char -> () dopey = cases ?0 -> () _ -> () + scratch/main> view grumpy grumpy : ff284oqf651 -> () grumpy = cases d -> () + scratch/main> view happy happy : Boolean -> () happy = cases true -> () false -> () + scratch/main> view sneezy sneezy : Int -> () sneezy = cases +1 -> () _ -> () + scratch/main> view bashful bashful : Optional a -> () bashful = cases Some a -> () _ -> () + scratch/main> view mouthy mouthy : [t] -> () mouthy = cases [] -> () _ -> () + scratch/main> view pokey pokey : [t] -> () pokey = cases h +: t -> () _ -> () + scratch/main> view sleepy sleepy : [t] -> () sleepy = cases i :+ l -> () _ -> () + scratch/main> view demure demure : [Nat] -> () demure = cases [0] -> () _ -> () + scratch/main> view angry angry : [t] -> () angry = cases a ++ [] -> () + scratch/main> view tremulous tremulous : (Nat, Nat) -> () tremulous = cases (0, 1) -> () _ -> () + scratch/main> view throaty throaty : Request {g, Ab} x -> () throaty = cases { Ab.a a -> k } -> () { _ } -> () + scratch/main> view agitated agitated : Nat -> () agitated = cases a | a == 2 -> () _ -> () + scratch/main> view doc doc : Nat -> () diff --git a/unison-src/transcripts/idempotent/patternMatchTls.md b/unison-src/transcripts/idempotent/patternMatchTls.md index 88b34574b2..fc6517f872 100644 --- a/unison-src/transcripts/idempotent/patternMatchTls.md +++ b/unison-src/transcripts/idempotent/patternMatchTls.md @@ -25,7 +25,6 @@ assertRight = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -45,6 +44,7 @@ scratch/main> add assertRight : Either a b -> b frank : '{IO} () + scratch/main> run frank () diff --git a/unison-src/transcripts/idempotent/patterns.md b/unison-src/transcripts/idempotent/patterns.md index 56b0474376..1baa09fdda 100644 --- a/unison-src/transcripts/idempotent/patterns.md +++ b/unison-src/transcripts/idempotent/patterns.md @@ -12,7 +12,6 @@ p1 = join [literal "blue", literal "frog"] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/propagate.md b/unison-src/transcripts/idempotent/propagate.md index dd5838bedf..c2861e3bb0 100644 --- a/unison-src/transcripts/idempotent/propagate.md +++ b/unison-src/transcripts/idempotent/propagate.md @@ -14,7 +14,6 @@ fooToInt _ = +42 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -36,6 +35,7 @@ scratch/main> add type Foo fooToInt : Foo -> Int + scratch/main> find.verbose 1. -- #uj8oalgadr2f52qloufah6t8vsvbc76oqijkotek87vooih7aqu44k20hrs34kartusapghp4jmfv6g1409peklv3r6a527qpk52soo @@ -47,6 +47,7 @@ scratch/main> find.verbose 3. -- #j6hbm1gc2ak4f46b6705q90ld4bmhoi8etq2q45j081i9jgn95fvk3p6tjg67e7sm0021035i8qikmk4p6k845l5d00u26cos5731to fooToInt : Foo -> Int + scratch/main> view fooToInt fooToInt : Foo -> Int @@ -60,7 +61,6 @@ unique type Foo = Foo | Bar ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -106,7 +106,6 @@ preserve.otherTerm y = someTerm y ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -138,7 +137,6 @@ preserve.someTerm _ = None ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -169,6 +167,7 @@ scratch/main> view preserve.someTerm preserve.someTerm : Optional x -> Optional x preserve.someTerm _ = None + scratch/main> view preserve.otherTerm preserve.otherTerm : Optional baz -> Optional baz diff --git a/unison-src/transcripts/idempotent/pull-errors.md b/unison-src/transcripts/idempotent/pull-errors.md index 9a1b0e4cdf..bb1746e231 100644 --- a/unison-src/transcripts/idempotent/pull-errors.md +++ b/unison-src/transcripts/idempotent/pull-errors.md @@ -9,6 +9,7 @@ test/main> pull @aryairani/test-almost-empty/main lib.base_latest I installed @aryairani/test-almost-empty/main as aryairani_test_almost_empty_main. + test/main> pull @aryairani/test-almost-empty/main a.b ⚠️ @@ -20,11 +21,13 @@ test/main> pull @aryairani/test-almost-empty/main a.b merging into the top level of a local project branch. You can run `help pull` for more information on using `pull`. + test/main> pull @aryairani/test-almost-empty/main a I think you want to merge @aryairani/test-almost-empty/main into the a branch, but it doesn't exist. If you want, you can create it with `branch.empty a`, and then `pull` again. + test/main> pull @aryairani/test-almost-empty/main .a ⚠️ diff --git a/unison-src/transcripts/idempotent/records.md b/unison-src/transcripts/idempotent/records.md index 26548ab236..40ab77e278 100644 --- a/unison-src/transcripts/idempotent/records.md +++ b/unison-src/transcripts/idempotent/records.md @@ -2,6 +2,7 @@ Ensure that Records keep their syntax after being added to the codebase ``` ucm :hide scratch/main> builtins.merge + scratch/main> load unison-src/transcripts-using-base/base.u ``` @@ -178,7 +179,6 @@ unique type Record5 = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/reflog.md b/unison-src/transcripts/idempotent/reflog.md index 75a5c5d7b5..357ffb6200 100644 --- a/unison-src/transcripts/idempotent/reflog.md +++ b/unison-src/transcripts/idempotent/reflog.md @@ -9,7 +9,6 @@ x = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -34,7 +33,6 @@ y = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -52,18 +50,22 @@ scratch/main> add ⍟ I've added these definitions: y : Nat + scratch/main> branch /other Done. I've created the other branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /other`. + scratch/other> alias.term y z Done. + newproject/main> builtins.merge lib.builtins Done. + newproject/main> alias.type lib.builtins.Nat MyNat Done. diff --git a/unison-src/transcripts/idempotent/release-draft-command.md b/unison-src/transcripts/idempotent/release-draft-command.md index a1136ec464..db40f0a607 100644 --- a/unison-src/transcripts/idempotent/release-draft-command.md +++ b/unison-src/transcripts/idempotent/release-draft-command.md @@ -11,7 +11,6 @@ someterm = 18 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/reset.md b/unison-src/transcripts/idempotent/reset.md index 54e23fb64c..2cd116f87c 100644 --- a/unison-src/transcripts/idempotent/reset.md +++ b/unison-src/transcripts/idempotent/reset.md @@ -7,7 +7,6 @@ def = "first value" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -36,6 +35,7 @@ scratch/main> update updated... Done. + scratch/main> history Note: The most recent namespace hash is immediately below this @@ -54,13 +54,16 @@ scratch/main> history def □ 3. #4bigcpnl7t (start of history) + scratch/main> reset 2 Done. + scratch/main> view def def : Text def = "first value" + scratch/main> history Note: The most recent namespace hash is immediately below this @@ -93,14 +96,18 @@ scratch/main> reflog 3. scratch/main #ujvq6e87kp update 4. scratch/main #4bigcpnl7t builtins.merge 5. scratch/main #sg60bvjo91 Project Created + -- Reset the current branch to the first history element + scratch/main> reset 2 Done. + scratch/main> view def def : Text def = "second value" + scratch/main> history Note: The most recent namespace hash is immediately below this @@ -145,13 +152,16 @@ foo/main> update updated... Done. + foo/empty> reset /main: Done. + foo/empty> view a a : ##Nat a = 5 + foo/empty> history Note: The most recent namespace hash is immediately below this @@ -175,6 +185,7 @@ foo/main> update updated... Done. + foo/main> history Note: The most recent namespace hash is immediately below this @@ -187,6 +198,7 @@ foo/main> history main.a □ 2. #5l94rduvel (start of history) + foo/main> reset 2 main Done. diff --git a/unison-src/transcripts/idempotent/resolution-failures.md b/unison-src/transcripts/idempotent/resolution-failures.md index 863ce848b2..0dfba8378c 100644 --- a/unison-src/transcripts/idempotent/resolution-failures.md +++ b/unison-src/transcripts/idempotent/resolution-failures.md @@ -21,7 +21,6 @@ two.ambiguousTerm = "term two" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -72,7 +71,6 @@ separateAmbiguousTypeUsage _ = () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. @@ -106,7 +104,6 @@ useAmbiguousTerm = ambiguousTerm ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I couldn't figure out what ambiguousTerm refers to here: diff --git a/unison-src/transcripts/idempotent/rsa.md b/unison-src/transcripts/idempotent/rsa.md index cd07c425a3..900838394f 100644 --- a/unison-src/transcripts/idempotent/rsa.md +++ b/unison-src/transcripts/idempotent/rsa.md @@ -36,7 +36,6 @@ sigKo = match signature with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/scope-ref.md b/unison-src/transcripts/idempotent/scope-ref.md index ac1972098d..5d723e9ddc 100644 --- a/unison-src/transcripts/idempotent/scope-ref.md +++ b/unison-src/transcripts/idempotent/scope-ref.md @@ -18,7 +18,6 @@ test = Scope.run 'let ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/suffixes.md b/unison-src/transcripts/idempotent/suffixes.md index ad8d1d3e69..762ffe5448 100644 --- a/unison-src/transcripts/idempotent/suffixes.md +++ b/unison-src/transcripts/idempotent/suffixes.md @@ -26,6 +26,7 @@ scratch/main> add foo.bar.a : Int optional.isNone : Optional a -> Boolean + scratch/main> find take 1. builtin.Bytes.take : Nat -> Bytes -> Bytes @@ -41,6 +42,7 @@ The `view` and `display` commands also benefit from this: scratch/main> view List.drop builtin builtin.List.drop : builtin.Nat -> [a] -> [a] + scratch/main> display bar.a +99 @@ -69,7 +71,6 @@ lib.distributed.lib.baz.qux = "indirect dependency" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -100,7 +101,6 @@ scratch/main> add ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I couldn't figure out what abra.cadabra refers to here: @@ -122,7 +122,6 @@ scratch/main> add ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ @@ -145,6 +144,7 @@ scratch/main> view abra.cadabra lib.distributed.abra.cadabra : Text lib.distributed.abra.cadabra = "direct dependency 1" + scratch/main> view baz.qux lib.distributed.baz.qux : Text @@ -158,6 +158,7 @@ scratch/main> view distributed.abra.cadabra lib.distributed.abra.cadabra : Text lib.distributed.abra.cadabra = "direct dependency 1" + scratch/main> names distributed.lib.baz.qux Term diff --git a/unison-src/transcripts/idempotent/sum-type-update-conflicts.md b/unison-src/transcripts/idempotent/sum-type-update-conflicts.md index ec032c8949..467ad27b61 100644 --- a/unison-src/transcripts/idempotent/sum-type-update-conflicts.md +++ b/unison-src/transcripts/idempotent/sum-type-update-conflicts.md @@ -13,7 +13,6 @@ structural type X = x ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -48,7 +47,6 @@ dependsOnX = Text.size X.x ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/switch-command.md b/unison-src/transcripts/idempotent/switch-command.md index 4c8b6e1377..2361485802 100644 --- a/unison-src/transcripts/idempotent/switch-command.md +++ b/unison-src/transcripts/idempotent/switch-command.md @@ -2,6 +2,7 @@ The `switch` command switches to an existing project or branch. ``` ucm :hide foo/main> builtins.merge + bar/main> builtins.merge ``` @@ -12,7 +13,6 @@ someterm = 18 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -30,12 +30,14 @@ foo/main> add ⍟ I've added these definitions: someterm : Nat + foo/main> branch bar Done. I've created the bar branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /bar`. + foo/main> branch topic Done. I've created the topic branch based off of main. @@ -50,9 +52,13 @@ forward slash (which makes it unambiguous). ``` ucm scratch/main> switch foo + scratch/main> switch foo/topic + foo/main> switch topic + foo/main> switch /topic + foo/main> switch bar/ ``` diff --git a/unison-src/transcripts/idempotent/tab-completion.md b/unison-src/transcripts/idempotent/tab-completion.md index 0a6336d99a..83aa787539 100644 --- a/unison-src/transcripts/idempotent/tab-completion.md +++ b/unison-src/transcripts/idempotent/tab-completion.md @@ -9,6 +9,7 @@ scratch/main> debug.tab-complete vi view view.global + scratch/main> debug.tab-complete delete. delete.branch @@ -34,7 +35,6 @@ unique type subnamespace.AType = A | B ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -56,32 +56,42 @@ scratch/main> add ``` ucm -- Should tab complete namespaces since they may contain terms/types + scratch/main> debug.tab-complete view sub subnamespace. subnamespace2. + -- Should not complete things from child namespaces of the current query if there are other completions at this level + scratch/main> debug.tab-complete view subnamespace subnamespace. subnamespace2. + -- Should complete things from child namespaces of the current query if it's dot-suffixed + scratch/main> debug.tab-complete view subnamespace. * subnamespace.AType subnamespace.AType. * subnamespace.someName * subnamespace.someOtherName + -- Should complete things from child namespaces of the current query if there are no more completions at this level. + scratch/main> debug.tab-complete view subnamespace2 subnamespace2. * subnamespace2.thing + -- Should prefix-filter by query suffix + scratch/main> debug.tab-complete view subnamespace.some * subnamespace.someName * subnamespace.someOtherName + scratch/main> debug.tab-complete view subnamespace.someOther * subnamespace.someOtherName @@ -97,7 +107,9 @@ scratch/main> add ⍟ I've added these definitions: absolute.term : ##Text + -- Should tab complete absolute names + scratch/main> debug.tab-complete view .absolute.te * .absolute.term @@ -107,25 +119,31 @@ scratch/main> debug.tab-complete view .absolute.te ``` ucm -- Should tab complete namespaces + scratch/main> debug.tab-complete find-in sub subnamespace subnamespace2 + scratch/main> debug.tab-complete find-in subnamespace subnamespace subnamespace2 + scratch/main> debug.tab-complete find-in subnamespace. subnamespace.AType + scratch/main> debug.tab-complete io.test sub subnamespace. subnamespace2. + scratch/main> debug.tab-complete io.test subnamespace subnamespace. subnamespace2. + scratch/main> debug.tab-complete io.test subnamespace. subnamespace.AType. @@ -142,7 +160,6 @@ add b = b ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -162,10 +179,12 @@ scratch/main> update.old type Foo add : a -> a + scratch/main> debug.tab-complete delete.type Foo * Foo Foo. + scratch/main> debug.tab-complete delete.term add * add @@ -180,9 +199,11 @@ myproject/main> branch mybranch Tip: To merge your work back into the main branch, first `switch /main` then `merge /mybranch`. + myproject/main> debug.tab-complete branch.delete /mybr /mybranch + myproject/main> debug.tab-complete project.rename my myproject @@ -195,7 +216,6 @@ mybranchsubnamespace.term = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -213,6 +233,7 @@ myproject/main> add ⍟ I've added these definitions: mybranchsubnamespace.term : ##Nat + myproject/main> debug.tab-complete merge mybr /mybranch diff --git a/unison-src/transcripts/idempotent/tdnr.md b/unison-src/transcripts/idempotent/tdnr.md index cbb138389b..1a4f8214b8 100644 --- a/unison-src/transcripts/idempotent/tdnr.md +++ b/unison-src/transcripts/idempotent/tdnr.md @@ -11,7 +11,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -40,7 +39,6 @@ bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -66,7 +64,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -94,7 +91,6 @@ bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -121,7 +117,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -154,7 +149,6 @@ good.foo = 17 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -180,7 +174,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -209,7 +202,6 @@ bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -236,7 +228,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -264,7 +255,6 @@ bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -292,7 +282,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -324,7 +313,6 @@ good.foo = 17 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -351,7 +339,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -385,7 +372,6 @@ bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -413,7 +399,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -446,7 +431,6 @@ bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -475,7 +459,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -510,7 +493,6 @@ lib.bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -536,7 +518,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -565,7 +546,6 @@ lib.bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -592,7 +572,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -620,7 +599,6 @@ lib.bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -648,7 +626,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -680,7 +657,6 @@ lib.dep.lib.dep.foo = 217 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -706,7 +682,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -735,7 +710,6 @@ lib.dep.lib.dep.foo = 217 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -762,7 +736,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -790,7 +763,6 @@ lib.dep.lib.dep.foo = 217 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -818,7 +790,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -850,7 +821,6 @@ lib.good.foo = 17 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -876,7 +846,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -905,7 +874,6 @@ bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -932,7 +900,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -960,7 +927,6 @@ bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -988,7 +954,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -1021,7 +986,6 @@ lib.bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -1048,7 +1012,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -1076,7 +1039,6 @@ lib.dep.lib.dep.foo = 217 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -1103,7 +1065,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -1131,7 +1092,6 @@ lib.dep.lib.bad.foo = "bar" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -1158,7 +1118,6 @@ thing = foo Nat.+ foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/test-command.md b/unison-src/transcripts/idempotent/test-command.md index 202c8b4525..3f3c6df0ec 100644 --- a/unison-src/transcripts/idempotent/test-command.md +++ b/unison-src/transcripts/idempotent/test-command.md @@ -15,7 +15,6 @@ foo.test2 = [Ok "test2"] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -74,7 +73,6 @@ lib.dep.testInLib = [Ok "testInLib"] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -101,6 +99,7 @@ scratch/main> test ✅ 2 test(s) passing Tip: Use view 1 to view the source of a test. + scratch/main> test.all diff --git a/unison-src/transcripts/idempotent/text-literals.md b/unison-src/transcripts/idempotent/text-literals.md index 1ecc7b517a..de87b7daf4 100644 --- a/unison-src/transcripts/idempotent/text-literals.md +++ b/unison-src/transcripts/idempotent/text-literals.md @@ -36,7 +36,6 @@ lit2 = """" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -96,6 +95,7 @@ scratch/main> add lit1 : Text lit2 : Text + scratch/main> view lit1 lit2 lit1 : Text diff --git a/unison-src/transcripts/idempotent/textfind.md b/unison-src/transcripts/idempotent/textfind.md index 41c0d8ac54..96bda8abba 100644 --- a/unison-src/transcripts/idempotent/textfind.md +++ b/unison-src/transcripts/idempotent/textfind.md @@ -52,7 +52,6 @@ lib.bar = 3 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -83,6 +82,7 @@ scratch/main> grep hi 1. bar Tip: Try `edit 1` to bring this into your scratch file. + scratch/main> view 1 bar : Nat @@ -90,6 +90,7 @@ scratch/main> view 1 "ooga" -> 99 "booga" -> 23 _ -> 0 + scratch/main> grep "hi" 🔎 @@ -99,6 +100,7 @@ scratch/main> grep "hi" 1. bar Tip: Try `edit 1` to bring this into your scratch file. + scratch/main> text.find.all hi 🔎 @@ -110,6 +112,7 @@ scratch/main> text.find.all hi Tip: Try `edit 1` or `edit 1-2` to bring these into your scratch file. + scratch/main> view 1-5 bar : Nat @@ -120,6 +123,7 @@ scratch/main> view 1-5 lib.foo : [Any] lib.foo = [Any 46, Any "hi", Any "zoink"] + scratch/main> grep oog 🔎 @@ -129,6 +133,7 @@ scratch/main> grep oog 1. bar Tip: Try `edit 1` to bring this into your scratch file. + scratch/main> view 1 bar : Nat @@ -148,10 +153,12 @@ scratch/main> grep quaffle 1. baz Tip: Try `edit 1` to bring this into your scratch file. + scratch/main> view 1-5 baz : [Text] baz = ["an", "quaffle", "tres"] + scratch/main> text.find "interesting const" 🔎 @@ -161,12 +168,14 @@ scratch/main> text.find "interesting const" 1. foo Tip: Try `edit 1` to bring this into your scratch file. + scratch/main> view 1-5 foo : Nat foo = _ = "an interesting constant" 1 + scratch/main> text.find "99" "23" 🔎 @@ -176,6 +185,7 @@ scratch/main> text.find "99" "23" 1. bar Tip: Try `edit 1` to bring this into your scratch file. + scratch/main> view 1 bar : Nat diff --git a/unison-src/transcripts/idempotent/todo-bug-builtins.md b/unison-src/transcripts/idempotent/todo-bug-builtins.md index b1db33c768..31b375e8fe 100644 --- a/unison-src/transcripts/idempotent/todo-bug-builtins.md +++ b/unison-src/transcripts/idempotent/todo-bug-builtins.md @@ -11,7 +11,6 @@ scratch/main> builtins.merge ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ @@ -38,7 +37,6 @@ scratch/main> builtins.merge ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ @@ -69,7 +67,6 @@ complicatedMathStuff x = todo "Come back and to something with x here" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -92,7 +89,6 @@ test = match true with ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/todo.md b/unison-src/transcripts/idempotent/todo.md index a985d1177b..b230464cdf 100644 --- a/unison-src/transcripts/idempotent/todo.md +++ b/unison-src/transcripts/idempotent/todo.md @@ -25,7 +25,6 @@ bar = foo + foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -45,6 +44,7 @@ scratch/main> add bar : Nat foo : Nat + scratch/main> todo These terms call `todo`: @@ -71,7 +71,6 @@ baz = foo.bar + foo.bar ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -91,6 +90,7 @@ scratch/main> add baz : Nat foo.bar : Nat + scratch/main> delete.namespace.force foo Done. @@ -102,6 +102,7 @@ scratch/main> delete.namespace.force foo Dependency Referenced In bar 1. baz + scratch/main> todo These terms do not have any names in the current namespace: @@ -127,7 +128,6 @@ bar = 17 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -147,9 +147,11 @@ scratch/main> add bar : Nat foo : Nat + scratch/main> debug.alias.term.force foo bar Done. + scratch/main> todo ❓ @@ -180,7 +182,6 @@ lib.foo = 16 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -198,6 +199,7 @@ scratch/main> add ⍟ I've added these definitions: lib.foo : Nat + scratch/main> todo There's a type or term at the top level of the `lib` @@ -222,7 +224,6 @@ type Foo = One ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -240,9 +241,11 @@ scratch/main> add ⍟ I've added these definitions: type Foo + scratch/main> alias.term Foo.One Foo.Two Done. + scratch/main> todo The type Foo has a constructor with multiple names. @@ -270,7 +273,6 @@ type Foo = Bar ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -288,9 +290,11 @@ scratch/main> add ⍟ I've added these definitions: type Foo + scratch/main> delete.term Foo.Bar Done. + scratch/main> todo These types have some constructors with missing names. @@ -320,7 +324,6 @@ structural type Foo.inner.Bar a = Uno a | Dos a a ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -340,6 +343,7 @@ scratch/main> add structural type Foo a structural type Foo.inner.Bar a + scratch/main> todo These types are aliases, but one is nested under the other. @@ -366,7 +370,6 @@ type Foo = Bar ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -384,9 +387,11 @@ scratch/main> add ⍟ I've added these definitions: type Foo + scratch/main> alias.term Foo.Bar Baz Done. + scratch/main> todo These constructors are not nested beneath their corresponding diff --git a/unison-src/transcripts/idempotent/top-level-exceptions.md b/unison-src/transcripts/idempotent/top-level-exceptions.md index 9e7b49520d..81c18f8349 100644 --- a/unison-src/transcripts/idempotent/top-level-exceptions.md +++ b/unison-src/transcripts/idempotent/top-level-exceptions.md @@ -29,7 +29,6 @@ mytest _ = [Ok "Great"] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -46,12 +45,14 @@ mytest _ = [Ok "Great"] scratch/main> run main () + scratch/main> add ⍟ I've added these definitions: main : '{IO, Exception} () mytest : '{IO, Exception} [Result] + scratch/main> io.test mytest New test results: @@ -76,7 +77,6 @@ unique type RuntimeError = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/transcript-parser-commands.md b/unison-src/transcripts/idempotent/transcript-parser-commands.md index 147db1caf7..5782588136 100644 --- a/unison-src/transcripts/idempotent/transcript-parser-commands.md +++ b/unison-src/transcripts/idempotent/transcript-parser-commands.md @@ -11,7 +11,6 @@ x = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/type-deps.md b/unison-src/transcripts/idempotent/type-deps.md index f30039d736..57b2cf602a 100644 --- a/unison-src/transcripts/idempotent/type-deps.md +++ b/unison-src/transcripts/idempotent/type-deps.md @@ -24,7 +24,6 @@ structural type Y = Y Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -54,7 +53,9 @@ scratch/main> add blocked structural type Z Tip: Use `help filestatus` to learn more. + -- This shouldn't exist, because it should've been blocked. + scratch/main> view Z ⚠️ diff --git a/unison-src/transcripts/idempotent/type-modifier-are-optional.md b/unison-src/transcripts/idempotent/type-modifier-are-optional.md index 4d2459a147..1af19c052b 100644 --- a/unison-src/transcripts/idempotent/type-modifier-are-optional.md +++ b/unison-src/transcripts/idempotent/type-modifier-are-optional.md @@ -17,7 +17,6 @@ structural ability MyAbilityS where const : a ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/undo.md b/unison-src/transcripts/idempotent/undo.md index 42d5854e74..fd250b350c 100644 --- a/unison-src/transcripts/idempotent/undo.md +++ b/unison-src/transcripts/idempotent/undo.md @@ -10,23 +10,28 @@ x = 1 scratch/main> builtins.merge lib.builtins Done. + scratch/main> add ⍟ I've added these definitions: x : Nat + scratch/main> ls 1. lib/ (469 terms, 74 types) 2. x (Nat) + scratch/main> alias.term x y Done. + scratch/main> ls 1. lib/ (469 terms, 74 types) 2. x (Nat) 3. y (Nat) + scratch/main> history Note: The most recent namespace hash is immediately below this @@ -50,6 +55,7 @@ scratch/main> history x □ 3. #ms9lggs2rg (start of history) + scratch/main> undo Here are the changes I undid @@ -58,10 +64,12 @@ scratch/main> undo Original Changes 1. x 2. y (added) + scratch/main> ls 1. lib/ (469 terms, 74 types) 2. x (Nat) + scratch/main> history Note: The most recent namespace hash is immediately below this @@ -88,23 +96,28 @@ x = 1 scratch/branch1> builtins.merge lib.builtins Done. + scratch/branch1> add ⍟ I've added these definitions: x : Nat + scratch/branch1> ls 1. lib/ (469 terms, 74 types) 2. x (Nat) + scratch/branch1> alias.term x y Done. + scratch/branch1> ls 1. lib/ (469 terms, 74 types) 2. x (Nat) 3. y (Nat) + scratch/branch1> history Note: The most recent namespace hash is immediately below this @@ -128,13 +141,17 @@ scratch/branch1> history x □ 3. #ms9lggs2rg (start of history) + -- Make some changes on an unrelated branch + scratch/branch2> builtins.merge lib.builtins Done. + scratch/branch2> delete.namespace lib Done. + scratch/branch1> undo Here are the changes I undid @@ -143,10 +160,12 @@ scratch/branch1> undo Original Changes 1. x 2. y (added) + scratch/branch1> ls 1. lib/ (469 terms, 74 types) 2. x (Nat) + scratch/branch1> history Note: The most recent namespace hash is immediately below this @@ -171,6 +190,7 @@ scratch/main> branch.create-empty new Done. I've created an empty branch scratch/new. Tip: Use `merge /somebranch` to initialize this branch. + scratch/new> undo ⚠️ diff --git a/unison-src/transcripts/idempotent/unique-type-churn.md b/unison-src/transcripts/idempotent/unique-type-churn.md index c1014c5546..25c06ea7d2 100644 --- a/unison-src/transcripts/idempotent/unique-type-churn.md +++ b/unison-src/transcripts/idempotent/unique-type-churn.md @@ -9,7 +9,6 @@ unique type C = C B ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -41,7 +40,6 @@ unique type C = C B ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked the definitions in scratch.u. This @@ -67,7 +65,6 @@ unique type A = A () ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -87,6 +84,7 @@ scratch/main> update updated... Done. + scratch/main> names A Type @@ -103,7 +101,6 @@ unique type A = A ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -125,6 +122,7 @@ scratch/main> update updated... Done. + scratch/main> names A Type diff --git a/unison-src/transcripts/idempotent/unitnamespace.md b/unison-src/transcripts/idempotent/unitnamespace.md index 287736fb2a..271da4e84f 100644 --- a/unison-src/transcripts/idempotent/unitnamespace.md +++ b/unison-src/transcripts/idempotent/unitnamespace.md @@ -3,7 +3,6 @@ ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -21,12 +20,15 @@ scratch/main> add ⍟ I've added these definitions: `()`.foo : ##Text + scratch/main> find 1. `()`.foo : ##Text + scratch/main> find-in `()` 1. foo : ##Text + scratch/main> delete.namespace `()` Done. diff --git a/unison-src/transcripts/idempotent/universal-cmp.md b/unison-src/transcripts/idempotent/universal-cmp.md index 23c1c618bc..23b14dd6ed 100644 --- a/unison-src/transcripts/idempotent/universal-cmp.md +++ b/unison-src/transcripts/idempotent/universal-cmp.md @@ -15,7 +15,6 @@ threadEyeDeez _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -35,6 +34,7 @@ scratch/main> add type A threadEyeDeez : ∀ _. _ ->{IO} (Boolean, Boolean) + scratch/main> run threadEyeDeez (false, true) @@ -48,7 +48,6 @@ scratch/main> run threadEyeDeez ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ diff --git a/unison-src/transcripts/idempotent/unsafe-coerce.md b/unison-src/transcripts/idempotent/unsafe-coerce.md index db2aaa7460..16fe412eb5 100644 --- a/unison-src/transcripts/idempotent/unsafe-coerce.md +++ b/unison-src/transcripts/idempotent/unsafe-coerce.md @@ -16,7 +16,6 @@ main _ = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -34,6 +33,7 @@ main _ = scratch/main> find unsafe.coerceAbilities 1. builtin.unsafe.coerceAbilities : (a ->{e1} b) -> a -> b + scratch/main> add ⍟ I've added these definitions: @@ -41,6 +41,7 @@ scratch/main> add f : 'Nat fc : '{IO, Exception} Nat main : '{IO, Exception} [Result] + scratch/main> io.test main New test results: diff --git a/unison-src/transcripts/idempotent/update-ignores-lib-namespace.md b/unison-src/transcripts/idempotent/update-ignores-lib-namespace.md index 31032b48c7..946fe14ceb 100644 --- a/unison-src/transcripts/idempotent/update-ignores-lib-namespace.md +++ b/unison-src/transcripts/idempotent/update-ignores-lib-namespace.md @@ -12,7 +12,6 @@ lib.foo = 100 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -39,7 +38,6 @@ foo = 200 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -60,6 +58,7 @@ scratch/main> update updated... Done. + scratch/main> names foo Term diff --git a/unison-src/transcripts/idempotent/update-on-conflict.md b/unison-src/transcripts/idempotent/update-on-conflict.md index 078f2cfdda..3e2392be9f 100644 --- a/unison-src/transcripts/idempotent/update-on-conflict.md +++ b/unison-src/transcripts/idempotent/update-on-conflict.md @@ -12,7 +12,6 @@ temp = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -32,9 +31,11 @@ scratch/main> add temp : Nat x : Nat + scratch/main> debug.alias.term.force temp x Done. + scratch/main> delete.term temp Done. @@ -45,7 +46,6 @@ x = 3 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/update-suffixifies-properly.md b/unison-src/transcripts/idempotent/update-suffixifies-properly.md index 8edef4df26..f0076b6ac8 100644 --- a/unison-src/transcripts/idempotent/update-suffixifies-properly.md +++ b/unison-src/transcripts/idempotent/update-suffixifies-properly.md @@ -12,7 +12,6 @@ bar = a.x.x.x.x + c.y.y.y.y ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -47,7 +46,6 @@ foo = +30 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/update-term-aliases-in-different-ways.md b/unison-src/transcripts/idempotent/update-term-aliases-in-different-ways.md index e8b3d4ef9f..edb264cb96 100644 --- a/unison-src/transcripts/idempotent/update-term-aliases-in-different-ways.md +++ b/unison-src/transcripts/idempotent/update-term-aliases-in-different-ways.md @@ -13,7 +13,6 @@ bar = 5 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -44,7 +43,6 @@ bar = 7 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -67,6 +65,7 @@ scratch/main> update updated... Done. + scratch/main> view foo bar bar : Nat diff --git a/unison-src/transcripts/idempotent/update-term-to-different-type.md b/unison-src/transcripts/idempotent/update-term-to-different-type.md index ee2d0d88af..668492cc63 100644 --- a/unison-src/transcripts/idempotent/update-term-to-different-type.md +++ b/unison-src/transcripts/idempotent/update-term-to-different-type.md @@ -10,7 +10,6 @@ foo = 5 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -36,7 +35,6 @@ foo = +5 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -56,6 +54,7 @@ scratch/main> update updated... Done. + scratch/main> view foo foo : Int diff --git a/unison-src/transcripts/idempotent/update-term-with-alias.md b/unison-src/transcripts/idempotent/update-term-with-alias.md index a13bfd8150..53a7e0b426 100644 --- a/unison-src/transcripts/idempotent/update-term-with-alias.md +++ b/unison-src/transcripts/idempotent/update-term-with-alias.md @@ -13,7 +13,6 @@ bar = 5 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -41,7 +40,6 @@ foo = 6 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -62,6 +60,7 @@ scratch/main> update updated... Done. + scratch/main> view foo bar bar : Nat diff --git a/unison-src/transcripts/idempotent/update-term-with-dependent-to-different-type.md b/unison-src/transcripts/idempotent/update-term-with-dependent-to-different-type.md index e590bc1b04..46f4430d0c 100644 --- a/unison-src/transcripts/idempotent/update-term-with-dependent-to-different-type.md +++ b/unison-src/transcripts/idempotent/update-term-with-dependent-to-different-type.md @@ -13,7 +13,6 @@ bar = foo + 10 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -41,7 +40,6 @@ foo = +5 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/update-term-with-dependent.md b/unison-src/transcripts/idempotent/update-term-with-dependent.md index aba7ad6b70..0fb5cba6d6 100644 --- a/unison-src/transcripts/idempotent/update-term-with-dependent.md +++ b/unison-src/transcripts/idempotent/update-term-with-dependent.md @@ -13,7 +13,6 @@ bar = foo + 10 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -41,7 +40,6 @@ foo = 6 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -65,6 +63,7 @@ scratch/main> update Everything typechecks, so I'm saving the results... Done. + scratch/main> view bar bar : Nat diff --git a/unison-src/transcripts/idempotent/update-term.md b/unison-src/transcripts/idempotent/update-term.md index 753eab2cf0..05ed53fd95 100644 --- a/unison-src/transcripts/idempotent/update-term.md +++ b/unison-src/transcripts/idempotent/update-term.md @@ -10,7 +10,6 @@ foo = 5 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -36,7 +35,6 @@ foo = 6 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -56,6 +54,7 @@ scratch/main> update updated... Done. + scratch/main> view foo foo : Nat diff --git a/unison-src/transcripts/idempotent/update-test-to-non-test.md b/unison-src/transcripts/idempotent/update-test-to-non-test.md index 21965f8a19..6735428e6a 100644 --- a/unison-src/transcripts/idempotent/update-test-to-non-test.md +++ b/unison-src/transcripts/idempotent/update-test-to-non-test.md @@ -9,7 +9,6 @@ test> foo = [] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -35,6 +34,7 @@ scratch/main> add ⍟ I've added these definitions: foo : [Result] + scratch/main> view foo foo : [Result] @@ -46,7 +46,6 @@ foo = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -68,6 +67,7 @@ scratch/main> update updated... Done. + scratch/main> view foo foo : Nat diff --git a/unison-src/transcripts/idempotent/update-test-watch-roundtrip.md b/unison-src/transcripts/idempotent/update-test-watch-roundtrip.md index 0c3cac7aaa..93eb6e5d47 100644 --- a/unison-src/transcripts/idempotent/update-test-watch-roundtrip.md +++ b/unison-src/transcripts/idempotent/update-test-watch-roundtrip.md @@ -28,7 +28,6 @@ foo n = "hello, world!" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/update-type-add-constructor.md b/unison-src/transcripts/idempotent/update-type-add-constructor.md index 6ca215cd51..743bf42c9b 100644 --- a/unison-src/transcripts/idempotent/update-type-add-constructor.md +++ b/unison-src/transcripts/idempotent/update-type-add-constructor.md @@ -8,7 +8,6 @@ unique type Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -35,7 +34,6 @@ unique type Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -55,9 +53,11 @@ scratch/main> update updated... Done. + scratch/main> view Foo type Foo = Bar Nat | Baz Nat Nat + scratch/main> find.verbose 1. -- #2sffq4apsq1cts53njcunj63fa8ohov4eqn77q14s77ajicajh4g28sq5s5ai33f2k6oh6o67aarnlpu7u7s4la07ag2er33epalsog diff --git a/unison-src/transcripts/idempotent/update-type-add-field.md b/unison-src/transcripts/idempotent/update-type-add-field.md index 6cfe366468..b59d840ea0 100644 --- a/unison-src/transcripts/idempotent/update-type-add-field.md +++ b/unison-src/transcripts/idempotent/update-type-add-field.md @@ -7,7 +7,6 @@ unique type Foo = Bar Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -32,7 +31,6 @@ unique type Foo = Bar Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -52,9 +50,11 @@ scratch/main> update updated... Done. + scratch/main> view Foo type Foo = Bar Nat Nat + scratch/main> find.verbose 1. -- #8fk6k0j208th1ia4vnjtoc5fomd6le540prec255svg71bcfga9dofrvoq1d7v6010d6b6em4q51p8st5c5juhrev72cnnel8ko3o1g diff --git a/unison-src/transcripts/idempotent/update-type-add-new-record.md b/unison-src/transcripts/idempotent/update-type-add-new-record.md index 4527bc19bb..b6373bd0d9 100644 --- a/unison-src/transcripts/idempotent/update-type-add-new-record.md +++ b/unison-src/transcripts/idempotent/update-type-add-new-record.md @@ -7,7 +7,6 @@ unique type Foo = { bar : Nat } ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -29,6 +28,7 @@ scratch/main> update updated... Done. + scratch/main> view Foo type Foo = { bar : Nat } diff --git a/unison-src/transcripts/idempotent/update-type-add-record-field.md b/unison-src/transcripts/idempotent/update-type-add-record-field.md index bef52e1367..46f48385a3 100644 --- a/unison-src/transcripts/idempotent/update-type-add-record-field.md +++ b/unison-src/transcripts/idempotent/update-type-add-record-field.md @@ -7,7 +7,6 @@ unique type Foo = { bar : Nat } ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -38,7 +37,6 @@ unique type Foo = { bar : Nat, baz : Int } ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -67,9 +65,11 @@ scratch/main> update updated... Done. + scratch/main> view Foo type Foo = { bar : Nat, baz : Int } + scratch/main> find.verbose 1. -- #05gh1dur4778dauh9slaofprc5356n47qpove0c1jl0birt2fcu301js8auu5vfr5bjfga9j8ikuk07ll9fu1gj3ehrp3basguhsd58 diff --git a/unison-src/transcripts/idempotent/update-type-constructor-alias.md b/unison-src/transcripts/idempotent/update-type-constructor-alias.md index 564977360d..044772b2db 100644 --- a/unison-src/transcripts/idempotent/update-type-constructor-alias.md +++ b/unison-src/transcripts/idempotent/update-type-constructor-alias.md @@ -7,7 +7,6 @@ unique type Foo = Bar Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -25,6 +24,7 @@ scratch/main> add ⍟ I've added these definitions: type Foo + scratch/main> alias.term Foo.Bar Foo.BarAlias Done. @@ -35,7 +35,6 @@ unique type Foo = Bar Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/update-type-delete-constructor-with-dependent.md b/unison-src/transcripts/idempotent/update-type-delete-constructor-with-dependent.md index d267239d61..8c11024b9c 100644 --- a/unison-src/transcripts/idempotent/update-type-delete-constructor-with-dependent.md +++ b/unison-src/transcripts/idempotent/update-type-delete-constructor-with-dependent.md @@ -14,7 +14,6 @@ foo = cases ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -42,7 +41,6 @@ unique type Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/update-type-delete-constructor.md b/unison-src/transcripts/idempotent/update-type-delete-constructor.md index 1d3f8ab182..1f6b205ce5 100644 --- a/unison-src/transcripts/idempotent/update-type-delete-constructor.md +++ b/unison-src/transcripts/idempotent/update-type-delete-constructor.md @@ -9,7 +9,6 @@ unique type Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -35,7 +34,6 @@ unique type Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -55,9 +53,11 @@ scratch/main> update updated... Done. + scratch/main> view Foo type Foo = Bar Nat + scratch/main> find.verbose 1. -- #b509v3eg4kehsg29g6pvrogeb71ue32nm2fj9284n4i7lprsr7u9a7g6s695d09du0fsfti6rrsk1s62q5thpr1jjkqb3us3s0lrd60 diff --git a/unison-src/transcripts/idempotent/update-type-delete-record-field.md b/unison-src/transcripts/idempotent/update-type-delete-record-field.md index 418d886e24..ec2417d02b 100644 --- a/unison-src/transcripts/idempotent/update-type-delete-record-field.md +++ b/unison-src/transcripts/idempotent/update-type-delete-record-field.md @@ -7,7 +7,6 @@ unique type Foo = { bar : Nat, baz : Int } ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -44,7 +43,6 @@ unique type Foo = { bar : Nat } ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -73,9 +71,11 @@ scratch/main> update Typechecking failed. I've updated your scratch file with the definitions that need fixing. Once the file is compiling, try `update` again. + scratch/main> view Foo type Foo = { bar : Nat, baz : Int } + scratch/main> find.verbose 1. -- #05gh1dur4778dauh9slaofprc5356n47qpove0c1jl0birt2fcu301js8auu5vfr5bjfga9j8ikuk07ll9fu1gj3ehrp3basguhsd58 diff --git a/unison-src/transcripts/idempotent/update-type-missing-constructor.md b/unison-src/transcripts/idempotent/update-type-missing-constructor.md index 20f9b77371..f88af7b953 100644 --- a/unison-src/transcripts/idempotent/update-type-missing-constructor.md +++ b/unison-src/transcripts/idempotent/update-type-missing-constructor.md @@ -7,7 +7,6 @@ unique type Foo = Bar Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -25,6 +24,7 @@ scratch/main> add ⍟ I've added these definitions: type Foo + scratch/main> delete.term Foo.Bar Done. @@ -37,7 +37,6 @@ unique type Foo = Bar Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -54,6 +53,7 @@ unique type Foo = Bar Nat Nat scratch/main> view Foo type Foo = #b509v3eg4k#0 Nat + scratch/main> update Sorry, I wasn't able to perform the update: diff --git a/unison-src/transcripts/idempotent/update-type-nested-decl-aliases.md b/unison-src/transcripts/idempotent/update-type-nested-decl-aliases.md index b6cdaacd02..5ce5ee0fea 100644 --- a/unison-src/transcripts/idempotent/update-type-nested-decl-aliases.md +++ b/unison-src/transcripts/idempotent/update-type-nested-decl-aliases.md @@ -10,7 +10,6 @@ structural type A = B.TheOtherAlias Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -39,7 +38,6 @@ unique type Foo = Bar Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/update-type-no-op-record.md b/unison-src/transcripts/idempotent/update-type-no-op-record.md index c810b32965..0b8888835c 100644 --- a/unison-src/transcripts/idempotent/update-type-no-op-record.md +++ b/unison-src/transcripts/idempotent/update-type-no-op-record.md @@ -7,7 +7,6 @@ unique type Foo = { bar : Nat } ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/update-type-stray-constructor-alias.md b/unison-src/transcripts/idempotent/update-type-stray-constructor-alias.md index dc9e4bf2f8..8e29e089ba 100644 --- a/unison-src/transcripts/idempotent/update-type-stray-constructor-alias.md +++ b/unison-src/transcripts/idempotent/update-type-stray-constructor-alias.md @@ -7,7 +7,6 @@ unique type Foo = Bar Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -25,6 +24,7 @@ scratch/main> add ⍟ I've added these definitions: type Foo + scratch/main> alias.term Foo.Bar Stray.BarAlias Done. @@ -35,7 +35,6 @@ unique type Foo = Bar Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/update-type-stray-constructor.md b/unison-src/transcripts/idempotent/update-type-stray-constructor.md index 9af0c8065d..8e5aaa91cb 100644 --- a/unison-src/transcripts/idempotent/update-type-stray-constructor.md +++ b/unison-src/transcripts/idempotent/update-type-stray-constructor.md @@ -7,7 +7,6 @@ unique type Foo = Bar Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -25,6 +24,7 @@ scratch/main> add ⍟ I've added these definitions: type Foo + scratch/main> move.term Foo.Bar Stray.Bar Done. @@ -37,7 +37,6 @@ unique type Foo = Bar Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -56,6 +55,7 @@ Note that the constructor name shown here (implied to be called `Foo.Stray.Bar`) scratch/main> view Foo type Foo = Stray.Bar Nat + scratch/main> update Sorry, I wasn't able to perform the update: diff --git a/unison-src/transcripts/idempotent/update-type-turn-constructor-into-smart-constructor.md b/unison-src/transcripts/idempotent/update-type-turn-constructor-into-smart-constructor.md index 0808ba0660..baf5d34cd9 100644 --- a/unison-src/transcripts/idempotent/update-type-turn-constructor-into-smart-constructor.md +++ b/unison-src/transcripts/idempotent/update-type-turn-constructor-into-smart-constructor.md @@ -10,7 +10,6 @@ makeFoo n = Bar (n+10) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -40,7 +39,6 @@ Foo.Bar n = internal.Bar n ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -65,9 +63,11 @@ scratch/main> update Everything typechecks, so I'm saving the results... Done. + scratch/main> view Foo type Foo = internal.Bar Nat + scratch/main> find.verbose 1. -- #b509v3eg4kehsg29g6pvrogeb71ue32nm2fj9284n4i7lprsr7u9a7g6s695d09du0fsfti6rrsk1s62q5thpr1jjkqb3us3s0lrd60 diff --git a/unison-src/transcripts/idempotent/update-type-turn-non-record-into-record.md b/unison-src/transcripts/idempotent/update-type-turn-non-record-into-record.md index 7c4574a088..ed6fd0aa95 100644 --- a/unison-src/transcripts/idempotent/update-type-turn-non-record-into-record.md +++ b/unison-src/transcripts/idempotent/update-type-turn-non-record-into-record.md @@ -7,7 +7,6 @@ unique type Foo = Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -32,7 +31,6 @@ unique type Foo = { bar : Nat } ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -58,9 +56,11 @@ scratch/main> update updated... Done. + scratch/main> view Foo type Foo = { bar : Nat } + scratch/main> find.verbose 1. -- #b509v3eg4kehsg29g6pvrogeb71ue32nm2fj9284n4i7lprsr7u9a7g6s695d09du0fsfti6rrsk1s62q5thpr1jjkqb3us3s0lrd60 diff --git a/unison-src/transcripts/idempotent/update-type-with-dependent-term.md b/unison-src/transcripts/idempotent/update-type-with-dependent-term.md index c56e884d6c..c59e3bef59 100644 --- a/unison-src/transcripts/idempotent/update-type-with-dependent-term.md +++ b/unison-src/transcripts/idempotent/update-type-with-dependent-term.md @@ -10,7 +10,6 @@ incrFoo = cases Bar n -> Bar (n+1) ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -37,7 +36,6 @@ unique type Foo = Bar Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/update-type-with-dependent-type-to-different-kind.md b/unison-src/transcripts/idempotent/update-type-with-dependent-type-to-different-kind.md index c8d569aa01..e1b257cf7c 100644 --- a/unison-src/transcripts/idempotent/update-type-with-dependent-type-to-different-kind.md +++ b/unison-src/transcripts/idempotent/update-type-with-dependent-type-to-different-kind.md @@ -8,7 +8,6 @@ unique type Baz = Qux Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -35,7 +34,6 @@ unique type Foo a = Bar Nat a ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/update-type-with-dependent-type.md b/unison-src/transcripts/idempotent/update-type-with-dependent-type.md index 9fe59c9183..dea13297d2 100644 --- a/unison-src/transcripts/idempotent/update-type-with-dependent-type.md +++ b/unison-src/transcripts/idempotent/update-type-with-dependent-type.md @@ -8,7 +8,6 @@ unique type Baz = Qux Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -35,7 +34,6 @@ unique type Foo = Bar Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -59,12 +57,15 @@ scratch/main> update Everything typechecks, so I'm saving the results... Done. + scratch/main> view Foo type Foo = Bar Nat Nat + scratch/main> view Baz type Baz = Qux Foo + scratch/main> find.verbose 1. -- #34msh9satlfog576493eo9pkjn6aj7d8fj6jfheglvgr5s39iptb81649bpkad1lqraheqb8em9ms551k01oternhknc4m7jicgtk08 diff --git a/unison-src/transcripts/idempotent/update-watch.md b/unison-src/transcripts/idempotent/update-watch.md index 9024cc741a..6772cf521b 100644 --- a/unison-src/transcripts/idempotent/update-watch.md +++ b/unison-src/transcripts/idempotent/update-watch.md @@ -3,7 +3,6 @@ ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ diff --git a/unison-src/transcripts/idempotent/upgrade-happy-path.md b/unison-src/transcripts/idempotent/upgrade-happy-path.md index 7d92085582..dcc674be5a 100644 --- a/unison-src/transcripts/idempotent/upgrade-happy-path.md +++ b/unison-src/transcripts/idempotent/upgrade-happy-path.md @@ -9,7 +9,6 @@ thingy = lib.old.foo + 10 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -39,12 +38,14 @@ Test tab completion and fzf options of upgrade command. proj/main> debug.tab-complete upgrade ol old + proj/main> debug.fuzzy-options upgrade _ Select a dependency to upgrade: * builtin * new * old + proj/main> debug.fuzzy-options upgrade old _ Select a dependency to upgrade to: @@ -57,10 +58,12 @@ proj/main> debug.fuzzy-options upgrade old _ proj/main> upgrade old new I upgraded old to new, and removed old. + proj/main> ls lib 1. builtin/ (469 terms, 74 types) 2. new/ (1 term) + proj/main> view thingy thingy : Nat diff --git a/unison-src/transcripts/idempotent/upgrade-sad-path.md b/unison-src/transcripts/idempotent/upgrade-sad-path.md index 128079cdb4..2c56bf72d8 100644 --- a/unison-src/transcripts/idempotent/upgrade-sad-path.md +++ b/unison-src/transcripts/idempotent/upgrade-sad-path.md @@ -9,7 +9,6 @@ thingy = lib.old.foo + 10 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -67,7 +66,6 @@ thingy = foo + +10 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -87,19 +85,23 @@ proj/upgrade-old-to-new> update updated... Done. + proj/upgrade-old-to-new> upgrade.commit I fast-forward merged proj/upgrade-old-to-new into proj/main. + proj/main> view thingy thingy : Int thingy = use Int + foo + +10 + proj/main> ls lib 1. builtin/ (469 terms, 74 types) 2. new/ (1 term) + proj/main> branches Branch Remote branch diff --git a/unison-src/transcripts/idempotent/upgrade-suffixifies-properly.md b/unison-src/transcripts/idempotent/upgrade-suffixifies-properly.md index 17272a8510..96bee848b0 100644 --- a/unison-src/transcripts/idempotent/upgrade-suffixifies-properly.md +++ b/unison-src/transcripts/idempotent/upgrade-suffixifies-properly.md @@ -13,7 +13,6 @@ bar = a.x.x.x.x + c.y.y.y.y ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you diff --git a/unison-src/transcripts/idempotent/upgrade-with-old-alias.md b/unison-src/transcripts/idempotent/upgrade-with-old-alias.md index d635a912f0..4038b3df88 100644 --- a/unison-src/transcripts/idempotent/upgrade-with-old-alias.md +++ b/unison-src/transcripts/idempotent/upgrade-with-old-alias.md @@ -10,7 +10,6 @@ mything = lib.old.foo + 100 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -32,15 +31,18 @@ myproject/main> update updated... Done. + myproject/main> upgrade old new I upgraded old to new, and removed old. + myproject/main> view mything mything : Nat mything = use Nat + foo + 100 + myproject/main> view bar bar : Nat diff --git a/unison-src/transcripts/idempotent/view.md b/unison-src/transcripts/idempotent/view.md index b84c8c9427..05ed7f006e 100644 --- a/unison-src/transcripts/idempotent/view.md +++ b/unison-src/transcripts/idempotent/view.md @@ -15,6 +15,7 @@ scratch/main> add ``` ucm -- Should suffix-search and find values in sub-namespaces + scratch/main> view thing a.thing : Text @@ -22,7 +23,9 @@ scratch/main> view thing b.thing : Text b.thing = "b" + -- Should support absolute paths + scratch/main> view .b.thing .b.thing : Text diff --git a/unison-src/transcripts/idempotent/watch-expressions.md b/unison-src/transcripts/idempotent/watch-expressions.md index b1f9869ccf..dffa25f89f 100644 --- a/unison-src/transcripts/idempotent/watch-expressions.md +++ b/unison-src/transcripts/idempotent/watch-expressions.md @@ -9,7 +9,6 @@ test> pass = [Ok "Passed"] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -41,7 +40,6 @@ test> pass = [Ok "Passed"] ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked the definitions in scratch.u. This @@ -59,6 +57,7 @@ test> pass = [Ok "Passed"] scratch/main> add ⊡ Ignored previously added definitions: pass + scratch/main> test Cached test results (`help testcache` to learn more) @@ -76,7 +75,6 @@ scratch/main> test ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. ✅ diff --git a/unison-src/transcripts/merge.output.md b/unison-src/transcripts/merge.output.md index 02acea340c..8051f25281 100644 --- a/unison-src/transcripts/merge.output.md +++ b/unison-src/transcripts/merge.output.md @@ -8,6 +8,7 @@ scratch/main> help merge merge `merge /branch` merges `branch` into the current branch + scratch/main> help merge.commit merge.commit (or commit.merge) @@ -45,6 +46,7 @@ foo = "alices foo" ``` ucm :hide scratch/alice> add + scratch/main> branch bob ``` @@ -65,6 +67,7 @@ Merge result: scratch/alice> merge /bob I merged scratch/bob into scratch/alice. + scratch/alice> view foo bar bar : Text @@ -84,6 +87,7 @@ If Alice and Bob also happen to add the same definition, that's not a conflict. ``` ucm :hide scratch/main> builtins.mergeio lib.builtins + scratch/main> branch alice ``` @@ -96,6 +100,7 @@ foo = "alice and bobs foo" ``` ucm :hide scratch/alice> add + scratch/main> branch bob ``` @@ -119,6 +124,7 @@ Merge result: scratch/alice> merge /bob I merged scratch/bob into scratch/alice. + scratch/alice> view foo bar bar : Text @@ -149,6 +155,7 @@ foo = "old foo" ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -161,6 +168,7 @@ foo = "new foo" ``` ucm :hide scratch/alice> update + scratch/main> branch bob ``` @@ -187,6 +195,7 @@ Merge result: scratch/alice> merge /bob I merged scratch/bob into scratch/alice. + scratch/alice> view foo bar bar : Text @@ -196,6 +205,7 @@ scratch/alice> view foo bar foo : Text foo = "new foo" + scratch/alice> display bar "old foo - old foo" @@ -230,6 +240,7 @@ baz = "old baz" ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -277,6 +288,7 @@ Merge result: scratch/alice> merge /bob I merged scratch/bob into scratch/alice. + scratch/alice> view foo bar baz bar : Text @@ -289,6 +301,7 @@ scratch/alice> view foo bar baz foo = use Text ++ "foo" ++ " - " ++ bar ++ " - " ++ baz + scratch/alice> display foo "foo - alices bar - bobs baz" @@ -377,6 +390,7 @@ Merge result: scratch/alice> merge /bob I merged scratch/bob into scratch/alice. + scratch/alice> view foo bar baz bar : Text @@ -391,6 +405,7 @@ scratch/alice> view foo bar baz foo = use Text ++ "old foo" ++ " - " ++ bar + scratch/alice> display foo "old foo - bobs bar - alices baz" @@ -417,6 +432,7 @@ foo = "old foo" ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -429,6 +445,7 @@ foo = "alices foo" ``` ucm :hide scratch/alice> update + scratch/main> branch bob ``` @@ -446,6 +463,7 @@ Merge result: scratch/alice> merge /bob I merged scratch/bob into scratch/alice. + scratch/alice> view foo foo : Text @@ -485,6 +503,7 @@ lib.bothDifferent.baz = 19 ``` ucm :hide scratch/alice> add + scratch/main> branch bob ``` @@ -511,6 +530,7 @@ Merge result: scratch/alice> merge bob I merged scratch/bob into scratch/alice. + scratch/alice> view foo bar baz lib.alice.foo : Nat @@ -548,12 +568,14 @@ scratch/main> branch alice Tip: To merge your work back into the main branch, first `switch /main` then `merge /alice`. + scratch/main> branch bob Done. I've created the bob branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /bob`. + scratch/alice> merge /bob 😶 @@ -580,6 +602,7 @@ scratch/main> branch alice Tip: To merge your work back into the main branch, first `switch /main` then `merge /alice`. + scratch/main> branch bob Done. I've created the bob branch based off of main. @@ -601,6 +624,7 @@ scratch/alice> add ⍟ I've added these definitions: foo : Text + scratch/alice> merge /bob 😶 @@ -627,6 +651,7 @@ scratch/main> branch alice Tip: To merge your work back into the main branch, first `switch /main` then `merge /alice`. + scratch/main> branch bob Done. I've created the bob branch based off of main. @@ -648,6 +673,7 @@ scratch/bob> add ⍟ I've added these definitions: foo : Text + scratch/alice> merge /bob I fast-forward merged scratch/bob into scratch/alice. @@ -666,6 +692,7 @@ scratch/main> branch topic Tip: To merge your work back into the main branch, first `switch /main` then `merge /topic`. + scratch/main> merge /topic 😶 @@ -698,6 +725,7 @@ foo = "foo" ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -726,6 +754,7 @@ scratch/bob> add ⍟ I've added these definitions: bar : Text + scratch/alice> merge /bob I couldn't automatically merge scratch/bob into scratch/alice. @@ -776,6 +805,7 @@ foo = "foo" ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -788,6 +818,7 @@ foo = 100 ``` ucm :hide scratch/alice> update + scratch/main> branch bob ``` @@ -855,6 +886,7 @@ bar = "old bar" ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -873,6 +905,7 @@ qux = "alices qux depends on alices foo" ++ foo ``` ucm :hide scratch/alice> update + scratch/main> branch bob ``` @@ -959,6 +992,7 @@ unique type Foo = MkFoo Nat ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -970,6 +1004,7 @@ unique type Foo = MkFoo Nat Nat ``` ucm :hide scratch/alice> update + scratch/main> branch bob ``` @@ -1032,6 +1067,7 @@ unique type Foo = Baz Nat | Qux Text ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -1043,6 +1079,7 @@ unique type Foo = Baz Nat Nat | Qux Text ``` ucm :hide scratch/alice> update + scratch/main> branch bob ``` @@ -1103,6 +1140,7 @@ unique type Foo = Baz Nat | Qux Text ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -1180,6 +1218,7 @@ my.cool.thing = 17 ``` ucm :hide scratch/alice> add + scratch/main> branch bob ``` @@ -1245,6 +1284,7 @@ Foo.Bar = 17 ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -1256,6 +1296,7 @@ unique type Foo = Alice Nat ``` ucm :hide scratch/alice> add + scratch/main> branch bob ``` @@ -1333,6 +1374,7 @@ Foo.Bar.Hello = 17 ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -1340,7 +1382,9 @@ Alice deletes this type entirely, and repurposes its constructor names for other ``` ucm :hide scratch/alice> delete.type Foo + scratch/alice> delete.term Foo.Bar.Baz + scratch/alice> delete.term Foo.Bar.Qux ``` @@ -1365,8 +1409,11 @@ Bob, meanwhile, first deletes the term, then sort of deletes the type and re-add ``` ucm :hide scratch/main> branch bob + scratch/bob> delete.term Foo.Bar.Hello + scratch/bob> move.type Foo Foo.Bar + scratch/bob> move.term Foo.Bar.Qux Foo.Bar.Hello ``` @@ -1445,6 +1492,7 @@ alice _ = 18 ``` ucm :hide scratch/alice> add + scratch/main> branch bob ``` @@ -1523,6 +1571,7 @@ foo = "old foo" ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -1535,6 +1584,7 @@ foo = "alices foo" ``` ucm :hide scratch/alice> update + scratch/main> branch bob ``` @@ -1590,7 +1640,6 @@ foo = "alice and bobs foo" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -1610,14 +1659,17 @@ scratch/merge-bob-into-alice> update updated... Done. + scratch/merge-bob-into-alice> merge.commit I fast-forward merged scratch/merge-bob-into-alice into scratch/alice. + scratch/alice> view foo foo : Text foo = "alice and bobs foo" + scratch/alice> branches Branch Remote branch @@ -1681,6 +1733,7 @@ bar = 100 ``` ucm :hide scratch/main> add + scratch/main> branch alice ``` @@ -1696,6 +1749,7 @@ bar = 300 ``` ucm :hide scratch/alice> update + scratch/main> branch bob ``` @@ -1991,6 +2045,7 @@ scratch/alice> add ⍟ I've added these definitions: type Foo + scratch/alice> alias.term Foo.Bar AliasOutsideFooNamespace Done. @@ -2048,6 +2103,7 @@ lib.foo = 1 ``` ucm :hide scratch/alice> add + scratch/main> branch bob ``` @@ -2096,7 +2152,6 @@ structural type Foo = Bar Nat | Baz Nat Nat ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2114,6 +2169,7 @@ scratch/main> add ⍟ I've added these definitions: structural type Foo + scratch/main> delete.term Foo.Baz Done. @@ -2128,9 +2184,11 @@ scratch/main> branch alice Tip: To merge your work back into the main branch, first `switch /main` then `merge /alice`. + scratch/alice> delete.type Foo Done. + scratch/alice> delete.term Foo.Bar Done. @@ -2142,7 +2200,6 @@ alice = 100 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2171,9 +2228,11 @@ scratch/main> branch bob Tip: To merge your work back into the main branch, first `switch /main` then `merge /bob`. + scratch/bob> delete.type Foo Done. + scratch/bob> delete.term Foo.Bar Done. @@ -2185,7 +2244,6 @@ bob = 101 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2231,7 +2289,6 @@ bar = 17 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2251,12 +2308,14 @@ scratch/main> add bar : Nat foo : Nat + scratch/main> branch alice Done. I've created the alice branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /alice`. + scratch/alice> delete.term bar Done. @@ -2267,7 +2326,6 @@ foo = 18 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2287,6 +2345,7 @@ scratch/alice> update updated... Done. + scratch/main> branch bob Done. I've created the bob branch based off of main. @@ -2300,7 +2359,6 @@ bob = 101 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2341,7 +2399,6 @@ type Foo = Bar | Baz ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2359,6 +2416,7 @@ scratch/main> add ⍟ I've added these definitions: type Foo + scratch/main> branch topic Done. I've created the topic branch based off of main. @@ -2372,7 +2430,6 @@ boop = "boop" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2397,7 +2454,6 @@ type Foo = Bar ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2423,6 +2479,7 @@ scratch/main> update scratch/main> merge topic I merged scratch/topic into scratch/main. + scratch/main> view Foo type Foo = Bar @@ -2454,7 +2511,6 @@ baz = "lca" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2476,6 +2532,7 @@ scratch/alice> add bar : Nat baz : Text foo : Nat + scratch/alice> branch bob Done. I've created the bob branch based off of alice. @@ -2492,7 +2549,6 @@ baz = "bob" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2525,7 +2581,6 @@ baz = "alice" ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2612,7 +2667,6 @@ a = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2637,7 +2691,6 @@ b = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2662,7 +2715,6 @@ b = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked the definitions in scratch.u. This @@ -2682,7 +2734,6 @@ a = 1 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2708,7 +2759,6 @@ b = 2 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked the definitions in scratch.u. This @@ -2722,12 +2772,15 @@ scratch/carol> add a : ##Nat b : ##Nat + scratch/bob> merge /alice I merged scratch/alice into scratch/bob. + scratch/carol> merge /bob I merged scratch/bob into scratch/carol. + scratch/carol> history Note: The most recent namespace hash is immediately below this @@ -2772,7 +2825,6 @@ bar = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2794,6 +2846,7 @@ scratch/alice> add bar : Nat foo : Nat ignore : a -> () + scratch/alice> branch bob Done. I've created the bob branch based off of alice. @@ -2810,7 +2863,6 @@ bar = ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2841,7 +2893,6 @@ foo = 19 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2892,7 +2943,6 @@ type Bar = MkBar Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -2912,21 +2962,25 @@ scratch/main> add type Bar type Foo + scratch/main> branch alice Done. I've created the alice branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /alice`. + scratch/alice> move.term Foo.Lca Foo.Alice Done. + scratch/main> branch bob Done. I've created the bob branch based off of main. Tip: To merge your work back into the main branch, first `switch /main` then `merge /bob`. + scratch/bob> move.term Foo.Lca Foo.Bob Done. @@ -2978,7 +3032,6 @@ type Bar = MkBar Foo ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked the definitions in scratch.u. This @@ -2992,11 +3045,13 @@ scratch/merge-bob-into-alice> update updated... Done. + scratch/merge-bob-into-alice> names Bar Type Hash: #h3af39sae7 Names: Bar + scratch/alice> names Bar Type @@ -3023,7 +3078,6 @@ hello = 17 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -3041,6 +3095,7 @@ scratch/main> add ⍟ I've added these definitions: hello : Nat + scratch/main> branch alice Done. I've created the alice branch based off of main. @@ -3055,7 +3110,6 @@ foo = 100 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you @@ -3079,6 +3133,7 @@ scratch/alice> update updated... Done. + scratch/main> branch bob Done. I've created the bob branch based off of main. @@ -3093,7 +3148,6 @@ bar = 100 ``` ``` ucm :added-by-ucm - Loading changes detected in scratch.u. I found and typechecked these definitions in scratch.u. If you