Commit Graph

7115 Commits

Author SHA1 Message Date
Chris Penner
2b504190fc Rewrite BranchRelativePaths machinery 2024-05-23 10:08:39 -07:00
Chris Penner
dca8431b50 Add getShallowProjectRootByNames 2024-05-22 10:08:02 -07:00
Chris Penner
1a15c3f212 Set currentProjectPath in SQLite 2024-05-21 16:37:30 -07:00
Chris Penner
2c64c6a408 Checkpoint 2024-05-21 16:37:12 -07:00
Chris Penner
39f065e656 Propagate root branch accessors 2024-05-21 15:48:37 -07:00
Chris Penner
12b3107cdb Add migration to move project branches to sqlite 2024-05-21 09:32:48 -07:00
Chris Penner
73145db0d2 Add Location pt 2 2024-05-21 09:32:48 -07:00
Arya Irani
2ec8e01dd7
Merge pull request #4966 from unisonweb/topic/merge5 2024-05-20 10:48:43 -04:00
Arya Irani
8b762c7908
Merge branch 'trunk' into cp/definition-diffs 2024-05-18 10:31:26 -04:00
Mitchell Rosen
9d7fe1fbef revert removing ApplicativeDo from default extensions because apparently
we spookily rely on it! fragile! wow!
2024-05-17 18:35:16 -04:00
Mitchell Rosen
3b8bdf58a3 fix warning error and remove unused PinBoard code 2024-05-17 17:52:07 -04:00
Chris Penner
3e3f59333d Implement termDefinitionByName 2024-05-16 15:30:03 -07:00
Mitchell Rosen
b9a45d5f86 ⅄ trunk → topic/merge5 2024-05-16 11:55:27 -04:00
Arya Irani
6e92e62151
Merge branch 'trunk' into topic/merge4 2024-05-16 06:21:43 -04:00
Mitchell Rosen
693af9c809 ⅄ trunk → topic/merge4 2024-05-15 12:03:16 -04:00
Mitchell Rosen
4bd924a0c9 make DownloadUtils module, shared by pull and clone 2024-05-15 11:57:30 -04:00
Mitchell Rosen
2efb3a2598 delete unused SyncMode type and redundant debug.pull-exhaustive
command
2024-05-15 11:04:05 -04:00
Mitchell Rosen
ecd323faa7 add migration to cd up to current project root 2024-05-14 16:46:27 -04:00
Mitchell Rosen
a77c10a342 merge work (not compiling) 2024-05-13 20:45:10 -04:00
Mitchell Rosen
3813bfbd36 ⅄ trunk → topic/merge5 2024-05-13 13:59:19 -04:00
Mitchell Rosen
aee317a681 explicitly ignore ignored return values 2024-05-13 13:52:32 -04:00
Mitchell Rosen
e18bbd40f9 ⅄ trunk → topic/merge4 2024-05-13 10:36:03 -04:00
Arya Irani
4f4ed49831
Merge pull request #4932 from etorreborre/etorreborre/feat/rsa-builtins-for-haskell 2024-05-12 13:23:01 -04:00
Arya Irani
220b3d5b3e
Merge pull request #4930 from unisonweb/fix/jit-misc 2024-05-11 13:58:30 -04: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
Dan Doel
7cd2e40460 Add an evaluate to updateMap
Ensures that what we're going to add is evaluated _before_ overwriting
the cache, so that we don't just replace the cache with an exception.
2024-05-10 11:22:21 -04:00
Dan Doel
cdc6a661bd Send run.native args to jit 2024-05-09 18:00:13 -04:00
Mitchell Rosen
cc4a91ae3f separate importing code from loading branches 2024-05-09 09:57:17 -04:00
Mitchell Rosen
6dcd616bcd pull up where we load a git-pulled branch into memory 2024-05-08 11:57:58 -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
d7b48dcb5c minor cleanup 2024-05-06 13:03:41 -04:00
Kyle Goetz
8e8b00675f unused imports 2024-05-06 00:24:16 -05:00
Kyle Goetz
9815b2fce0 remove UDPSocket/ListenSocket -> Socket extractions from Haskell 2024-05-06 00:18:01 -05:00
Mitchell Rosen
fbc3479294 remove a couple unnecessary coerces 2024-05-03 12:58:05 -04:00
Mitchell Rosen
831005eaf3 ⅄ trunk → topic/merge4 2024-05-01 13:26:43 -04:00
Mitchell Rosen
80d0b6636c fix duplicate term detection 2024-05-01 12:52:07 -04:00
Mitchell Rosen
5cd8904247 fix compiler errors in test suites 2024-05-01 10:24:32 -04:00
Mitchell Rosen
c569fd8137 undo UnisonFile generalization 2024-05-01 10:10:17 -04: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
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
4319a03e7b OverloadedRecordDot 2024-04-24 10:32:07 -04:00
Mitchell Rosen
9253dc9fa1 ⅄ trunk → topic/merge4 2024-04-23 13:10:35 -04:00
Arya Irani
542b7864ee
Merge pull request #4897 from unisonweb/fix/jit-duplicate-defns
Fix duplicate definitions in jit when using scratch files
2024-04-22 11:58:42 -04:00
Dan Doel
9d1e2308a8 Fix duplicate definitions in jit when using scratch files 2024-04-19 16:35:17 -04:00
Mitchell Rosen
9a0867d161 remember whether dependent came from Alice or Bob 2024-04-18 16:45:16 -04:00
Dan Doel
b2a2107675 Add fromBytes to IOSource and decompile with it 2024-04-18 16:20:21 -04:00
Dan Doel
6812d663de Add ImmutableArray.fromList to IOSource and use it for decompiling 2024-04-18 13:44:56 -04:00
Mitchell Rosen
6a847aedae ⅄ trunk → topic/merge4 2024-04-17 19:25:03 -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
dolio
7667b1a958 automatically run ormolu 2024-04-16 18:27:23 +00:00
Dan Doel
12ec621d23 Add back padding when errors/traces actually occur 2024-04-16 14:26:28 -04:00
Dan Doel
383a6695d7 Decompile partially applied builtin functions 2024-04-16 14:10:29 -04:00
Dan Doel
c3ac632507 Merge remote-tracking branch 'refs/remotes/origin/topic/jit-eval-side-channel' into topic/jit-eval-side-channel 2024-04-16 13:25:43 -04:00
Dan Doel
90dffe3e9b Add a note about port 0 listening 2024-04-16 13:16:27 -04:00
dolio
6a28cf5322 automatically run ormolu 2024-04-16 17:15:47 +00:00
Dan Doel
d9378fdd52 Use a thread for communication with jit runtime
Avoids potential lock ups if the runtime process exits before connecting
back.

