From e545e0b1a7c0614aa364602ae0b19f45bf498b0e Mon Sep 17 00:00:00 2001 From: Chris Penner Date: Wed, 31 Jul 2024 15:58:28 -0700 Subject: [PATCH] Rerun transcripts --- ...ability-order-doesnt-affect-hash.output.md | 2 - unison-src/transcripts/deep-names.output.md | 8 -- .../transcripts/empty-namespaces.output.md | 4 +- unison-src/transcripts/find-command.output.md | 9 +- unison-src/transcripts/help.output.md | 122 ++++++++++-------- unison-src/transcripts/merge.output.md | 2 - unison-src/transcripts/names.output.md | 6 - unison-src/transcripts/suffixes.output.md | 2 - .../transcripts/unique-type-churn.output.md | 6 - .../update-ignores-lib-namespace.output.md | 2 - 10 files changed, 75 insertions(+), 88 deletions(-) diff --git a/unison-src/transcripts/ability-order-doesnt-affect-hash.output.md b/unison-src/transcripts/ability-order-doesnt-affect-hash.output.md index a61dd0045..d897322a9 100644 --- a/unison-src/transcripts/ability-order-doesnt-affect-hash.output.md +++ b/unison-src/transcripts/ability-order-doesnt-affect-hash.output.md @@ -45,7 +45,5 @@ scratch/main> names term1 Term Hash: #8hum58rlih Names: term1 term2 - - Tip: Use `names.global` to see more results. ``` diff --git a/unison-src/transcripts/deep-names.output.md b/unison-src/transcripts/deep-names.output.md index 114133d78..9756abc50 100644 --- a/unison-src/transcripts/deep-names.output.md +++ b/unison-src/transcripts/deep-names.output.md @@ -48,16 +48,12 @@ scratch/app1> names a Term Hash: #gjmq673r1v Names: lib.text_v1.a lib.text_v2.a - - Tip: Use `names.global` to see more results. scratch/app1> names x Term Hash: #nsmc4p1ra4 Names: lib.http_v3.x lib.http_v4.x - - Tip: Use `names.global` to see more results. ``` Our `app2` project includes the `http` library twice as direct dependencies, and once as an indirect dependency via `webutil`. @@ -102,15 +98,11 @@ scratch/app2> names a Term Hash: #gjmq673r1v Names: lib.webutil.lib.text_v1.a - - Tip: Use `names.global` to see more results. scratch/app2> names x Term Hash: #nsmc4p1ra4 Names: lib.http_v1.x lib.http_v2.x - - Tip: Use `names.global` to see more results. ``` diff --git a/unison-src/transcripts/empty-namespaces.output.md b/unison-src/transcripts/empty-namespaces.output.md index 1b598b6dd..b1b647ecd 100644 --- a/unison-src/transcripts/empty-namespaces.output.md +++ b/unison-src/transcripts/empty-namespaces.output.md @@ -25,7 +25,7 @@ scratch/main> find.verbose No results. Check your spelling, or try using tab completion to supply command arguments. - `find.global` can be used to search outside the current + `debug.find.global` can be used to search outside the current namespace. ``` @@ -42,7 +42,7 @@ scratch/main> find mynamespace No results. Check your spelling, or try using tab completion to supply command arguments. - `find.global` can be used to search outside the current + `debug.find.global` can be used to search outside the current namespace. ``` diff --git a/unison-src/transcripts/find-command.output.md b/unison-src/transcripts/find-command.output.md index 7abbe26f0..fde54abfd 100644 --- a/unison-src/transcripts/find-command.output.md +++ b/unison-src/transcripts/find-command.output.md @@ -86,17 +86,14 @@ scratch/main> find baz No results. Check your spelling, or try using tab completion to supply command arguments. - `find.global` can be used to search outside the current + `debug.find.global` can be used to search outside the current namespace. ``` ``` ucm scratch/main> find.global notHere - 😶 - - No results. Check your spelling, or try using tab completion - to supply command arguments. - +⚠️ +I don't know how to find.global. Type `help` or `?` to get help. ``` diff --git a/unison-src/transcripts/help.output.md b/unison-src/transcripts/help.output.md index 248fb6b4f..13f3c6382 100644 --- a/unison-src/transcripts/help.output.md +++ b/unison-src/transcripts/help.output.md @@ -113,6 +113,50 @@ scratch/main> help debug.file View details about the most recent successfully typechecked file. + debug.find.global + `find` lists all definitions in the + current namespace. + `find foo` lists all definitions with a + name similar to 'foo' in the + current namespace (excluding + those under 'lib'). + `find foo bar` lists all definitions with a + name similar to 'foo' or + 'bar' in the current + namespace (excluding those + under 'lib'). + `find-in namespace` lists all definitions in the + specified subnamespace. + `find-in namespace foo bar` lists all definitions with a + name similar to 'foo' or + 'bar' in the specified + subnamespace. + find.all foo lists all definitions with a + name similar to 'foo' in the + current namespace (including + one level of 'lib'). + `find-in.all namespace` lists all definitions in the + specified subnamespace + (including one level of its + 'lib'). + `find-in.all namespace foo bar` lists all definitions with a + name similar to 'foo' or + 'bar' in the specified + subnamespace (including one + level of its 'lib'). + debug.find.global foo Iteratively searches all + projects and branches and + lists all definitions with a + name similar to 'foo'. Note + that this is a very slow + operation. + + debug.names.global + `debug.names.global foo` Iteratively search across all + projects and branches for names matching `foo`. Note that this + is expected to be quite slow and is primarily for debugging + issues with your codebase. + debug.numberedArgs Dump the contents of the numbered args state. @@ -269,9 +313,12 @@ scratch/main> help 'bar' in the specified subnamespace (including one level of its 'lib'). - find.global foo lists all definitions with a - name similar to 'foo' in any - namespace + debug.find.global foo Iteratively searches all + projects and branches and + lists all definitions with a + name similar to 'foo'. Note + that this is a very slow + operation. find-in `find` lists all definitions in the @@ -304,9 +351,12 @@ scratch/main> help 'bar' in the specified subnamespace (including one level of its 'lib'). - find.global foo lists all definitions with a - name similar to 'foo' in any - namespace + debug.find.global foo Iteratively searches all + projects and branches and + lists all definitions with a + name similar to 'foo'. Note + that this is a very slow + operation. find-in.all `find` lists all definitions in the @@ -339,9 +389,12 @@ scratch/main> help 'bar' in the specified subnamespace (including one level of its 'lib'). - find.global foo lists all definitions with a - name similar to 'foo' in any - namespace + debug.find.global foo Iteratively searches all + projects and branches and + lists all definitions with a + name similar to 'foo'. Note + that this is a very slow + operation. find.all `find` lists all definitions in the @@ -374,48 +427,16 @@ scratch/main> help 'bar' in the specified subnamespace (including one level of its 'lib'). - find.global foo lists all definitions with a - name similar to 'foo' in any - namespace + debug.find.global foo Iteratively searches all + projects and branches and + lists all definitions with a + name similar to 'foo'. Note + that this is a very slow + operation. find.all.verbose `find.all.verbose` searches for definitions like `find.all`, but includes hashes and aliases in the results. - find.global - `find` lists all definitions in the - current namespace. - `find foo` lists all definitions with a - name similar to 'foo' in the - current namespace (excluding - those under 'lib'). - `find foo bar` lists all definitions with a - name similar to 'foo' or - 'bar' in the current - namespace (excluding those - under 'lib'). - `find-in namespace` lists all definitions in the - specified subnamespace. - `find-in namespace foo bar` lists all definitions with a - name similar to 'foo' or - 'bar' in the specified - subnamespace. - find.all foo lists all definitions with a - name similar to 'foo' in the - current namespace (including - one level of 'lib'). - `find-in.all namespace` lists all definitions in the - specified subnamespace - (including one level of its - 'lib'). - `find-in.all namespace foo bar` lists all definitions with a - name similar to 'foo' or - 'bar' in the specified - subnamespace (including one - level of its 'lib'). - find.global foo lists all definitions with a - name similar to 'foo' in any - namespace - find.verbose `find.verbose` searches for definitions like `find`, but includes hashes and aliases in the results. @@ -526,11 +547,8 @@ scratch/main> help `move.type foo bar` renames `foo` to `bar`. names - `names foo` shows the hash and all known names for `foo`. - - names.global - `names.global foo` shows the hash and all known names for - `foo`. + `names foo` List all known names for `foo` in the current + branch. namespace.dependencies List the external dependencies of the specified namespace. diff --git a/unison-src/transcripts/merge.output.md b/unison-src/transcripts/merge.output.md index 77350b113..7675b0f74 100644 --- a/unison-src/transcripts/merge.output.md +++ b/unison-src/transcripts/merge.output.md @@ -1435,8 +1435,6 @@ project/alice> names A Type Hash: #65mdg7015r Names: A A.inner.X - - Tip: Use `names.global` to see more results. ``` Bob's branch: diff --git a/unison-src/transcripts/names.output.md b/unison-src/transcripts/names.output.md index 27b986afb..78d1f5c9f 100644 --- a/unison-src/transcripts/names.output.md +++ b/unison-src/transcripts/names.output.md @@ -59,8 +59,6 @@ scratch/main> names x Hash: #pi25gcdv0o Names: some.otherplace.x - - Tip: Use `names.global` to see more results. -- We can search by hash, and see all aliases of that hash scratch/main> names #gjmq673r1v @@ -68,8 +66,6 @@ scratch/main> names #gjmq673r1v Term Hash: #gjmq673r1v Names: some.otherplace.y some.place.x somewhere.z - - Tip: Use `names.global` to see more results. -- Works with absolute names too scratch/main> names .some.place.x @@ -77,8 +73,6 @@ scratch/main> names .some.place.x Term Hash: #gjmq673r1v Names: some.otherplace.y some.place.x somewhere.z - - Tip: Use `names.global` to see more results. ``` `names.global` searches from the root, and absolutely qualifies results diff --git a/unison-src/transcripts/suffixes.output.md b/unison-src/transcripts/suffixes.output.md index 43aa678ef..a4cd5e3b0 100644 --- a/unison-src/transcripts/suffixes.output.md +++ b/unison-src/transcripts/suffixes.output.md @@ -165,8 +165,6 @@ scratch/main> names distributed.lib.baz.qux Term Hash: #nhup096n2s Names: lib.distributed.lib.baz.qux - - Tip: Use `names.global` to see more results. ``` ## Corner cases diff --git a/unison-src/transcripts/unique-type-churn.output.md b/unison-src/transcripts/unique-type-churn.output.md index ea0058643..661b0b65d 100644 --- a/unison-src/transcripts/unique-type-churn.output.md +++ b/unison-src/transcripts/unique-type-churn.output.md @@ -60,8 +60,6 @@ scratch/main> names A Term Hash: #uj8oalgadr#0 Names: A.A - - Tip: Use `names.global` to see more results. ``` ``` unison @@ -99,8 +97,6 @@ scratch/main> names A Term Hash: #ufo5tuc7ho#0 Names: A.A - - Tip: Use `names.global` to see more results. ``` ``` unison @@ -140,7 +136,5 @@ scratch/main> names A Term Hash: #uj8oalgadr#0 Names: A.A - - Tip: Use `names.global` to see more results. ``` diff --git a/unison-src/transcripts/update-ignores-lib-namespace.output.md b/unison-src/transcripts/update-ignores-lib-namespace.output.md index dc03596d0..a91ca2784 100644 --- a/unison-src/transcripts/update-ignores-lib-namespace.output.md +++ b/unison-src/transcripts/update-ignores-lib-namespace.output.md @@ -62,7 +62,5 @@ scratch/main> names foo Term Hash: #9ntnotdp87 Names: foo - - Tip: Use `names.global` to see more results. ```