Commit Graph

9200 Commits

Author SHA1 Message Date
Chris Penner
34deed79c2 Undo ormolu to avoid merge conflicts 2021-12-03 17:21:02 -06:00
Chris Penner
cea254d38d Add command to command list 2021-12-03 17:15:15 -06:00
Chris Penner
3f09d4849f Add pull.without-history 2021-12-03 16:46:37 -06:00
Mitchell Rosen
907432f1dd move handling of update command to top level of HandleInput 2021-12-03 13:53:09 -05:00
Chris Penner
e7b7d24c02 Switch to withOpenOrCreateCodebase 2021-12-03 10:48:01 -06:00
Mitchell Rosen
8f549474ae ⅄ trunk → 21-11-30-unknown-schema-ver 2021-12-03 10:35:26 -05:00
Mitchell Rosen
ae27ca6e3b
Merge pull request #2701 from unisonweb/21-12-01-db-open-fix
Handle failing to open a remote codebase better
2021-12-03 10:31:55 -05:00
Simon Højberg
ad4baa4b49
Merge pull request #2655 from unisonweb/hojberg-patch-1
Add Codebase UI step and base README version
2021-12-03 09:14:41 -05:00
Mitchell Rosen
8d326ae328 Remove Monoid,Semigroup instances from Sql 2021-12-02 16:26:54 -05:00
Chris Penner
1a9b9f8087
Merge pull request #2611 from unisonweb/cp/order-branch-modifications-1552
Apply batched branch modifications efficiently, but in the correct order
2021-12-02 15:01:43 -06:00
Paul Chiusano
7a74a1aa04
Merge pull request #2704 from unisonweb/fix/2693
Fix potential stack overrun
2021-12-02 13:38:52 -06:00
Mitchell Rosen
dfa06f8e9c SqliteExceptionReason 2021-12-02 13:34:45 -05:00
Mitchell Rosen
eaf3ede9bc ⅄ 21-12-01-db-open-fix 2021-12-02 13:26:13 -05:00
Mitchell Rosen
0a5585e9d3 fix push.create 2021-12-02 13:24:03 -05:00
Rúnar
055e355433
Merge pull request #2654 from unisonweb/topic/fixGuardBreaks
Fix line breaks in guards with long patterns
2021-12-02 13:05:15 -05:00
Dan Doel
4bc9388aef Fix stack size ensurance
- The previous function was just adding a fixed amount to the stack, but
  with extremely large literals it's actually possible for a function to
  require a bigger stack increase than this fixed size.
- Instead, make sure that the stack increase is at least as large as
  what is needed, plus some slack.
2021-12-02 11:48:46 -05:00
Mitchell Rosen
3e3d7645ff mass renaming 2021-12-02 11:36:31 -05:00
Mitchell Rosen
afb75d31dc fix withSavepoint 2021-12-02 11:10:15 -05:00
Cody Allen
f09fa711f7
Merge pull request #2692 from unisonweb/cp/fzf-mkii
Improve error messaging for missing fzf command
2021-12-02 08:02:39 -08:00
Mitchell Rosen
54b1cb6d10 ⅄ trunk → 21-11-24-replaceDom 2021-12-02 10:46:21 -05:00
Mitchell Rosen
6dd67e4e20 ⅄ 21-12-01-db-open-fix → 21-11-30-unknown-schema-ver 2021-12-02 10:45:16 -05:00
Mitchell Rosen
53ef29acfd
Update parser-typechecker/src/Unison/Codebase/SqliteCodebase.hs
Co-authored-by: Chris Penner <christopher.penner@gmail.com>
2021-12-02 10:30:44 -05:00
Mitchell Rosen
c3f420ef4e handle failure to open remote codebase better 2021-12-01 20:35:58 -05:00
Chris Penner
17670a3c72 Include child-branch history in transcript 2021-12-01 15:36:06 -06:00
Chris Penner
c69048e5e3 Merge branch 'trunk' into cp/order-branch-modifications-1552 2021-12-01 15:15:28 -06:00
Dan Doel
dcc0fa763f Add a transcript to test large (cached) list literals 2021-12-01 15:53:03 -05:00
Chris Penner
5f519cd1b3
Merge pull request #2688 from unisonweb/cp/document-merge-behaviour
Add transcripts for merging behaviour
2021-12-01 14:31:20 -06:00
Mitchell Rosen
f012a3449b display better error message when schema ver is too high 2021-12-01 11:31:40 -05:00
Mitchell Rosen
d3001f7eea replace Pretty with OpenCodebaseError 2021-12-01 10:57:41 -05:00
Mitchell Rosen
2b71be06f5 hide openConnection/closeConnection 2021-11-30 18:00:04 -05:00
Chris Penner
b79f79d84e Clarify messages further 2021-11-30 15:10:27 -06:00
Mitchell Rosen
5bf3e5f1f7 show connection 2021-11-30 15:29:05 -05:00
Mitchell Rosen
6dfc6a6f0e
Update lib/unison-sqlite/src/Unison/Sqlite/JournalMode.hs
Co-authored-by: Chris Penner <christopher.penner@gmail.com>
2021-11-30 14:40:46 -05:00
Mitchell Rosen
79c97b6150 clean up createCodebaseOrError impl 2021-11-30 13:53:43 -05:00
Mitchell Rosen
1f73bd1d23
Merge pull request #2667 from unisonweb/21-11-23-generalize-get-dependents
Include self-references in dependents index
2021-11-30 12:38:06 -05:00
Mitchell Rosen
33a738fae1 ⅄ trunk → 21-11-13-unison-sqlite 2021-11-30 12:20:23 -05:00
Mitchell Rosen
95e4338ee6 add comment 2021-11-30 12:18:08 -05:00
Cody Allen
74cc95b032
Merge pull request #2687 from stew/Socket.toText
add toText functions for Socket, Handle, ThreadId
2021-11-30 09:07:00 -08:00
Stew O'Connor
643bbf96bc update transcripts 2021-11-30 08:43:29 -08:00
Mitchell Rosen
a262351634 document that we index self-references 2021-11-30 11:12:31 -05:00
Mitchell Rosen
3ca9f7f992
Merge pull request #2675 from unisonweb/21-11-24-optimize-relation-subtract
Optimize relation subtractDom, subtractRan
2021-11-30 11:08:56 -05:00
Chris Penner
1090236666 Merge branch 'trunk' into cp/fzf-mkii 2021-11-30 10:05:29 -06:00
Chris Penner
5443e7f4f9 Print help messages on failure 2021-11-30 09:58:35 -06:00
Chris Penner
498991a1f0 Improve error messaging for fzf 2021-11-30 09:46:51 -06:00
Chris Penner
8604471973 Improve help messages for fzf 2021-11-30 09:33:44 -06:00
Arya Irani
a7b446c00f
Merge pull request #2690 from unisonweb/topic/cleanup-causal-test
remove some incomplete tests from Unison.Test.Codebase.Causal
2021-11-29 18:07:08 -08:00
mergify[bot]
30dbfdf060
Merge pull request #2672 from unisonweb/cp/diff-namespace-hashes
Allow running namespace diffs over hashes, useful for comparing histories.
2021-11-29 23:34:02 +00:00
Chris Penner
224db53fac Merge branch 'trunk' into cp/diff-namespace-hashes 2021-11-29 17:16:38 -06:00
Arya Irani
a893a40ac7 ormolu 2021-11-29 12:54:12 -10:00
Arya Irani
97ff20dc3c deleted not-good test-support code from Unison.Test.Codebase.Causal 2021-11-29 12:50:22 -10:00