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
mergify[bot]
1197a1d719
Merge pull request #1263 from unisonweb/fix/1250
...
Fix #1250
2020-02-25 16:50:20 +00:00
Dan Doel
cbd4de6550
Make lca property tests perform several iterations
2020-02-25 11:40:03 -05:00
Aaron Novstrup
3504d2b091
fix whitespace (?!?)
2020-02-24 15:40:54 -08:00
Dan Doel
a3162a3894
Added property tests for lca
2020-02-24 18:08:20 -05:00
Dan Doel
d18509dc2a
Explain purpose of error cases in merge.md
2020-02-24 16:19:29 -05:00
Dan Doel
8579ef4c8a
Ensure that empty namespaces stay deleted in a merge
...
- In some cases, we compute the contents of a child namespace by merging
the space in one branch with a formal empty namespace. This can result
in the merge producing a similar formal empty namespace. But we
actually want the result to be that the child namespace is removed
from the branch in this case.
2020-02-24 09:55:40 -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
652ae4ac76
Merge pull request #1192 from anovstrup/topic/handle-with-lambdacase
...
Lambda-case `cases` syntax
2020-02-20 11:35:21 -05:00
Paul Chiusano
c898fc238f
Merge pull request #1259 from unisonweb/topic/1203-conditionally-hide-diff-numbers
...
Fix #1203 — useless numbers in pr.create output
2020-02-20 11:20:50 -05:00
Paul Chiusano
e4b8520873
Merge pull request #1262 from unisonweb/topic/gitignore-.unison
...
ignore all .unison stuff in the build dir
2020-02-20 09:34:38 -05:00
Paul Chiusano
9b5c7eb9a3
removed docs, they've been folded into the transcript
2020-02-20 09:27:24 -05:00
Paul Chiusano
4d276bb6fc
refresh transcript output
2020-02-20 09:17:10 -05:00
Paul Chiusano
be8b2106a6
Merge remote-tracking branch 'origin/master' into fix/1250
2020-02-20 09:14:26 -05:00
Paul Chiusano
bea8b43ad0
Merge pull request #1260 from unisonweb/topic/pr.create-backticks
...
remove backticks from pr.load example for github issue happiness
2020-02-20 08:27:56 -05:00
Arya Irani
92c6635842
ignore all .unison stuff in the build dir
2020-02-20 08:26:02 -05:00
Arya Irani
f3dded50ef
add IP.makeExampleNoBackticks, which is still grouped
2020-02-20 07:47:44 -05:00
Arya Irani
a077a62e0c
don't wipe earlier numbered args if you aren't providing any
2020-02-19 18:16:23 -05:00
Arya Irani
f2337b5638
Fix #1203 — useless numbers in pr.create output
...
Didn't spend any thinking through the other cases (e.g. #1234 )
but it will be easy enough to change now by switching
`ShowNumbers` to `HideNumbers`, or adding the field to the
`NumberedOutput` constructor if we need more fine-grained control.
2020-02-19 18:16:23 -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
Dan Doel
441a8341a9
Fixed lca computation algorithm
...
- It was only finding lcas for closely sized histories
2020-02-19 16:44:21 -05:00
Dan Doel
9675066432
Fix Branch merging to handle child namespaces
2020-02-19 14:43:51 -05:00
Paul Chiusano
727270aad2
added some docs, going to turn this into a transcript
2020-02-19 12:45:37 -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
Aaron Novstrup
5949e7e81b
pretty-print cases expressions outside of let bindings; add tests for cases parsing / pretty-printing
2020-02-17 15:57:24 -08:00
Paul Chiusano
e3cf753931
Merge pull request #1252 from unisonweb/topic/revert-915-transcripts
...
remove custom unique type guids from transcripts
2020-02-17 07:33:01 -05:00
Arya Irani
2e887276b9
remove custom unique type guids from transcripts
2020-02-16 23:56:29 -05:00
Paul Chiusano
c9c91a7881
Merge pull request #1237 from anchpop/master
...
Pick GUIDs deterministically when running transcripts
2020-02-16 22:51:52 -05:00
Andre Popovitch
c89d39dc27
added self to CONTRIBUTORS.markdown
2020-02-16 20:28:35 -05:00
Andre Popovitch
bc3c9b2fcd
use different random seeds every time
2020-02-16 20:27:37 -05:00
Andre Popovitch
1eb3dd55ee
use cryptonite instead of system.random
2020-02-16 20:27:37 -05:00
Andre Popovitch
6b304afa22
transcript guid generation is now deterministic
2020-02-16 20:27:37 -05:00
Andre Popovitch
ff62f72784
added way to deterministically generate unique names
2020-02-16 20:27:36 -05:00
Aaron Novstrup
87757fb305
pretty-print lambda-case in let bindings
2020-02-15 14:33:22 -08:00
Paul Chiusano
6edd189632
Merge pull request #1249 from unisonweb/topic/cleanup
...
minor cleanup
2020-02-14 18:41:05 -05:00
Arya Irani
e60971675c
minor cleanup
2020-02-14 16:58:36 -05:00
Aaron Novstrup
894f2fb5ce
parse (cases) lambda-case syntax
2020-02-14 08:42:41 -08:00
Arya Irani
dc09964f7f
fix case/of syntax in transcript to match/with per master
2020-02-14 10:18:57 -05:00
Aaron Novstrup
3e95f5ff81
fix stray instances of case .. of
2020-02-13 17:37:32 -08: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
mergify[bot]
81cb50bc69
Merge pull request #1229 from moses-alexander/remove-dead-prettyAliases-code
...
Remove dead prettyAliases function
2020-02-13 17:00:58 +00:00
moses-alexander
af3fff1794
Merge branch 'remove-dead-prettyAliases-code' of github.com:moses-alexander/unison into remove-dead-prettyAliases-code
...
merge
2020-02-13 11:30:01 -05:00
moses
84f06c8442
add name to contributors.md
2020-02-13 11:29:16 -05:00
moses-alexander
ce9fd22837
remove dead code
2020-02-13 11:29:16 -05:00
