Chris Penner
295b8bb96b
Merge branch 'trunk' into sam/remove-backticks-termparser
2021-12-15 15:57:05 -06:00
Chris Penner
dd3a97d424
Update transcript output
2021-12-13 12:20:59 -06:00
Chris Penner
53af75af57
Check for empty deletes in move.namespace
2021-12-13 12:14:16 -06:00
Chris Penner
71e5a60d85
Add move.namespace regression transcript
2021-12-13 11:57:37 -06:00
Rúnar
81d61cbd33
Merge branch 'trunk' of github.com:unisonweb/unison into topic/fix2650
2021-12-10 09:31:57 -05:00
Rúnar
d62f2d0e2a
Fix a bunch of PP bugs
2021-12-09 23:05:19 -05:00
Chris Penner
7e1ba673a4
Fix merging on empty namespaces
2021-12-08 16:39:48 -06:00
Chris Penner
9bd63c79f1
Merge branch 'trunk' into cp/fix-ops-on-empty-namespaces
2021-12-08 16:34:17 -06:00
Chris Penner
823eb535af
Merge pull request #2729 from unisonweb/cp/hide-empty-namespaces
...
Hide empty namespaces from ucm output
2021-12-08 16:27:21 -06:00
Dan Doel
fb87173464
Merge branch 'trunk' into topic/debug-logging
2021-12-08 15:59:14 -05:00
Dan Doel
8583cba066
Transcript updates
2021-12-08 14:36:24 -05:00
Chris Penner
d8dfaf6894
Consider only head when checking for empty branch in most commands
2021-12-06 15:49:02 -06:00
Chris Penner
6f6685ca35
Add failing transcript
2021-12-06 15:43:56 -06:00
Chris Penner
0a625f3810
Copy transcripts from the other empty namespace branch
2021-12-06 15:38:09 -06:00
Chris Penner
c555190c17
Assert that history is properly merged for empty namespaces
2021-12-06 15:15:40 -06:00
Chris Penner
d5dbafcf88
Update transcripts to assert that history is preserved
2021-12-06 15:09:58 -06:00
Chris Penner
538dc4027e
Add _correct_ transcript output
2021-12-06 15:06:11 -06:00
Chris Penner
a7e7e53acf
Add transcript (with incorrect output)
2021-12-06 14:44:40 -06: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
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
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
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
Chris Penner
6a65ce8d31
Add transcripts for merging behaviour
2021-11-29 14:50:37 -06:00
Chris Penner
7a5f742bde
Revert "Make SBH toText and toString consistent with Unison.ShortHash"
...
This reverts commit 68f44a4dd5
2021-11-29 13:39:32 -06:00
Chris Penner
fe0a197f3d
Merge branch 'trunk' into cp/order-branch-modifications-1552
2021-11-29 11:31:36 -06:00
Chris Penner
f2929fe7db
PR updates
2021-11-29 11:30:45 -06:00
Chris Penner
fea12ee786
Merge branch 'trunk' into cp/diff-namespace-hashes
2021-11-29 10:26:54 -06:00
Chris Penner
68f44a4dd5
Make SBH toText and toString consistent with Unison.ShortHash
...
Adds a new toBase32Hex for clarity
2021-11-29 09:41:55 -06:00
Mitchell Rosen
1be6574d28
Merge pull request #2657 from unisonweb/21-11-12-gist
...
Add gist command (fixes #2603 )
2021-11-28 12:13:13 -05:00
Chris Penner
9c14f44078
Merge branch 'trunk' into cp/order-branch-modifications-1552
2021-11-24 15:17:02 -06:00
Chris Penner
51b670b2bc
Remove redundant message
2021-11-24 13:08:50 -06:00
Chris Penner
e09b587dae
Add namespace hash diffing to transcript
2021-11-24 10:42:51 -06:00
Paul Chiusano
609c5e9c4a
Merge pull request #2670 from unisonweb/fix/2663
...
Fix a variable capture issue in pattern compilation
2021-11-24 09:57:49 -06:00
Chris Penner
d55625b935
Merge pull request #2666 from unisonweb/cp/ormolu-tracking
...
Add ORMOLU_DISABLE to every file to allow auto-formatting.
2021-11-24 09:00:23 -06:00
Dan Doel
d6635b3e0e
Fix a variable capture issue in pattern compilation
2021-11-24 00:43:22 -05:00
Chris Penner
9744b3d9a8
Update transcripts
2021-11-23 15:47:13 -06:00
Mitchell Rosen
d193d27c51
⅄ trunk → 21-11-12-gist
2021-11-23 16:09:09 -05:00
Chris Penner
107cba47d0
Update transcripts
2021-11-23 15:03:59 -06:00
Chris Penner
7324b8e08f
Update child-namespace-history output
2021-11-23 14:32:49 -06:00
Chris Penner
abc4726580
Add transcript asserting current child-merge behaviour
2021-11-23 14:25:40 -06:00
Chris Penner
54d6fbf1bd
Add ORMOLU_DISABLE to every file.
...
This allows all developers to add ormolu autoformat on save in their
editors without worrying about creating huge diffs on files that haven't
been formatted yet.
If you format a file, remove the DISABLE comment to ensure it stays
formatted in the future.
2021-11-23 12:10:58 -06:00
Chris Penner
3d5eb024d0
Transcripts update - need to solve these
2021-11-22 09:58:24 -06:00
Chris Penner
2e008f2009
Clearify deletion regression transcript
2021-11-22 09:38:49 -06:00
Mitchell Rosen
39f0f9d58c
fix diff.md
2021-11-19 12:55:32 -05:00