Also includes some error formatting to avoid empty lines and empty stack
traces.
2024-04-16 13:06:17 -04:00
Dan Doel
087bc3e3a0 Add separate communication channel with jit runtime 2024-04-16 12:03:46 -04:00
Arya Irani
407ffdd53e Merge branch 'trunk' into kylegoetz-udp 2024-04-09 16:50:12 -06:00
Arya Irani
972a63e537
Merge pull request #4869 from unisonweb/topic/jit-error-detection
Check the exit code during native evaluation
2024-04-09 17:31:44 -04:00
Arya Irani
957ee53029
Merge pull request #4870 from unisonweb/cp/diff-by-namespace
Updates for Share diffs feature
2024-04-09 15:53:31 -04:00
Dan Doel
9efad2b3eb Check the exit code during native evaluation 2024-04-08 12:34:57 -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
guqicun
d525cb5454 chore: remove repetitive words
Signed-off-by: guqicun <guqicun@outlook.com>
2024-04-06 18:51:15 +08:00
Arya Irani
ce93889251
Merge pull request #4818 from unisonweb/24-03-20-fix-decl-printer-bug
bugfix: don't go looking for field names of a hash-only decl
2024-04-05 16:35:45 -06:00
Mitchell Rosen
3a6cf53d33 fix compiler error 2024-04-05 16:13:57 -04:00
Mitchell Rosen
7a1994bd34 clarify that sometimes we do expect typechecking accessors to fail 2024-04-05 10:41:09 -04:00
Mitchell Rosen
2ff7d77820 ⅄ trunk → topic/merge4 2024-04-04 14:40:54 -04:00
Chris Penner
5e0e70ecd0 Expose builtin term type references 2024-04-03 16:06:12 -07:00
Chris Penner
c057a76da9 Rename testResultType -> testResultListType 2024-04-03 15:30:08 -07:00
Mitchell Rosen
51ca7ffb9b move conflict twiddling code 2024-04-03 15:47:36 -04: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
dolio
7a6757a433 automatically run ormolu 2024-04-01 20:21:30 +00:00
Dan Doel
5a4de510bd Fix a problem with rehashing from scratch files
Was causing run.native of terms in a scratch file to fail after the
first time.
2024-04-01 16:07:16 -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
eb52fe7685 removed commented-out code 2024-03-29 21:05:54 -05:00
Arya Irani
a0eb9a17f4
Update parser-typechecker/src/Unison/Util/Text/Pattern.hs 2024-03-29 16:48:40 -04:00
Dan Doel
eaee313440 Split corrected many pattern into two patterns 2024-03-29 12:39:30 -04:00
Kyle Goetz
14df922df5 delete commented-out code 2024-03-29 08:47:42 -05:00
Kyle Goetz
f6aac6369f added UDP types and terms 2024-03-28 22:59:14 -05:00
Mitchell Rosen
9d056682be misc work and bugfixes 2024-03-23 11:44:16 -04:00
Mitchell Rosen
fec206bba3 fix a bug in bumpLca (which needs to be renamed) 2024-03-22 20:25:19 -04:00
Arya Irani
eac180f851
Merge pull request #4822 from unisonweb/travis/kind-inference-docs
Improve kind inference docs
2024-03-22 11:15:32 -06:00
Travis Staton
587267a151
document kind inference constraint generation 2024-03-22 11:58:34 -04:00
Travis Staton
2a6708d2b5
document kind inference solver 2024-03-22 11:27:19 -04:00
Mitchell Rosen
5bd507f2b9 ⅄ trunk → topic/merge4 2024-03-22 09:40:07 -04:00
Mitchell Rosen
1218b988e7 ⅄ trunk → 24-03-20-fix-decl-printer-bug 2024-03-22 09:32:41 -04:00
Mitchell Rosen
2a465ed97a bugfix: don't go looking for field names of a hash-only decl 2024-03-21 17:08:32 -04:00
Travis Staton
9856de82f0
StarProvenance -> TypeProvenance 2024-03-21 16:13:01 -04:00
Travis Staton
6162ba0ce5
docs, module rearrangement 2024-03-21 15:58:42 -04:00
Travis Staton
697cc11916
kind inference docs 2024-03-21 15:36:50 -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
Mitchell Rosen
333f43116d move generateRecordAccessors into its own module 2024-03-20 14:29:33 -04:00
Mitchell Rosen
c23801e3d5 fix bug in resolveNote 2024-03-19 14:19:05 -04:00
Travis Staton
ad8b7b00b1
unify "no constructor names" and "missing constructor name"
precondition violations
2024-03-19 11:21:03 -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
Mitchell Rosen
0c4c711934 more typechecker refactoring 2024-03-18 17:08:23 -04:00