Chris Penner
bed7af2ab2
Half-convert move-namespace.md to projects
2024-06-26 11:41:07 -07:00
Chris Penner
59aebe93a5
remove ls-pretty-print-scope-bug.md, we don't really support subnamespaces for this any more
2024-06-26 11:29:30 -07:00
Chris Penner
6625996039
Port fuzzy-option.md to projects
2024-06-26 11:22:32 -07:00
Chris Penner
bcb3e46218
Fix 2628.md for projects
2024-06-26 11:20:19 -07:00
Chris Penner
f3503cca97
Port fix2243.md to projects
2024-06-26 11:18:41 -07:00
Chris Penner
f71008b6a2
Port find-command to projects
2024-06-26 11:07:16 -07:00
Chris Penner
a92885a8bd
Port emptyCodebase transcript to projects
2024-06-26 11:03:22 -07:00
Chris Penner
6a1ccd5a64
Port empty-namespaces to projects
2024-06-26 11:01:11 -07:00
Chris Penner
2fd585e1d3
Port doc1 transcript to projects
2024-06-26 10:58:27 -07:00
Mitchell Rosen
60a58a2ff8
⅄ trunk → 24-06-26-port-old-merge-transcripts
2024-06-26 12:30:52 -04:00
Mitchell Rosen
94580cc218
delete squash.md
2024-06-26 12:27:49 -04:00
Mitchell Rosen
c5f4d6d5b7
delete project-merge.md
2024-06-26 12:26:14 -04:00
Mitchell Rosen
19da19b259
delete merges.md
2024-06-26 12:25:24 -04:00
Mitchell Rosen
25d505e784
port mergeloop.md over to use new merge
2024-06-26 12:24:00 -04:00
Arya Irani
e589d0ff75
Merge pull request #5118 from unisonweb/24-06-21-alias-term-force
2024-06-26 12:20:09 -04:00
Mitchell Rosen
596cb39b2e
port empty namespace merge test to new merge
2024-06-26 12:13:18 -04:00
Mitchell Rosen
93fc35e2c7
delete child-namespace-history-merge.md
2024-06-26 11:32:06 -04:00
Mitchell Rosen
13558c91e8
delete fix2004.md
2024-06-26 11:30:39 -04:00
Mitchell Rosen
267bfdf248
remove fix2000.md
2024-06-26 11:26:37 -04:00
Mitchell Rosen
e1b00d9c58
rename alias.term.force to debug.alias.term.force
2024-06-26 11:23:21 -04:00
Arya Irani
95fc3aabfd
Merge pull request #5124 from unisonweb/24-06-24-todo-dependents
2024-06-26 10:36:51 -04:00
Chris Penner
3666e04257
Convert deep-names to use projects
2024-06-25 17:21:03 -07:00
Chris Penner
fcc251de2e
Convert create-author.md to projects
2024-06-25 17:15:00 -07:00
Chris Penner
6e48ce47be
builtins.md converted to projects
2024-06-25 17:14:48 -07:00
Chris Penner
e2f4c388b6
Remove loose code demo from branch
2024-06-25 17:10:02 -07:00
Chris Penner
bbd02a9129
Port getDefinition.md to use projects.
...
Fix recontextualization of project queries when using relativeTo
2024-06-25 17:05:38 -07:00
Dan Doel
34877da01c
Don't relax type when doing an instantiateL during subtyping
...
This is the case of `a < T` for some structured T. By relaxing, we are
actually allowing `a` to be a _supertype_ of T as far as abilities go,
which is not correct. Seems like it was just erroneously mirrored from
the opposite case.
2024-06-25 15:54:10 -04:00
Chris Penner
6152577dd4
Fix alias-many transcript
2024-06-25 11:32:19 -07:00
Chris Penner
7930cc2c33
Transcript output updates
2024-06-25 11:12:43 -07:00
Chris Penner
26a0bf7b40
Edit transcripts to be in projects
2024-06-25 11:12:43 -07:00
Chris Penner
5ca1eb3b8d
Replace '.' references with scratch/main
2024-06-25 11:11:07 -07:00
Chris Penner
ae7cf3d0a5
Update transcripts to use implicit project creation
2024-06-25 11:08:11 -07:00
Arya Irani
53c3a16366
Merge pull request #5114 from unisonweb/topic/force-syntax
2024-06-25 10:34:00 -04:00
Mitchell Rosen
ae54637bae
add transcript that demonstrates bug in merge
2024-06-25 09:40:06 -04:00
Paul Chiusano
97838c4883
Merge remote-tracking branch 'origin/trunk' into topic/force-syntax
...
# Conflicts:
# unison-src/transcripts-round-trip/main.output.md
# unison-src/transcripts-round-trip/reparses-with-same-hash.u
2024-06-24 18:53:04 -05:00
Chris Penner
1c186d4d73
Merge trunk into cp/project-root
2024-06-24 12:50:36 -07:00
Mitchell Rosen
3e229d521f
⅄ trunk → 24-06-24-todo-dependents
2024-06-24 13:42:13 -04:00
Arya Irani
7172bb8e4f
Merge pull request #5107 from unisonweb/24-06-13-revamp-todo
2024-06-24 12:08:27 -04:00
Mitchell Rosen
d8240cd106
add transcripts for showing dependents of todo
2024-06-24 09:45:11 -04:00
Arya Irani
67985204e5
Merge pull request #5108 from sellout/lexer-error-messages
2024-06-24 08:19:16 -04:00
Greg Pfeil
782ac4164d
Remove redundant , from lexer errors
...
Appositives only need to be offset by commas if there isn’t already some other punctuation.
2024-06-23 22:18:51 -05:00
Arya Irani
f74565dbfe
Merge pull request #5111 from sellout/docs.to-html-project-support
2024-06-23 22:18:20 -04:00
Greg Pfeil
3a9e8e51a0
Test that docs.to-html actually writes files
2024-06-23 20:21:16 -05:00
Arya Irani
2d33fd10a0
merge trunk
2024-06-23 11:59:32 -04:00
Eduard Nicodei
9c610510c1
update main.output.md
2024-06-22 18:09:28 +01:00
Eduard Nicodei
85ab99f605
add test in reparses-with-same-hash
...
# Conflicts:
# unison-src/transcripts-round-trip/reparses-with-same-hash.u
2024-06-22 18:09:28 +01:00
Eduard Nicodei
7108787a5a
add more tests
2024-06-22 14:03:08 +01:00
Eduard Nicodei
25ce29301b
add tests
2024-06-22 13:51:18 +01:00
Mitchell Rosen
db3d0e73b3
delete reflog calls to make transcript more idempotent
2024-06-21 16:09:50 -04:00
Mitchell Rosen
b96044c269
add alias.term.force
2024-06-21 15:37:56 -04:00
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
