Commit Graph

62 Commits

Author SHA1 Message Date
runarorama
5f6e305858 Merge branch 'trunk' of github.com:unisonweb/unison into topic/codebaseserver-openapi 2021-02-25 23:49:07 -05:00
Ian Grant Jeffries
e4a118872a Add -haddock flag to help haskell-language-server
(See this issue: https://github.com/haskell/haskell-language-server/issues/208)

Adding -haddock gives doc-on-hover for 3rd party libraries like megaparsec.

I tested this on a big codebase (>20k SLOC) and compile times stayed the same.
2021-02-25 17:12:03 -05:00
runarorama
4fcd7aad33 Merge branch 'topic/codebaseserver-openapi' of github.com:unisonweb/unison into topic/codebaseserver-openapi 2021-02-18 23:25:14 -05:00
runarorama
c8a1ea6fdf Builds 2021-02-18 22:23:57 -05:00
Arya Irani
ed9bf17dd1
Merge branch 'trunk' into topic/codebaseserver-openapi 2021-02-16 13:12:44 -05:00
Dan Doel
5e48418a32 Add additional extra-dependencies necessary for newer containers 2021-02-11 14:39:14 -05:00
Dan Doel
e99ac92246 Override containers version 2021-02-11 10:57:12 -05:00
runarorama
af091f3f07 Merge branch 'trunk' of github.com:unisonweb/unison into topic/codebaseserver-openapi 2021-01-08 11:40:52 -05:00
Arya Irani
47534360ab update resolver for 8.10.3 2021-01-04 00:01:51 -05:00
Arya Irani
e2df2eff3e update trunk for ghc 8.10.2 2020-12-22 11:58:24 -05:00
runarorama
6a94460c0c Merge branch 'trunk' of github.com:unisonweb/unison into topic/codebaseserver-openapi 2020-12-09 21:36:37 -05:00
Stew O'Connor
0b6be82ea7 Added Tls.Config.defaultClient and Tls.Config.defaultServer 2020-10-26 13:03:18 -07:00
runarorama
2f3ec519f5 OpenAPI doesn't like names with ' in them 2020-10-09 14:24:57 -04:00
runarorama
eb1de42185 Adventures in OpenAPI 3 2020-10-08 11:54:02 -04:00
Arya Irani
e8d6616363 update to lts-15.15 2020-06-02 22:14:59 -04:00
Mitchell Rosen
3f4e8a450a Bump to lts-15.13 2020-05-24 10:20:52 -04:00
Mitchell Rosen
c1df5e9245 Replace submodules with git extra-deps 2020-05-21 19:43:25 -04:00
Runar Bjarnason
47cd804763 Add configurator submodule 2020-04-26 22:23:09 -04:00
Arya Irani
6b57a1d12a Merge remote-tracking branch 'origin/topic/fix-local-git-repo' into topic/new-file-sync3+ 2020-03-29 13:44:31 -04:00
Arya Irani
713a746294 update Shellmet, hide most git commands 2020-03-28 12:49:02 -04:00
Arya Irani
18cc4595fa wip implementation of copy-based FileCodebase syncing
- undelete Branch.transform & Causal.unsafeMapHashPreserving
- added `dependentsDir'`, `typeIndexDir'`, `typeMentionsDir'` which are
  the top-level directory for these things, as opposed to a level deeper
- added `FileCodebase.loadIndex` which loads a `Relation Reference k`
  from this sort of directory structure:
  ```
  indexDir / "_builtin" / builtinref / <k>
  indexDir / derivedref / <k>
  ```
  It's used to load the dependents index, type index, and type mentions
  index.
- in `FileCodebase.serializeEdits`, made the loading lazier
- added `FileCodebase.copyFileWithParents` helper
- `FileCodebase.copyIndexHelper` consolidates logic in `copyDependents`,  `copyTypeIndex`, and `copyTypeMentionsIndex`.

loose ends:
- [ ] add docs for `loadIndex`
- [ ] add docs for `copyIndexHelper`
- [ ] add docs for `copySyncToDirectory`

todo:
- [ ] weird, probably wrong index results after copy
2020-03-06 09:22:06 -05:00
Mitchell Rosen
83af25773b Carve out unison-core package 2019-12-04 18:57:26 -05:00
Rúnar
392b25068a
Runarorama/317 resolve edit command for resolving edit (#830)
* Fixed branchdiff semigroup
* Fixed patch diff application in 3-way merge
* Added a transcript for resolve.term
2019-10-03 12:59:12 -04:00
Arya Irani
919cd98a75 Merge branch 'master' into topic/transcripts 2019-09-30 18:40:37 -04:00
Arya Irani
57bc4e859f disable transcript output to stdout; some other output tweaks 2019-09-30 18:40:10 -04:00
Arya Irani
96ec719a5a Update to ghc-8.6 / lts-14.7. Pinned megaparsec-6.5.0 vs 7.0.x 2019-09-29 13:01:56 -04:00
Runar Bjarnason
82a46441c0 Merge branch 'wip/branchless' of github.com:unisonweb/unison into runarorama/501-load-and-save-Unison-branches 2019-06-11 10:45:13 -04:00
Runar Bjarnason
f1d44a6dfc [#501] Using git commandline
Resolves #501
2019-06-06 16:15:21 -04:00
Arya Irani
e206bbcbd3 implement Branch.merge; also Branch.getAt can be pure 2019-05-17 23:56:07 -04:00
Arya Irani
39ddf91c0e add ANSI patched haskeline as a submodule 2019-03-18 14:29:09 -04:00
Runar Bjarnason
229bf2c550 IO implementation roughly nailed down 2019-02-27 19:47:18 -05:00
Runar Bjarnason
2074e99ae1 Allow different user to run stack for tests 2018-11-05 14:03:34 -05:00
Paul Chiusano
7718584404 delete parsec-layout 2018-10-04 11:15:50 -04:00
Runar Bjarnason
29041c8091 wip 2018-10-03 17:55:04 -04:00
Paul Chiusano
bade2b1050 grabbing current line for watch message now 2018-09-22 15:22:51 -04:00
Arya Irani
b6ba1b49ba comment out -freverse-errors 2018-09-04 10:09:50 -04:00
Arya Irani
14a219d30b update stack resolver from nightly to lts-12.5 which includes ghc-8.4 2018-08-09 12:10:33 -04:00
Paul Chiusano
c75eb1f4e1
Merge pull request #205 from unisonweb/master
merge master into wip/typechecker
2018-06-25 18:39:29 -05:00
Arya Irani
4e14186fa4 switch stackage resolver to nightly, for ghc-8.4.x support 2018-06-25 17:37:04 -04:00
Rúnar Óli Bjarnason
23b2020707 add -freverse-errors to stack.yaml 2018-06-19 14:45:08 -04:00
Arya Irani
3e81af5601 clean up tests by temporarily enabling GHC warnings 2018-06-08 12:34:21 -04:00
Arya Irani
03febf45e7 implemented Accumulate Hash using cryptonite 2018-05-31 17:10:24 -04:00
Rúnar Óli Bjarnason
e39f83c6d8 Preparing for hashing data declarations 2018-05-31 15:35:35 -04:00
Arya Irani
a923bbaa69 clean up script again, also comment out cryptonite, not currently being used 2018-05-26 17:20:06 -04:00
Arya Irani
02c188867b
Update stack.yaml 2018-05-26 15:53:13 -04:00
Arya Irani
e4d33777ce
Update stack.yaml 2018-05-26 15:52:48 -04:00
Arya Irani
f30f526f95 hoping again that stack can just get and cache what it needs 2018-05-26 14:58:43 -04:00
Paul Chiusano
42ea0604d2 started deleting and cleanup, not compiling yet 2018-05-16 18:20:27 -04:00
Paul Chiusano
379d4d5188 new testing library 2016-12-28 00:57:15 -05:00
Paul Chiusano
7b92d440a1 moved layout combinators to separate subproject in yaks directory 2016-12-26 18:08:41 -05:00