Commit Graph

546 Commits

Author SHA1 Message Date
Paul Chiusano
5b55275701
Merge pull request #1270 from anovstrup/topic/more-match-handle-strays
fix more stray instances of `case .. of` and `handle .. in` in unison-src
2020-02-25 13:45:31 -05:00
Aaron Novstrup
3504d2b091 fix whitespace (?!?) 2020-02-24 15:40:54 -08:00
Dan Doel
d18509dc2a Explain purpose of error cases in merge.md 2020-02-24 16:19:29 -05:00
Aaron Novstrup
30c22c484a fix stray handle .. in instances in unison-src 2020-02-21 17:05:18 -08:00
Aaron Novstrup
5a841f30f5 fix stray case .. of instances and opportunities for cases in unison-src 2020-02-21 17:05:18 -08:00
Paul Chiusano
4d276bb6fc refresh transcript output 2020-02-20 09:17:10 -05:00
Dan Doel
2b16e376a4 Renamed merge test case transcript to merge.md 2020-02-19 17:18:26 -05:00
Dan Doel
c35ff8f33d Made the fix1250 transcript into a test case
- Tests the cases of the merge behavior we have thought of as
  specific cases that need to be covered.
2020-02-19 17:01:45 -05:00
Paul Chiusano
cc57513fd1 added failing transcript 2020-02-18 14:05:55 -05:00
Arya Irani
396a20a243
Merge pull request #1236 from unisonweb/topic/alias.many
implement `alias.many`
2020-02-18 10:43:21 -05:00
Arya Irani
2e887276b9 remove custom unique type guids from transcripts 2020-02-16 23:56:29 -05:00
Arya Irani
dc09964f7f fix case/of syntax in transcript to match/with per master 2020-02-14 10:18:57 -05:00
Arya Irani
1009e48f86
Merge branch 'master' into topic/alias.many 2020-02-13 19:13:29 -05:00
Arya Irani
b34dfa5a3f fiddle with help text and fight with P.wrap/P.group/P.lines :) 2020-02-13 19:12:38 -05:00
Arya Irani
e21ce3f08c tweak transcript phrasing 2020-02-13 19:01:42 -05:00
Arya Irani
9c55649ed6 happy path seems to work 2020-02-13 18:57:17 -05:00
Paul Chiusano
b7bf12081b
Add Author and License metadata types to builtins (#1228)
* Fix #1056 and add author and license metadata types

* Transcript demonstrating that the codebase is empty at first
2020-02-13 10:59:53 -05:00
Aaron Novstrup
fc8ba2a706
Merge pull request #1214 from anovstrup/topic/match-with-syntax
Replace case-of with match-with
2020-02-12 11:22:58 -08:00
Arya Irani
2737e687fc Merge remote-tracking branch 'origin/master' into topic/hq-ord-merged 2020-02-11 21:00:32 -05:00
Arya Irani
abfe928f61 replace auto-derived Ord HQ instance which had ordered z before a#x
new Ord HQ instance does order `#x` before `a#x`, though.
2020-02-11 20:51:55 -05:00
Runar Bjarnason
dc26ff0e07 Make unique types in transcript deterministic 2020-02-11 19:24:58 -05:00
Runar Bjarnason
6cc1740fab Transcript output fix 2020-02-11 17:06:13 -05:00
Runar Bjarnason
3398a7b437 Merge branch 'master' of github.com:unisonweb/unison into topic/multilink 2020-02-10 20:08:17 -05:00
Runar Bjarnason
1dcea0cce3 Check history after multilink 2020-02-10 20:05:50 -05:00
Rúnar
10768960b3
Allow link and unlink to take numbered range arguments (#1208)
* Allow multiple links to be added/deleted at once
2020-02-10 15:07:04 -05:00
Runar Bjarnason
d5106286a6 Fixed transcript 2020-02-10 15:01:14 -05:00
Runar Bjarnason
00bd80f526 Added a transcript 2020-02-10 14:13:51 -05:00
Runar Bjarnason
89bdfd61b9 Merge branch 'master' of github.com:unisonweb/unison into topic/multilink 2020-02-10 10:21:36 -05:00
Aaron Novstrup
1f7f106d8f replace case .. of with match .. with in transcripts 2020-02-07 19:00:43 -08:00
Aaron Novstrup
93b0d2a353 replace case .. of syntax with match .. with 2020-02-07 18:59:37 -08:00
Runar Bjarnason
ea9684efaf Fixed argument order and transcripts 2020-02-07 15:17:43 -05:00
Arya Irani
1a653b8a1d refactored load/pull/merge & did cleanup 2020-02-06 17:49:15 -05:00
Arya Irani
72832815eb updated MergeLocalBranchI to use two updates, and not print todo
implement added Lens.Cons and Lens.Snoc instances (closes #1200):

instance Cons Path Path NameSegment NameSegment
instance Snoc Relative Relative NameSegment NameSegment
instance Snoc Absolute Absolute NameSegment NameSegment
instance Snoc Path Path NameSegment NameSegment
instance Snoc Path' Path' NameSegment NameSegment

and class Path.Resolve l r where
  resolve :: l -> r -> l
with
instance Resolve Path Path
instance Resolve Relative Relative
instance Resolve Absolute Relative
instance Resolve Path' Path'
instance Resolve Path' Split'
instance Resolve Absolute Path'
2020-02-06 00:05:34 -05:00
Arya Irani
cd5df7141f add a transcript for corrected builtins.merge 2020-02-04 14:56:12 -05:00
pete-ts
36ec976511 addresses the typo in 'delimiter' 2020-02-02 11:20:20 +00:00
Arya Irani
2f9f627fc6 and the transcript output 2020-01-29 17:14:19 -05:00
Arya Irani
fa475ece81 restore big transcript 2020-01-29 17:09:45 -05:00
Arya Irani
3c43442779 Merge branch 'fix/1042-big-list-crashes' of https://github.com/pete-ts/unison into fix/1042-big-list-crashes 2020-01-29 12:32:37 -05:00
Arya Irani
9d4b802ed5 simplify sample program 2020-01-29 12:31:32 -05:00
pete-ts
3e75584b72 Merge branch 'fix/1042-big-list-crashes' of github.com:unisonweb/unison into fix/1042-big-list-crashes 2020-01-29 16:56:24 +00:00
Arya Irani
fa1930498c minimal stack allocations & minimized transcript for debugging #1042 big list crash 2020-01-28 22:23:25 -05:00
mergify[bot]
84e6446f31
Merge pull request #1177 from pete-ts/feature/1160
fix/1160
2020-01-28 20:10:48 +00:00
Paul Chiusano
c6c52f415e
Merge pull request #1167 from unisonweb/topic/transcript-hide-all
Add ":hide:all" option for unison and ucm fences in transcripts
2020-01-28 12:22:06 -05:00
Pete Tsamouris
b772ccf629 adds the output transcript, issue is fixed 2020-01-27 22:10:13 +00:00
Pete Tsamouris
9008a5ad1c adds a transcript exposing the bug 2020-01-27 22:01:01 +00:00
Chris Gibbs
6ca9bf7c41 stop doc literal normalization unindenting lines that start with @[...] 2020-01-26 15:51:11 +00:00
Pete Tsamouris
bd085e5d30 changes the predicate when extracting fenceType 2020-01-24 21:46:30 +00:00
Pete Tsamouris
c856acb62c adds a transcript to highlight the broken behaviour 2020-01-24 21:35:14 +00:00
Chris Gibbs
91755ddf13 Add unison:hide:all transcript fence option, to suppress both output and the echo of the input
Useful for smuggling secret supporting code into the codebase during a transcript - say if it's not important to the story being told.
2020-01-20 22:46:32 +00:00
Chris Gibbs
1492e21e02 Spec for ":hide:all" in transcripts 2020-01-20 21:41:16 +00:00