Commit Graph

7545 Commits

Author SHA1 Message Date
Arya Irani
c92bf5528e print the number of cpus configured on headless startup 2021-06-01 11:26:10 -06:00
Paul Chiusano
c112a2415f
Merge pull request #2039 from unisonweb/fix/2004-2-hash 2021-05-31 08:21:06 -05:00
Arya Irani
c71b8c1c59
Merge pull request #2043 from unisonweb/topic/journal-mode-enum
generalize the Sqlite.Queries.useWAL setting to other sqlite journal modes
2021-05-30 15:33:07 -04:00
Arya Irani
2ac1b1b985 generalize the useWAL setting to other sql journal modes 2021-05-29 23:18:10 -06:00
Paul Chiusano
9601aca580
Merge pull request #2037 from unisonweb/feature/ui-path 2021-05-29 15:56:49 -05:00
Arya Irani
60cf4c1f00 adjust tests and transcripts for changed hashes 2021-05-28 14:03:41 -06:00
Arya Irani
cf9a283496 add a little more to copy-patch.md 2021-05-28 13:47:31 -06:00
Arya Irani
6dc36daa9e Merge remote-tracking branch 'origin/trunk' into fix/2004-2-hash
# Conflicts:
#	unison-src/transcripts/fix2000.md
#	unison-src/transcripts/fix2000.output.md
2021-05-28 13:47:14 -06:00
Paul Chiusano
26f8dd37f2 Codebase server default ui path is relative to the executable now
To test, I added a script that downloads the latest UI release and puts it next to the executable.
2021-05-28 14:45:10 -05:00
Paul Chiusano
43a22072dd
Merge pull request #2036 from unisonweb/fix/ready-to-merge
Update mergify.yml to work with new build matrix
2021-05-28 12:30:42 -05:00
Paul Chiusano
88687baa60
Update mergify.yml for new build matrix 2021-05-28 09:19:40 -05:00
Paul Chiusano
050a300ac0
Merge pull request #2035 from unisonweb/topic/remove-v1-codebase-sync-tests
add `_edits` to `Branch0` hash calculation
2021-05-28 09:18:17 -05:00
Paul Chiusano
c3c0f01e46 Refresh transcripts
Any transcript that shows namespace hashes would be affected by this, even if it does nothing with patches, since the namespace hash now correctly mixes in the hash of the patches. (It doesn't matter if the patches are empty, just mixing in another hash for the empty list will affect the overall hash)
2021-05-28 09:04:24 -05:00
Paul Chiusano
c8a9d8b11a removed hardcoded hashes from the transcript
It was just being used for debugging output to show history at an intermediate point
2021-05-28 08:26:55 -05:00
Arya Irani
0fa859f32a Merge remote-tracking branch 'origin/topic/remove-v1-codebase-sync-tests' into fix/2004-2-hash 2021-05-28 01:13:44 -06:00
Arya Irani
59f927eb55 add _edits to Branch0 hash value 2021-05-28 01:04:58 -06:00
Paul Chiusano
5ad3a4e418
Merge pull request #2030 from unisonweb/fix/2026
Fix wrapper code for putBytes
2021-05-27 23:37:00 -05:00
Paul Chiusano
f992576f32
Merge pull request #2033 from unisonweb/fix/2027
Fix bad failure references in builtins
2021-05-27 21:02:36 -05:00
Dan Doel
44b74f7d56 Attempt to remove platform-specific information from transcript 2021-05-27 18:37:55 -04:00
Dan Doel
57ecb81d27 Fix bad failure references in builtins
- When originally written, various builtins were referencing data types
  defined in IOSource. However, those no longer exist there.
- Instead, they are defined in Unison.Builtin.Decls
- This switches the builtins to the Decls values, some of which weren't
  exported yet.
- Also eliminates them from IOSource, since the ones there didn't
  actually work.
- Transcript testing the behavior added.
2021-05-27 16:41:14 -04:00
Dan Doel
1b34c22940 Add a transcript test. 2021-05-27 13:39:09 -04:00
Arya Irani
5c4ae33af1 update Branch.step and stepM to skip empty ancestors 2021-05-27 10:39:00 -06:00
Dan Doel
8cbac09958 Use correct wrapper for putBytes
- It was using `boxBoxToEFBox`, which was resulting in the handle being
  returned as a result. It should be `boxBoxToEF0` to return a unit
  instead.
2021-05-27 10:53:36 -04:00
Dan Doel
5299f5aebd Provide more information when unable to decompile a Foreign value 2021-05-27 10:51:11 -04:00
Paul Chiusano
88116239a7
Merge pull request #2016 from unisonweb/feature/only-ui-url
Minor nit: don't show the API url unless launching UCM in headless mode
2021-05-26 21:36:10 -05:00
Paul Chiusano
bf48b3d00b
Merge pull request #2017 from unisonweb/feature/dont-typecheck-on-startup
Don't typecheck all scratch files on startup
2021-05-26 21:35:42 -05:00
Arya Irani
455b2caaa6 Revert "Empty nodes don't count as LCA"
This reverts commit 9e10dbedc6.

# Conflicts:
#	parser-typechecker/src/Unison/Codebase/Branch.hs
#	unison-src/transcripts/fix2000.output.md
2021-05-26 11:37:28 -06:00
Arya Irani
d78f835d54 Revert "only consider parents with parents for sql lca"
This reverts commit 7f08a9f16c.
2021-05-26 09:23:08 -06:00
Arya Irani
11c695fd85 update transcript output 2021-05-26 08:44:05 -06:00
Arya Irani
7f08a9f16c only consider parents with parents for sql lca
this is okay, provided that all One branches are the empty branch.

the commit splits the shared `ancestorSql` query into two, because we still want `before` to return One branches.
2021-05-26 08:37:15 -06:00
Paul Chiusano
d0f0bd038d Don't typecheck all scratch files on startup 2021-05-26 09:22:49 -05:00
Paul Chiusano
71c91ae7bc Don't show the API url in UCM, only show when headless 2021-05-26 08:49:34 -05:00
Paul Chiusano
9277cfc399 better verbiage 2021-05-26 08:25:01 -05:00
Paul Chiusano
6ac56a68db Clean up transcript so it's easier to follow and add more verbiage 2021-05-26 08:22:50 -05:00
Paul Chiusano
a0de0be3c9 Regression test 2021-05-26 08:10:50 -05:00
Mike (stew) O'Connor
3232c0b95c
Merge pull request #2013 from stew/pre-release
tag release whenever we merge to trunk
2021-05-25 20:58:08 -07:00
Stew O'Connor
389484aa98 tag release whenever we merge to trunk 2021-05-25 17:03:20 -07:00
Arya Irani
fbd1ab6405
Merge pull request #2008 from unisonweb/fix/1860
Fix bug that would cause scopes to be improperly reported in EasyTest
2021-05-25 19:02:43 -04:00
mergify[bot]
1f8b829909
Merge pull request #1996 from unisonweb/feature/codebase-before
Speed up `push` by using fast SQL-based `Branch.before` calculation
2021-05-25 20:07:01 +00:00
Arya Irani
1036b449c8 delete some leftover comments 2021-05-25 13:51:59 -06:00
Arya Irani
35f2261d45 delete Before Command aka Command.Before
but you can revert this commit later if you want it!
2021-05-25 13:49:44 -06:00
Arya Irani
6341f10cf7 forgot to use a ucm block in my transcripts 2021-05-25 13:24:18 -06:00
mergify[bot]
630293fd74
Merge pull request #2010 from unisonweb/fix/inline-signature-pp
Fix to pretty-printing of
2021-05-25 19:16:35 +00:00
Paul Chiusano
17e9fb0868 Update transcript that was using doc syntax for regression test 2021-05-25 13:58:19 -05:00
Paul Chiusano
7641e85909 fix pretty-printing of inline signature blocks 2021-05-25 13:48:35 -05:00
Paul Chiusano
db764e8125 comment out the failing test that exercises this 2021-05-25 12:36:23 -05:00
Paul Chiusano
0bb1c2ad0b fix #1860 2021-05-25 12:35:13 -05:00
Paul Chiusano
8f51911007
Merge pull request #2006 from unisonweb/topic/headless
Add an option for running codebase server in headless mode
2021-05-25 11:39:24 -05:00
Paul Chiusano
c9c68a8ad4
Merge pull request #2007 from unisonweb/feature/inline-signature
@signature is now @inlineSignature
2021-05-25 11:38:37 -05:00
Rúnar
fc9d875664 Add help for headless 2021-05-25 12:11:00 -04:00