Eduard Nicodei
6ed06f3089
Merge remote-tracking branch 'origin/trunk' into merged-ghc-upgrade-try-2
2024-07-15 18:21:33 +01:00
Arya Irani
ce5c9feb6e
Merge pull request #5220 from unisonweb/cp/keep-current-branch
2024-07-12 23:21:22 -04:00
Arya Irani
264a31a956
Merge pull request #5218 from unisonweb/lsp/fix-unused-binding-locs
2024-07-12 23:20:13 -04:00
Chris Penner
0dc7b6d3ab
Reset user to project root if they were on a sub-namespace.
2024-07-12 17:00:45 -07:00
Chris Penner
df0261c8d8
Keep most recent path and branches through migration to version 17
2024-07-12 16:54:42 -07:00
Chris Penner
11208f5284
Add unused binding test
2024-07-12 14:48:18 -07:00
Chris Penner
5652c179fc
Compiling with lamda annotations
2024-07-12 11:15:21 -07:00
Dan Doel
a010a8a2d7
Use builtin reference names in foreign decompiling
...
E.G. print <Promise> instead of <Foreign>
2024-07-12 13:23:52 -04:00
mergify[bot]
be7e6cb2ff
Merge pull request #5041 from unisonweb/cp/project-root
...
Project Roots
2024-07-11 20:45:11 +00:00
Chris Penner
474fddbd13
Use a branch root semispace cache
2024-07-11 10:30:03 -07:00
Chris Penner
987cd61976
Swap branch-relative-paths back to relative
2024-07-11 09:49:55 -07:00
Dan Doel
c2958cca28
Use pretty text in MsgTrace case of debug toText
2024-07-11 12:09:41 -04:00
Arya Irani
0cd3cd1cff
Merge branch 'trunk' into cp/project-root
...
# Conflicts:
# unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md
# unison-src/transcripts-round-trip/main.output.md
# unison-src/transcripts/add-run.output.md
# unison-src/transcripts/bug-strange-closure.output.md
# unison-src/transcripts/cycle-update-5.output.md
# unison-src/transcripts/delete.output.md
# unison-src/transcripts/diff-namespace.output.md
# unison-src/transcripts/move-namespace.output.md
# unison-src/transcripts/name-selection.output.md
# unison-src/transcripts/names.output.md
# unison-src/transcripts/namespace-dependencies.output.md
# unison-src/transcripts/propagate.output.md
# unison-src/transcripts/reflog.output.md
# unison-src/transcripts/reset.output.md
# unison-src/transcripts/tab-completion.output.md
# unison-src/transcripts/transcript-parser-commands.output.md
2024-07-10 23:49:04 -04:00
Arya Irani
9b11d96cbb
Merge pull request #5177 from unisonweb/24-07-01-todo-merge-precondition-violations
2024-07-10 13:28:59 -04:00
Chris Penner
951f31867d
preload branches into the branch cache when switching projects
2024-07-09 15:54:22 -07:00
Chris Penner
736ccf1434
Merge trunk
2024-07-09 15:47:12 -07:00
Chris Penner
e506b009ed
No in-memory branch in loop-state
2024-07-09 12:59:27 -07:00
Paul Chiusano
2c1a0485f7
Don't use DelayForceChar as syntax style for blah.default()
2024-07-09 15:17:46 -04:00
Chris Penner
ee6793bd27
Attempt to fix Unused Binding locations
2024-07-09 09:52:12 -07:00
Chris Penner
5e775ccf7b
Improve docs
2024-07-08 11:55:52 -07:00
Chris Penner
8a405e02d2
Update reflog command WIP
2024-07-03 16:43:34 -07:00
Chris Penner
2db50ad848
Specialize 'fromHash' to CausalHash
2024-07-03 16:07:31 -07:00
Chris Penner
7f57612f90
More WIP on reflog commands
2024-07-03 15:54:48 -07:00
Chris Penner
a7820feeac
Deprecate root reflog behaviour in favour of project/branch reflogs
2024-07-03 11:52:52 -07:00
Chris Penner
cc07b63aff
Merge trunk
2024-07-02 15:37:49 -07:00
Mitchell Rosen
50f28817e5
add Names.lenientToNametree
2024-07-02 13:06:03 -04:00
Mitchell Rosen
b8e13ca0df
⅄ move-nametree → 24-07-01-todo-merge-precondition-violations
2024-07-02 12:33:00 -04:00
Mitchell Rosen
eb1ee64cf2
merge unison-util-nametree into unison-core1
2024-07-02 12:23:34 -04:00
Mitchell Rosen
f0c53eed28
show "defs in lib" merge precondition violation in todo output
2024-07-02 11:39:11 -04:00
Chris Penner
38d60e7e6e
Switch project before deleting it
2024-07-01 14:30:01 -07:00
Chris Penner
dadc4e476b
Merge trunk and resolve basic conflicts
2024-07-01 14:29:32 -07:00
Chris Penner
563e14806f
Resolve conflicts with trunk
2024-06-27 12:35:14 -07:00
Chris Penner
e94f8706fc
Remove Primes from module names
2024-06-27 12:16:53 -07:00
Eduard Nicodei
95a0eb95f9
cleanup cabal
2024-06-27 17:04:14 +01:00
Eduard Nicodei
a35d70646f
Use GHC.IsList
2024-06-27 17:04:02 +01:00
Chris Penner
61e0522d1e
Fix redundant liftA2 imports
2024-06-26 18:01:45 -07:00
Chris Penner
4a9b35867c
Swap from x509 to crypton-x509 since old packages are abandoned
2024-06-26 17:51:48 -07:00
Chris Penner
2d1bf19a65
Mostly Upgrade LTS to ghc 9.6.5
2024-06-26 17:19:01 -07:00
Greg Pfeil
2faa425d76
Merge remote-tracking branch 'upstream/trunk' into numbered-test-results
2024-06-26 14:58:25 -06:00
Greg Pfeil
77b46bce29
Eliminate Path.unsafeToName
...
In every case, this was being used in conjunction with `unsplitHQ`. So
this replaces `unsplitHQ` with `nameFromHQSplit`, which avoids
converting the `Split` to a `Path` in the middle.
2024-06-26 14:44:42 -06:00
etorreborre
3556cb6ec8
fix: fix the textual representation of an ordinal number
2024-06-26 17:34:45 +02:00
Arya Irani
1e72750bb1
Merge pull request #5133 from unisonweb/fix/5129
2024-06-25 16:23:14 -04:00
Arya Irani
769cbbd003
Merge pull request #5106 from neduard/ghc-964-updates-part-1
2024-06-25 16:20:47 -04: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
aryairani
382cdacb9f
automatically run ormolu
2024-06-25 19:33:39 +00:00
Arya Irani
627acb7f3a
Update parser-typechecker/src/Unison/PatternMatchCoverage/Solve.hs
2024-06-25 15:33:22 -04:00
Chris Penner
1f34de9026
Swap stepAt combinators to use project paths
2024-06-25 10:23:11 -07:00
Chris Penner
1cbac288de
Fix unique type guid generation
...
Adds getMaybe* versions of shallow branch combinators
2024-06-25 10:10:28 -07:00
Eduard Nicodei
364b7790ca
more s/forall/forAll/
2024-06-25 12:29:13 +01:00
Eduard Nicodei
4453fda570
fix redundant pattern match warning
2024-06-25 10:06:26 +01:00
