Commit Graph

2965 Commits

Author SHA1 Message Date
Paul Chiusano
58818242a3 reduce scope of PR to just !foo vs foo(), refresh transcripts 2024-06-21 09:41:32 -05:00
Paul Chiusano
ff05361e40 update transcripts 2024-06-21 08:48:08 -05:00
Greg Pfeil
6f26a16401
Add quoteCode for printing errors
This both colorizes and wraps code in backticks, in order to separate it from surrounding context.
2024-06-20 21:40:07 -04:00
Paul Chiusano
72a05780a0 add round trip test case 2024-06-20 17:18:04 -05:00
Paul Chiusano
d4a2ed9066 Switch to foo() with no space as preferred syntax instead of !foo 2024-06-20 16:52:57 -05:00
Greg Pfeil
f4f55b9b45
Support branch-relative paths for docs.to-html
Fixes #4402.
2024-06-20 17:30:06 -04:00
Mitchell Rosen
9e7a937669 add todo.md transcript 2024-06-20 16:19:55 -04:00
Mitchell Rosen
5353a4e64c properly handle deleted constructors in merge 2024-06-20 14:31:40 -04:00
Greg Pfeil
bb4f39fb2f
Update error message in transcripts 2024-06-20 13:56:19 -04:00
Mitchell Rosen
1081a9835a ⅄ trunk → 24-06-13-revamp-todo 2024-06-18 13:20:20 -04:00
Chris Penner
6d8605e70b Merge trunk
Propagate fixes from earlier merge
2024-06-14 15:41:50 -07:00
Arya Irani
2e38bf860d
Merge pull request #4986 from unisonweb/24-05-20-merge-commit 2024-06-13 14:53:57 -04:00
Mitchell Rosen
6e04dbd083 gut existing todo implementation 2024-06-13 10:29:42 -04:00
Mitchell Rosen
84273a556f revert tweak to merge failure output 2024-06-13 08:36:03 -04:00
Mitchell Rosen
e903a1c155 add merge.commit failure test 2024-06-13 08:29:02 -04:00
Chris Penner
2863b668fa Convert transcript parser to be project based 2024-06-12 10:08:49 -07:00
Chris Penner
815c1b1f1c
Auto-create project-branches referenced in transcript prompts (#5077) 2024-06-12 09:28:12 -04:00
Greg Pfeil
532236bbc0
Merge remote-tracking branch 'upstream/trunk' into better-CLI-error-messages 2024-06-11 16:14:24 -04:00
Greg Pfeil
9691a80ed7
Improve CLI shared error message
This rephrases part of it and includes instructions to run the `help`
command (rather than including the `help` output directly). In future,
we may directly include shorter `help` outputs or a separate set of
examples. But for now the `help` output may overshadow the error message
we intend to show the user.
2024-06-11 16:09:05 -04:00
Mitchell Rosen
2e97d46db3 ⅄ trunk → 24-05-20-merge-commit 2024-06-11 14:15:30 -04:00
Chris Penner
91527b6008 Merge trunk 2024-06-11 11:10:47 -07:00
Arya Irani
335512e331
fix conflicted alias message 2 (#5071)
Co-authored-by: aryairani <aryairani@users.noreply.github.com>
2024-06-11 09:40:43 -04:00
Arya Irani
a45fc88fb1
Update merge precondition message: Conflicted aliases (#5070) 2024-06-10 20:42:01 -04:00
Arya Irani
433be000b2
Merge pull request #5068 from unisonweb/24-05-30-edit-namespace-no-record-accessors 2024-06-10 16:22:35 -04:00
Mitchell Rosen
72bdd9185f amend edit.namespace transcript 2024-06-10 15:49:02 -04:00
Mitchell Rosen
e3440a91c6 don't consider update+delete a conflicted alias 2024-06-10 13:57:22 -04:00
Mitchell Rosen
528c2a1cd6 commit failing transcript 2024-06-10 13:56:12 -04:00
Chris Penner
bcc39d879d Remerge trunk 2024-06-10 10:24:37 -07:00
Greg Pfeil
e32138c215
Treat Name as Path' in InputPattern handlers
This fixes an issue where `ls` results couldn’t be used as numbered args by commands which expected a `Path`.
2024-06-07 00:40:16 -05:00
Greg Pfeil
24ff8b5cb0
Show that you can’t ls the results of ls 2024-06-07 00:17:44 -05:00
Greg Pfeil
ce33057385
Refine Path-prefixing operations
This replaces `prefix :: Absolute -> Path' -> Path` with a couple
alternatives:
- `prefixAbs :: Absolute -> Relative -> Absolute`,
- `maybePrefix :: Path' -> Path' -> Maybe Path'`, and
- `prefix :: Path' -> Relative -> Path'`.

The previous `prefix` could fail to prefix (covered by either the new
`prefix` or `maybePrefix`, depending on whether you want to guarantee
success or capture failure), always threw away the knowledge that the
result was necessarily `Absolute` (covered by `prefixAbs`), and then
always returned an ambiguous result type (covered by all three
replacements).

Then it also provides `prefixRel` as the complement of `prefixAbs` (both
of which are used in the implementation of `prefix`).

Similar changes are made in the replacements for `prefixName :: Absolute
-> Name -> Name`. First, we don’t currently have absolute/relative
variants of `Name`, so we can generalize the first argument to `Path'`.
Then `maybePrefixName :: Path' -> Name -> Maybe Name` exposes the case
where prefixing can’t succeed, and `prefixNameIfRel :: Path' -> Name ->
Name` handles the common case of using the original `Name` if it can’t
be prefixed. Both of these new functions also preserve the `Position` of
the new `Name`, whereas the old implementation always returned a
`Relative` `Name`, despite knowing when it was `Absolute`. And
`prefixName2 :: Path -> Name -> Name` has been removed as there is no
ambiguous variant of `Name` (as `Split` is to `Split'`), so prefixing
with a `Path` isn’t particularly meaningful.

Finally, `nameFromSplit'` is added as a dual to `splitFromName'` to make
it possible to operate on the `Path'` portion of a `Name` without introducing partiality.

These new operations are then propagated through the code, and enable a
couple other type changes: `StructuredArgument.ShallowListEntry` and
`StructuredArgument.SearchResult` now take a `Path'` prefix rather than
the `Path.Absolute` and `Path` prefixes they took previously. This fixes
the absolute `Name` issue in `ls` results.
2024-06-06 23:53:00 -05:00
Greg Pfeil
3c197c51c8
Use a project in fix5055 transcript
This makes the absolute path problem more obvious.
2024-06-06 23:26:13 -05:00
Chris Penner
87bd96963e Inline nosync versions into their regular forms so people aren't tempted to use them. 2024-06-05 15:31:15 -07:00
Greg Pfeil
cf6ab11088
Ensure Names are absolute after prefixing
In a separate part of the change this PR was extracted from,
`Path.prefixName` ensures the result is absolute, but that is more
involved than other changes here, so this uses the previous technique of
calling `Name.makeAbsolute` afterward.

I don’t think this changes anything important, but the `Name` _is_
always absolute after `Path.prefixName`, so this just ensures that it’s
tracked.
2024-06-05 11:18:29 -06:00
Greg Pfeil
4c12fe8a47
Make the transcript for #5055 more stable 2024-06-05 11:07:55 -06:00
Greg Pfeil
8ef107817d
Support ShallowListEntry in InputPattern handlers
These are produced by `ls`, but weren’t included in the handlers, so the
results of `ls` weren’t usable as numbered args.

Fixes #5055.
2024-06-05 10:58:54 -06:00
Greg Pfeil
529ae7f174
Add a failing transcript for #5055 2024-06-05 10:51:35 -06:00
Greg Pfeil
565da6d4a0
Include help output on all CLI command failures
```ucm
@unison/base/main> lib.install blah.blah.blah

  Sorry, I couldn’t understand your request. I expected a project or
  branch, but saw ”blah.blah.blah”.

  Usage:
  The `lib.install` command installs a dependency into the `lib` namespace.

  `lib.install @unison/base/releases/latest`  installs the latest release of `@unison/base`
  `lib.install @unison/base/releases/3.0.0`   installs version 3.0.0 of `@unison/base`
  `lib.install @unison/base/topic`            installs the `topic` branch of `@unison/base`
```
2024-06-04 20:02:56 -06:00
Arya Irani
2540774b2f
Merge pull request #5042 from sellout/numbered-args-delete.namespace 2024-06-04 11:11:41 -04:00
Arya Irani
7efaaef80e was aiming for the implied project/branch name, but dunno how 2024-06-04 10:33:58 -04:00
Arya Irani
78dae4ff07
Merge pull request #5039 from unisonweb/24-05-20-upgrade-commit 2024-06-03 19:35:15 -04:00
Mitchell Rosen
6f1c56c131 tweak messages 2024-06-03 13:57:45 -04:00
Greg Pfeil
811c9e70bb
Clean up the transcript and see that it passes
The issue had already been fixed at some point.

Closes #1532.
2024-06-03 11:56:33 -06:00
Greg Pfeil
2bf53bc3ae
Add transcript from issue #1532
Unfortunately, the linked transcript doesn’t contain text, AFAICT. So
this copies over the issue text, but that is also missing some
information.
2024-06-03 11:43:21 -06:00
Mitchell Rosen
8b98add0aa fix typo 2024-06-03 10:09:26 -04:00
Mitchell Rosen
0635baa784 improve upgrade failure message 2024-06-03 09:45:21 -04:00
Mitchell Rosen
a1ecf83078 ⅄ trunk → 24-05-20-merge-commit 2024-06-03 08:51:53 -04:00
Mitchell Rosen
99b2eaba69 ⅄ trunk → 24-05-31-merge-precondition-messages 2024-05-31 14:38:35 -04:00
Mitchell Rosen
899be60f5a improve merge precondition violation output messages 2024-05-31 14:34:47 -04:00
Mitchell Rosen
83d6946c60 ⅄ trunk → 24-05-20-upgrade-commit 2024-05-30 14:47:10 -04:00
Arya Irani
0f597f1d9d
Merge pull request #5019 from sellout/delete-dependents 2024-05-29 20:47:06 -04:00
Greg Pfeil
78816fdc3a
Remove Reference from StructuredArgument
Almost everywhere we produce a `Reference` for numbered args, we also have a
`HashQualified Name` handy, which is much more consumable by commands.

The only case we don’t have an `HQ` is in the `todo` command output, so that now explicitly builds
a `HQ.HashOnly`.

This also fixes an issue with `StructuredArgument` handling where `alias.term`
and `alias.type` wouldn’t make an alias to a `HQ.HashOnly` `StructuredArgument`.

Fixes #4898.
2024-05-29 17:11:05 -06:00
Greg Pfeil
8b46f81084
Replicate failure from #4898 2024-05-29 17:11:05 -06:00
Greg Pfeil
b985bb1728
Change docs command to expect Name
Previously, when given a numbered arg, from some commands (e.g., `find`), it
would fail to find the docs because the hash associated with the definition was
applied to the `doc`, which then would be incorrect.

This now discards hashes up-front, so it can add the `doc` suffix to the name.

Fixes #3939.
2024-05-29 17:10:26 -06:00
Greg Pfeil
7d7047967a
Add a transcript to replicate #3939 2024-05-29 17:10:25 -06:00
Mitchell Rosen
32cde2cd35 relax merge preconditions on lca 2024-05-29 12:41:59 -04:00
Mitchell Rosen
1442dc02ac fix up a couple transcripts 2024-05-24 11:08:44 -04:00
Mitchell Rosen
6adb88f5b3 delete a bunch of patch manipulation commands 2024-05-24 11:01:45 -04:00
Mitchell Rosen
510e9dc6bb don't update in upgrade 2024-05-23 08:26:52 -04:00
Arya Irani
d20d30d475
update workflows for lib.install 2024-05-22 18:34:08 -04:00
Chris Penner
c9e6702c8e Fix transcripts which use absolute paths with delete.namespace 2024-05-22 11:56:50 -07:00
Chris Penner
f25a221c25 Don't allow absolute paths in delete.namespace 2024-05-22 11:51:10 -07:00
Chris Penner
b210679917 Add failing transcript 2024-05-22 11:35:51 -07:00
Mitchell Rosen
ce9110be46 Add merge.commit command 2024-05-20 14:21:06 -04:00
Mitchell Rosen
7273bd9a3a in merge, don't returnEarly on success 2024-05-20 14:13:04 -04:00
Mitchell Rosen
4479966f8d make upgrade.commit perform the initial update 2024-05-20 13:04:31 -04:00
Mitchell Rosen
75795e61e4 implement upgrade.commit command 2024-05-20 12:09:00 -04:00
Arya Irani
2ec8e01dd7
Merge pull request #4966 from unisonweb/topic/merge5 2024-05-20 10:48:43 -04:00
Mitchell Rosen
dbe4892437 ⅄ topic/merge5 → 24-05-20-upgrade-commit 2024-05-20 10:45:41 -04:00
Arya Irani
1be90b1414 transcript output merge conflict 2024-05-18 23:42:51 -04:00
Arya Irani
8b762c7908
Merge branch 'trunk' into cp/definition-diffs 2024-05-18 10:31:26 -04:00
Chris Penner
4000a892e2 Transcripts 2024-05-17 19:08:11 -07:00
Mitchell Rosen
bc54e4d0b4 make pull call new merge instead of old merge 2024-05-17 13:49:13 -04:00
Chris Penner
240cddcc3f Add definition diff apis and tests 2024-05-17 09:43:19 -07:00
Mitchell Rosen
b9a45d5f86 ⅄ trunk → topic/merge5 2024-05-16 11:55:27 -04:00
Mitchell Rosen
693af9c809 ⅄ trunk → topic/merge4 2024-05-15 12:03:16 -04:00
Arya Irani
a4a1dcfd8d
Merge pull request #4948 from unisonweb/fix/more-jit-misc
A couple more miscellaneous JIT issues
2024-05-14 18:21:02 -04:00
Dan Doel
7569e85bed Bump @unison/internal dependency 2024-05-14 17:33:23 -04:00
Mitchell Rosen
3e224bd668 add test <arg> example to transcript 2024-05-14 16:54:53 -04:00
Mitchell Rosen
06b743a149 slightly better error messages 2024-05-14 11:30:40 -04:00
Mitchell Rosen
f80b07db81 regenerate merge.md output 2024-05-14 09:30:23 -04:00
Mitchell Rosen
09ee97b149 update tab completion transcript 2024-05-13 11:34:01 -04:00
Mitchell Rosen
e18bbd40f9 ⅄ trunk → topic/merge4 2024-05-13 10:36:03 -04:00
etorreborre
f8063ec42b
test: add an example of checking a RSA signature with an incorrect key 2024-05-12 17:56:04 +02:00
etorreborre
01bb42bbd3
feature: add RSA builtin functions for signing 2024-05-11 00:05:38 +02:00
Arya Irani
4ce7cdf5d4
Merge pull request #4844 from unisonweb/kylegoetz-udp
Kylegoetz udp
2024-05-10 13:03:50 -04:00
Arya Irani
69371698d0 update transcripts 2024-05-10 12:18:17 -04:00
Arya Irani
4da7930d11
unmodify jit-tests.sh 2024-05-10 12:03:34 -04:00
Arya Irani
9da0a4f43c Merge remote-tracking branch 'origin/trunk' into kylegoetz-udp 2024-05-10 11:23:38 -04:00
Arya Irani
4c9deb169c update transcript outputs 2024-05-10 11:22:57 -04:00
Arya Irani
b015f72133 Some edits to precondition violations section 2024-05-07 17:00:30 -04:00
Arya Irani
b70cad9869 fixup "not-conflict conflict" 2024-05-07 16:36:57 -04:00
Arya Irani
0144c69e49 simplify merge transcript 2024-05-07 13:51:11 -04:00
Mitchell Rosen
25e7288de2 properly set successful merge history, call out when a merge is fast-forward 2024-05-07 11:51:57 -04:00
Mitchell Rosen
90cc2b5bd9 update transcripts 2024-05-07 09:59:51 -04:00
Dan Doel
f6442c928e Merge remote-tracking branch 'origin/trunk' into topic/jit-long-names 2024-05-06 16:56:34 -04:00
Dan Doel
a1ef6a76d1 Use full length hashes for jit names
This should avoid any possibility of picking conflicting names for
distinct functions. I'm not aware of any actual examples of this, but it
could in principle happen.

I decided to use the full length hashes because picking just-long-enough
names starts to become very cumbersome when doing dynamic loading. You
need to keep track of all your past choices, not just the choices for
the module you're loading, because the one you're loading could refer to
things in previously loaded modules. It would be possible to use shorter
names in a compile-time context, since you have all the names up front.
But you'd still have to remember _those_ for runtime loading, and it
seemed not worth it.

This doesn't include any custom error formatting, because I'd like to
see error messages in the wild before doing anything, but if they're too
verbose, it's possible to override the Racket error reporting to produce
shorter names there, rather than generating them up front.
2024-05-06 14:59:06 -04:00
Mitchell Rosen
d7b48dcb5c minor cleanup 2024-05-06 13:03:41 -04:00
Kyle Goetz
e2aa974b80 use my branch on Share for testing 2024-05-06 00:07:12 -05:00
Dan Doel
043a202b63 Add test. Fix a corresponding EROR mismatch in boot.ss 2024-05-03 15:49:43 -04:00
Mitchell Rosen
0d155e99eb better error messages for merge precondition violations 2024-05-02 16:28:30 -04:00
Mitchell Rosen
831005eaf3 ⅄ trunk → topic/merge4 2024-05-01 13:26:43 -04:00
Mitchell Rosen
0babe4df90 update transcripts 2024-05-01 13:18:46 -04:00
Mitchell Rosen
0d0e6c2600 add merge libdeps transcript 2024-05-01 12:06:59 -04:00
Mitchell Rosen
a66e893352 add add/add unique type merge transcript 2024-05-01 12:00:46 -04:00
Mitchell Rosen
023cfd4690 add a couple merge transcripts 2024-05-01 11:56:27 -04:00
Kyle Goetz
7b2e520baa temp JIT test script 2024-05-01 00:15:08 -05:00
Mitchell Rosen
b319c592dd render things with the right PPEs 2024-04-30 14:47:39 -04:00
Kyle Goetz
0bc69c31a8 Merge remote-tracking branch 'origin/trunk' into kylegoetz-udp 2024-04-30 12:55:18 -05:00
Mitchell Rosen
b739c27f73 work on properly rendering merged Unison file 2024-04-29 18:52:34 -04:00
Arya Irani
ad09964825
Merge pull request #4886 from unisonweb/builtins.merge-in
add an optional destination path to `builtins.merge{,io}`
2024-04-29 01:20:09 -04:00
Arya Irani
16596c4566 add an optional destination path to builtins.merge{,io} 2024-04-28 23:01:02 -04:00
Arya Irani
d0bdd55ace Merge branch 'trunk' into transcripts-cleanup 2024-04-28 22:34:49 -04:00
Arya Irani
2cf96a36ae
deprecate cd, up; add find-in (#4883)
* deprecate `cd`, `up`, hide `reset-root`, add `find-in`, hides unimplemented `update.builtins`
Co-authored-by: Chris Penner <christopher.penner@gmail.com>
2024-04-28 21:30:02 -04:00
Mitchell Rosen
97faed97c1 add merged libdeps to ppe for rendering unison file 2024-04-24 15:31:40 -04:00
Mitchell Rosen
2e9e5cf17c rename merge2 to merge 2024-04-24 12:31:54 -04:00
Mitchell Rosen
d37bce3e7e rename and hide old merge commands 2024-04-24 12:29:15 -04:00
Mitchell Rosen
240f00dd64 delete old merge transcript 2024-04-24 11:49:03 -04:00
Mitchell Rosen
5e563ebf93 add more merge transcripts 2024-04-24 11:33:39 -04:00
Mitchell Rosen
9253dc9fa1 ⅄ trunk → topic/merge4 2024-04-23 13:10:35 -04:00
Mitchell Rosen
57011a9b62 tweak ppe to fix bug 2024-04-23 12:47:28 -04:00
Dan Doel
5564317903 Transcript updates
Modify watch-expressions transcript to use new array predefs
2024-04-19 10:32:30 -04:00
Mitchell Rosen
4e42d38385 split apart combine and partition diffs steps 2024-04-17 20:46:39 -04:00
Mitchell Rosen
6a847aedae ⅄ trunk → topic/merge4 2024-04-17 19:25:03 -04:00
Mitchell Rosen
0299f38946 don't expect constructors of builtin types 2024-04-17 18:24:28 -04:00
Arya Irani
ac4d817f5e
Merge pull request #4887 from unisonweb/topic/jit-eval-side-channel
Use a socket to communicate with the jit runtime process
2024-04-17 16:06:06 -04:00
Dan Doel
da74c38f0e Test for partially applied builtins 2024-04-16 15:23:21 -04:00
Dan Doel
12ec621d23 Add back padding when errors/traces actually occur 2024-04-16 14:26:28 -04:00
Dan Doel
9f2089798f Transcript output updates for error formatting 2024-04-16 13:52:17 -04:00
Arya Irani
ab75cc89cf don't need builtins.mergeio when using base 2024-04-14 20:20:36 -04:00
Arya Irani
b052524f52 didn't use base 2024-04-14 20:20:04 -04:00
Arya Irani
5a7e3b4932 cleanup 2024-04-14 20:01:39 -04:00
Arya Irani
a987756b41 unnecessary builtins.mergeio 2024-04-14 19:57:08 -04:00
Arya Irani
ec8ae539c3 deprecate cd, up, reset-root, add find-in
also hides unimplemented `update.builtins`

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

similarly, in `todo.md` it shifted the hashes for the same reason
2024-04-14 16:35:11 -04:00
Dan Doel
ce8dfd2a73 Bump jit share dependency to 0.0.15 2024-04-10 18:18:50 -04:00
Mitchell Rosen
589970313d ⅄ trunk → topic/merge4 2024-04-08 10:03:38 -04:00
Arya Irani
eef5dda29c Merge remote-tracking branch 'origin/trunk' into kylegoetz-udp
# Conflicts:
#	unison-core/src/Unison/Type.hs
2024-04-06 10:45:10 -06:00
Arya Irani
41046d599a
Merge pull request #4864 from unisonweb/fix/jit-cloud-tests
Some jit fixes for cloud tests
2024-04-05 16:36:18 -06:00
Arya Irani
19be0a5efd Merge remote-tracking branch 'origin/trunk' into kylegoetz-udp
# Conflicts:
#	unison-cli/unison-cli.cabal
#	unison-src/builtin-tests/interpreter-tests.md
#	unison-src/builtin-tests/testlib.u
#	unison-src/builtin-tests/tests.u
2024-04-05 14:39:07 -06:00
Arya Irani
eb355bfa3e code review ftw 2024-04-05 11:21:29 -06:00
Dan Doel
3cb89e42b3 Exception and debugging related work
Makes various internal values print more nicely, which makes debugging
more tractable. Links now print as base32hex strings like they would in
ucm. Functions inside unison structures print as their hash if possible.
Also, short hashes are printed in most cases, rather than the full hash.

Had to shuffle around some bytevector stuff to make the above work.

Pulled `tryEval` completely into primops, and made it directly do an
exception request, rather than implementing the TFRC pseudo instruction.
This requires a share bump, as does a fix to the `Failure` data info.

Some of the exception/failure related internal functions were wrapping
the last argument in Any when they shouldn't have, causing errors for
code expecting a single wrapper.
2024-04-05 13:00:45 -04:00
Arya Irani
4def6bc310 update instructions in {jit,interpreter}-tests.tpl.md 2024-04-04 15:19:49 -06:00
Arya Irani
3ba74632f2 added threadKilledTypeLinkTest to common tests on Share 2024-04-04 15:19:16 -06:00
Mitchell Rosen
2ff7d77820 ⅄ trunk → topic/merge4 2024-04-04 14:40:54 -04:00
Arya Irani
8f9237251f update readmes 2024-04-04 11:44:12 -06:00
Arya Irani
6d3746e8bb jit-tests.sh to accept a "ucm" arg 2024-04-04 11:34:34 -06:00
Arya Irani
4289192d36 delete superfluous builtin-tests/*.u files 2024-04-04 01:36:54 -06:00
Arya Irani
f5d187ef84 let jit tests run on jit; among other things 2024-04-04 01:20:26 -06:00
Arya Irani
a571042154
Merge pull request #4849 from unisonweb/fix/jit-time
Fix some inconsistencies in the time functions in the jit
2024-04-04 01:04:14 -06:00
Arya Irani
cac59a7edb try retrieving runtime tests from Share 2024-04-03 15:29:16 -06:00
Arya Irani
b202656454 Merge branch 'kylegoetz-udp' of github.com:unisonweb/unison into kylegoetz-udp
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2024-04-02 10:46:56 -06:00
Kyle Goetz
178fa7d96e Merge branch 'kylegoetz-udp' of https://github.com/unisonweb/unison into kylegoetz-udp 2024-04-02 10:51:08 -05:00
Kyle Goetz
9341656bea fixed UDP tests 2024-04-02 10:50:32 -05:00
Dan Doel
13ded7d15e Fix some inconsistencies in the time functions in the jit
Some racket functions return integers and others floating point, so some
care is needed to make sure they work. This adds a designated internal
unison time rep as well instead of just using the raw value returned by
the racket function.
2024-04-02 11:43:39 -04:00
Arya Irani
0f6246904e fixup testlib and add udp-tests.u to interpreter-tests.md 2024-04-02 01:15:21 -06:00
Arya Irani
1be5cf2d1d Merge branch 'trunk' into kylegoetz-udp
# Conflicts:
#	unison-src/transcripts-using-base/all-base-hashes.output.md
#	unison-src/transcripts/builtins-merge.output.md
#	unison-src/transcripts/emptyCodebase.output.md
#	unison-src/transcripts/merges.output.md
#	unison-src/transcripts/move-all.output.md
#	unison-src/transcripts/move-namespace.output.md
#	unison-src/transcripts/reflog.output.md
#	unison-src/transcripts/reset.output.md
#	unison-src/transcripts/squash.output.md
#	unison-src/transcripts/upgrade-happy-path.output.md
2024-04-02 00:19:42 -06:00
Arya Irani
96a5be9b07 update transcript output 2024-04-02 00:12:34 -06:00
Arya Irani
668c9b0691 disambiguate transcripts 2024-04-02 00:11:34 -06:00
Arya Irani
6ac7a3a6a5 disambiguation 2024-04-01 23:37:52 -06:00
Dan Doel
4f4395fd65 Add a jit test for multiple evaluation from scratch file 2024-04-01 16:12:22 -04:00
Arya Irani
35c4bdd372 Merge branch 'kylegoetz-udp' of github.com:unisonweb/unison into kylegoetz-udp
# Conflicts:
#	parser-typechecker/src/Unison/Builtin.hs
#	parser-typechecker/src/Unison/Runtime/Builtin.hs
2024-03-31 01:17:21 -06:00
Kyle Goetz
3679b0d8c1 move UDP tests to correct spot 2024-03-29 20:57:24 -05:00
Kyle Goetz
f8e80a672f add UDP test 2024-03-29 20:53:45 -05:00
Dan Doel
eaee313440 Split corrected many pattern into two patterns 2024-03-29 12:39:30 -04:00
Dan Doel
8c58de7d62 Add jit link tests file 2024-03-28 19:30:07 -04:00
Dan Doel
bb0ee7d044 Add link equality/comparison tests to jit test suite 2024-03-28 17:41:24 -04:00
Dan Doel
596fb892ac Modify serial-tests to test for cache_ bug 2024-03-22 17:47:37 -04:00
Dan Doel
702318a6e4 A few fixes/tweaks
- Changes the naming convention for builtin types/data to avoid clashes
  between builtins and pregenerated data types. For instance, both had a
  Value type in scheme, because of the in-unison representation. Instead
  of just `unison-`, now either `builtin-` or `ref-` prefixes are used.

- Fixes several places where invalid values were being used in
  exceptions. Raw scheme values were being returned that do not
  correspond to unison values, and this was causing problems with
  reflection.

- Fixes some code loading operations returning in-unison `Reference`
  values instead of term link values. Parts of these are implemented in
  unison, so both types are in play, and need to be correctly mediated.
2024-03-22 13:09:23 -04:00
Mitchell Rosen
5bd507f2b9 ⅄ trunk → topic/merge4 2024-03-22 09:40:07 -04:00
Arya Irani
1e6f0daae9
Merge pull request #4808 from unisonweb/24-03-18-tweak-tdnr-visibility
bugfix: tweak name priority for tdnr
2024-03-20 17:43:19 -06:00
Arya Irani
3fbb7a2c65
Merge pull request #4810 from unisonweb/topic/jit-links
Fix up uses of typelinks in the jit
2024-03-20 17:06:13 -06:00
Dan Doel
9ef24b2b2c Bump depended @unison/internal version 2024-03-20 15:57:46 -04:00
Mitchell Rosen
3799ed5d26 commit transcript output changes 2024-03-19 14:48:27 -04:00
Mitchell Rosen
96e008f153 fix suffix.md transcript 2024-03-19 12:56:03 -04:00
Travis Staton
9f7c2e2653
add "stray constructor" precondition violation example 2024-03-19 11:27:47 -04:00
Travis Staton
06cc4e84e4
Add "nested decl alias" precondition violation example 2024-03-19 11:25:05 -04:00
Travis Staton
9501bf7bec
Add "missing constructor" precondition violation example 2024-03-19 11:15:48 -04:00
Travis Staton
7455187b43
add "constructor alias" precondition violation example 2024-03-19 11:02:30 -04:00
Travis Staton
a08f509aa5
add terms in lib precondition violation example 2024-03-19 10:58:51 -04:00
Travis Staton
15e33f439a
update/update agree example 2024-03-19 10:55:55 -04:00
Travis Staton
16cd17b656
add/add agree example 2024-03-19 10:53:58 -04:00
Travis Staton
bbbac576f8
three delete examples 2024-03-19 10:51:45 -04:00
Travis Staton
2e2fc04bdd
add conflict examples to merge2 transcript 2024-03-19 10:47:07 -04:00
Travis Staton
5cf61d6c51
tweak output message for merge2 2024-03-19 10:35:05 -04:00
Arya Irani
48f5a30854
Merge pull request #4790 from unisonweb/fix/pattern-many
Fix many pattern not backtracking
2024-03-18 21:12:15 -06:00
Travis Staton
9694d8114d
Add basic success and failure messages 2024-03-18 13:54:21 -04:00
Travis Staton
38706cd5e3
add basic transcripts 2024-03-18 13:54:21 -04:00
Dan Doel
64ae273a33 Add test case 2024-03-18 12:01:43 -04:00
Paul Chiusano
8b0b485536 Don't always allow use clauses in do. Only do so if it's top level or contains a block. 2024-03-16 22:18:43 -05:00
Paul Chiusano
109a4de506 Prefer do in pretty-printer 2024-03-16 09:10:48 -05:00
Chris Penner
4ac7bb20cd Improve source excerpt highlighting 2024-03-13 12:14:31 -07:00
Chris Penner
3d95906195 Update transcripts 2024-03-13 11:52:29 -07:00
Travis Staton
01d3e6e297
allow duplicates in unison file 2024-03-11 15:06:13 -04:00
Arya Irani
4a9707beca
Merge pull request #4768 from unisonweb/fix/4722
Push type checking through match statements
2024-03-09 11:31:44 -05:00
Arya Irani
27b29c1ee3
Merge pull request #4675 from unisonweb/topic/native-compiler
Rework racket based runtime/compilation
2024-03-08 17:18:19 -05:00
Dan Doel
e0b178b005 Push type checking through match statements 2024-03-08 15:18:35 -05:00
Arya Irani
e8e610d0a8 do we need base.output.md? 2024-03-08 14:50:42 -05:00
Arya Irani
b7530a56ac remove compile.native.{fetch,genlibs} commands
existing ucm commands can be used instead, i.e. `gen-racket-libs.md`
2024-03-08 13:11:49 -05:00
Arya Irani
d913a61f45
Merge pull request #4752 from unisonweb/runarorama/fixFieldNames
Fix field accessors not showing up in `view` in some cases
2024-03-08 10:09:09 -05:00
Dan Doel
51dbdb7746 Fix a variable capture issue during let floating 2024-03-06 15:29:51 -05:00
Rúnar
826ba2c5ad Add transcript 2024-03-05 14:50:16 -05:00
Dan Doel
aa537848c6 Bump gen-racket-libs version for @unison/internal 2024-03-04 11:52:19 -05:00
Dan Doel
3048be647e Merge remote-tracking branch 'origin/trunk' into topic/native-compiler 2024-03-01 17:19:54 -05:00
Mitchell Rosen
a90c394000 ⅄ trunk → 24-02-26-upgrade-tweak 2024-02-27 12:37:47 -05:00
Mitchell Rosen
8dbec31f40 add new guard in upgrade to not give names to old things in new dep 2024-02-27 12:32:18 -05:00
Mitchell Rosen
4aca271228 add transcript that demonstrates old undesirable behavior 2024-02-27 11:22:38 -05:00
Arya Irani
f66bf086b8 Merge remote-tracking branch 'origin/trunk' into topic/ed25519
# Conflicts:
#	unison-src/transcripts-using-base/all-base-hashes.output.md
2024-02-26 20:18:46 -05:00
Mitchell Rosen
581e2e105a add transcript 2024-02-26 16:35:24 -05:00
Mitchell Rosen
179e131e94 add transcript 2024-02-26 10:01:48 -05:00
Dan Doel
a320820bc3 Transcript updates 2024-02-23 18:03:04 -05:00
Dan Doel
b3c4f9d87f Implement ed25519 builtins for Haskell 2024-02-23 18:02:24 -05:00
Mitchell Rosen
c61484112c make deleteReplacements transcript work 2024-02-22 14:53:17 -05:00
Mitchell Rosen
5330261d0c regenerate serial-test-00 output 2024-02-22 14:52:09 -05:00
Mitchell Rosen
19070ce126 regenerate all-base-hashes output 2024-02-22 14:50:59 -05:00
Mitchell Rosen
d34522e6a4 allow () escaped in backticks 2024-02-22 14:12:03 -05:00
Mitchell Rosen
e31aba4620 fix tab completion 2024-02-22 13:18:26 -05:00
Mitchell Rosen
12a75f18b3 partially fix tab-completion 2024-02-22 10:55:13 -05:00
Mitchell Rosen
ed881583e7 fix a few things, but oops completion is broken somehow 2024-02-21 15:16:00 -05:00
Mitchell Rosen
fd74c51100 commit transcript diff that fixes forall display bug 2024-02-20 13:17:55 -05:00
Mitchell Rosen
aa2107982f ⅄ trunk → 22-10-18-backticky-parser 2024-02-20 11:10:58 -05:00
Arya Irani
3cc86fac62 all the mergeio types we rely on should be in base I suppose? 2024-02-15 17:11:27 -05:00
Arya Irani
b668fe3b96 jit tests reply on some types not in base
at least ThreadKilledFailure, from https://github.com/unisonweb/unison/pull/3835
2024-02-15 16:53:04 -05:00
Arya Irani
f56fb23f46 don't fetch internal 2024-02-14 08:15:14 -05:00
Arya Irani
25d703a203 Merge branch 'trunk' into topic/native-compiler
# Conflicts:
#	unison-cli/unison/ArgParse.hs
#	unison-cli/unison/Main.hs
2024-02-13 15:28:00 -05:00
Chris Penner
72727afc46 Update end-of block symboly test 2024-02-12 10:50:41 -08:00
Chris Penner
b00acbe182 Add parens to annotation of lexed symboly segments 2024-02-12 10:46:38 -08:00
Arya Irani
b3cad2ce2a refactor ci.yaml with jit setup steps (attempt 1)
recommend moving support scheme files to another repo
if they aren't deeply related to ucm; but maybe they are.
2024-02-11 21:02:04 -05:00
Dan Doel
5f946e202e Merge remote-tracking branch 'origin/trunk' into topic/native-compiler 2024-02-07 16:43:47 -05:00
Chris Penner
a0f5ce9e52 Add tab-completion and fzf for upgrade command 2024-02-07 13:37:32 -08:00
Dan Doel
a678f55e10 Actually make run.native use the standalone runner
All the infrastructure was there already, just needed to enable it.

This should break the jit tests in CI until we can get the runner
building as a prior step, and coordinate the location the native runtime
looks for the build files.
2024-02-07 16:10:33 -05:00
Dan Doel
7ce4ad224d Add information on further building to gen-racket-libs.md 2024-02-07 12:00:42 -05:00
Dan Doel
2e98e1a7c2 Add a transcript to create generated racket libs 2024-02-06 14:04:43 -05:00
Arya Irani
cf202fef9a
Merge pull request #4674 from unisonweb/cp/lsp-folding 2024-02-06 12:59:21 -05:00
Arya Irani
4f345fedda
Merge pull request #4671 from unisonweb/cp/format-handlers
Fix formatting on handle-with blocks
2024-02-05 22:13:57 -05:00
Chris Penner
4da9d12ef1 Fix span annotations on handle-with blocks 2024-02-05 10:45:03 -08:00
Chris Penner
be330a8d99 Allow multi-line bold, italics, and strikethru 2024-02-05 10:17:32 -08:00
Mitchell Rosen
cf15f30261 ⅄ trunk → 22-10-18-backticky-parser 2024-02-02 10:00:38 -05:00
Travis Staton
4af93e9ec0
Fix update bug #4618
It is not safe to assume everything in the TUF is in namespace -
libdeps, it also contains new terms/decls. So, looking up the
constructors of a type may now return Nothing, in which case we know
that the decl is new and no deleteConstructorActions need to be generated.
2024-02-01 15:40:32 -05:00
Travis Staton
df2a53a97f
Add transcript demonstrating #4618
This transcript throws an exception, so no output can be committed.
2024-02-01 15:40:31 -05:00
Mitchell Rosen
96ca5c71ce ⅄ trunk → 22-10-18-backticky-parser 2024-02-01 13:54:11 -05:00
Arya Irani
9a058a381e
Merge pull request #4659 from unisonweb/cp/inline-literal-escaping
Default to single-quotes
2024-02-01 07:49:15 -05:00
Chris Penner
c083434457 Add folding range tests 2024-01-31 18:05:13 -08:00
Chris Penner
9b261b831f Transcript output 2024-01-31 16:30:41 -08:00
mergify[bot]
70bedd668a
Merge pull request #4653 from unisonweb/cp/debug-term
Add `debug.term` `debug.type` for debugging
2024-02-01 00:26:43 +00:00
Chris Penner
61a0542183 Default to single-quotes 2024-01-31 16:19:14 -08:00
Chris Penner
db15634fde Rename to debug.term|type.abt 2024-01-31 16:04:20 -08:00
Arya Irani
9e4bc32b94
Merge pull request #4655 from unisonweb/cp/text-codeblock-fix
Fix raw text-block indentation
2024-01-31 18:02:55 -05:00
Chris Penner
1f67d095f2 Add regression test for empty-lines in raw literals 2024-01-31 13:03:25 -08:00
Chris Penner
cb974e7ae1 Newlines within {{ }} for multi-line docs 2024-01-31 11:27:49 -08:00
Chris Penner
bea34375ab Update transcripts 2024-01-31 10:12:03 -08:00