unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-23 08:18:04 +03:00
Code Issues Projects Releases Wiki Activity
7,512 Commits 419 Branches 90 Tags 331 MiB
6ac56a68db
Commit Graph

335 Commits

Author SHA1 Message Date
Paul Chiusano
de8086c9cf fix bug with variable name generation 2020-10-09 18:22:15 -04:00
Paul Chiusano
d872eca0c8 added transcript, but noticed that some hashes differ unexpectedly 2020-10-09 18:10:16 -04:00
Stew O'Connor
f55784b2a8 add a transcript for the new utf8 conversions 2020-10-09 09:44:22 -07:00
Paul Chiusano
9ed2a46310 Finish up transcript and tests 2020-10-07 11:21:15 -04:00
Paul Chiusano
65acd453b9 Merge remote-tracking branch 'origin/trunk' into topic/basic-hashing 2020-10-07 09:36:09 -04:00
Dan Doel
0a498a922c Add a test transcript for recursive dependencies 2020-10-06 17:45:19 -04:00
Paul Chiusano
238dfbe26c sync with master 2020-09-30 18:55:11 -04:00
Paul Chiusano
7de847ce0d Improved transcript docs and have pretty-printer avoid using the syntax for patterns that *contain* literals. Thanks @atacratic! 2020-09-30 18:03:54 -04:00
Chris Gibbs
37bcd95009 tweak interaction between destructuring bind and calculate imports (use insertion) 2020-09-30 22:16:47 +01:00
Paul Chiusano
23d06faa1f Add transcript 2020-09-28 13:09:55 -04:00
Dan Doel
4d1a0d1e4b Transcript updates 2020-09-22 13:31:25 -04:00
Dan Doel
45208bb4bf Transcript changes 2020-09-21 17:25:30 -04:00
Dan Doel
c7807253a5 Transcript changes for missing thread operations 2020-09-14 13:15:44 -04:00
Dan Doel
2c55c2b679 Commit transcripts that changed from MVar additions 
- Added a note to the builtin document specifying that transcripts
  should be checked.
 2020-09-03 15:40:50 -04:00
Dan Doel
67bf4aedfd Fix transcripts after IO naming fixups 2020-08-24 13:29:01 -04:00
Dan Doel
d555693423 Merge branch 'trunk' into wip/rt2 2020-08-19 10:59:08 -04:00
dolio
b58d222b22
Merge pull request #1649 from unisonweb/wip/rt2-patternp 
merge topic/patternp into wip/rt2
 2020-08-18 16:41:03 -04:00
Dan Doel
3091d34b34 Commit transcript changes for new builtins 
- These were generated using the existing runtime
 2020-08-18 15:16:52 -04:00
Runar Bjarnason
ed621377c4 Merge branch 'trunk' of github.com:unisonweb/unison into topic/nohistoricsearch 2020-08-11 21:39:10 -04:00
Runar Bjarnason
d9fc1dfdc5 Update transcript outputs 2020-08-11 21:35:29 -04:00
Joseph Thomas
82617d7816 Update transcript test to reflect new behaivor. 2020-07-26 18:38:03 -06:00
mergify[bot]
628c30058a
Merge pull request #1623 from unisonweb/topic/bug1574 
Show names from merged namespace after merge
 2020-06-19 23:02:38 +00:00
Runar Bjarnason
d492640856 Name conflict output is slightly different 2020-06-19 15:04:49 -04:00
Runar Bjarnason
db6c45b333 Update transcripts since links now auto-propagate 2020-06-19 00:38:17 -04:00
Runar Bjarnason
a71f25f071 Added a transcript 2020-05-29 13:36:43 -04:00
Runar Bjarnason
ce10585b12 Improve default metadata handling of "." 2020-05-28 23:27:36 -04:00
Runar Bjarnason
cbbd656443 Simplify path parsing 2020-05-28 22:45:27 -04:00
Runar Bjarnason
f57d208311 wip 2020-05-28 15:02:33 -04:00
Runar Bjarnason
3037ae5d74 Fix bug #689 2020-05-26 17:59:27 -04:00
Paul Chiusano
607f7daa9b Added transcript and fixed subtle bug 2020-05-21 00:19:41 -04:00
Arya Irani
5a30490bd3
Merge pull request #1543 from pt2121/pt/1408-numbered 
Make dependents and dependencies commands produce numbered args.
 2020-05-18 14:23:56 -04:00
Paul Chiusano
d00bbbbed6 Tweak output of merge history to not be upside down 2020-05-15 18:30:01 -04:00
Arya Irani
61fe5effa3
Merge branch 'master' into pt/1408-numbered 2020-05-15 17:37:24 -04:00
Prat T
9fe1c408a7
Link number from dependents and dependencies result to hash 2020-05-10 17:22:45 -07:00
Prat T
d4327b54c5
Make dependents and dependencies commands produce numbered args. 
Format dependent and dependencies outputs
 2020-05-09 15:50:52 -07:00
Runar Bjarnason
26ed291fdf Improved threeWayMerge, before, and less dead code 2020-05-07 17:03:39 -04:00
Paul Chiusano
86d817a3f3 Regenerate transcripts 2020-05-04 22:46:16 -04:00
Chris Gibbs
ba77022f20 remove stray extra argument from declaration of Nat.complement and Int.complement builtins 2020-04-26 14:22:10 +01:00
Paul Chiusano
b2171ec84a
Merge pull request #1456 from stew/bitwise-operations 
Add more bitwise operations to Int/Nat
 2020-04-23 14:55:24 -04:00
Runar Bjarnason
54e6aebbb5 Add a transcript 2020-04-23 13:43:47 -04:00
Stew O'Connor
fd7e23464e rerunning transcripts for new Int/Nat bitwise builtins 2020-04-22 14:48:49 -07:00
Arya Irani
193882e8d4
Merge pull request #1440 from pete-ts/suffixied-update-output 
Suffixied `update` output
 2020-04-20 23:22:13 -04:00
Arya Irani
1a9f021d99
Merge pull request #1428 from unisonweb/fix/decompile-bytes-fromList 
`Bytes` values should decompile to `Bytes.fromList`, not `Bytes.fromSequence`
 2020-04-20 23:00:47 -04:00
Runar Bjarnason
b605b46aeb Transcript output 2020-04-20 15:52:42 -04:00
Runar Bjarnason
1e8d9ee472 Merge branch 'master' of github.com:unisonweb/unison into topic/default-metadata 2020-04-20 14:03:40 -04:00
pete-ts
2e102fd5bb Updates transcript outputs with revised output 2020-04-20 16:01:42 +01:00
pete-ts
34b647fb7c Text literals can display non-ascii chars 2020-04-17 22:19:38 +01:00
Runar Bjarnason
45daaf8574 Regression test for #763 2020-04-15 16:43:42 -04:00
Stew O'Connor
636c86f6e7 Merge remote-tracking branch 'origin/master' into new-Int-operations 2020-04-14 16:17:36 -07:00
Stew O'Connor
076a594ca9 updated transcripts to include new pow/shiftRight/shiftLeft builtins 2020-04-14 14:20:12 -07:00
Runar Bjarnason
abb81dac8a Detour to let parseHQSplit' handle symbols 2020-04-14 16:04:27 -04:00
Paul Chiusano
9255694b52 fix bug when decompiling Bytes values - it incorrectly produced nonsense builtin 
added transcript to verify
 2020-04-14 09:47:56 -04:00
Paul Chiusano
b2e0d5b6e3
Merge pull request #1424 from unisonweb/topic/1363-doc-space-glitch 
Couple of fixes to whitespace handling in doc literals
 2020-04-13 15:28:24 -04:00
pete-ts
f4f6c1baa2 Removes call to mergeio, changes to alias instead 2020-04-13 18:08:15 +01:00
pete-ts
4a0fb261f1 Swaps the arguments and output sequence of ListNames 2020-04-13 17:55:45 +01:00
Chris Gibbs
b3a4f497f0 Another fix to doc literal whitespace handling 
Stop eating spaces that immediately follow @[source], @[evaluate] or @[include] directives on the same line, while unindenting.

Also fix docs.md so its example isn't asking for line-wrapping.
 2020-04-13 17:27:58 +01:00
Chris Gibbs
8dfc25e68d Merge branch 'master' into topic/1363-doc-space-glitch 2020-04-13 16:07:21 +01:00
Arya Irani
0432f39b7f add builtins.mergeio example to the emptyCodebase.md transcript test 2020-04-09 17:52:04 -04:00
Arya Irani
6b2e2c376d Merge branch 'master' into topic/merge-builtins-on-merge-builtins 
# Conflicts:
#	parser-typechecker/src/Unison/Codebase/FileCodebase.hs
 2020-04-09 17:42:56 -04:00
mergify[bot]
b876c9e788
Merge pull request #1407 from pete-ts/transcript-for-metadata-ambiguous 
Add a transcript testing the ambiguous metadata error
 2020-04-09 00:11:02 +00:00
Arya Irani
ca76d3686b delay serializing IOSource definitions to codebase until builtins.merge 
and actually not until `builtins.mergeio`.

I would have liked to delay typechecking in IOSource.hs altogether, but
it being forced somewhere that was not immediately obvious to me.

This shouldn't impact anyone who already has `.base` or some other copy
of the io primitives, and the upshot is saving some time on transcripts.

`builtins.merge` will give you everything that's in `Unison.Builtin` and
`Unison.Builtin.Decls`, `builtins.mergeio` will give you those plus the
stuff in `Unison.Runtime.IOSource`.
 2020-04-08 19:34:43 -04:00
mergify[bot]
ddadb6c0c4
Merge pull request #1405 from noahhaasis/issue-1402 
Fix #1402: Only display watch message if there're watch expressions
 2020-04-08 18:31:56 +00:00
Arya Irani
81b6679bf3 update transcripts 2020-04-08 14:25:19 -04:00
mergify[bot]
f496288c93
Merge pull request #1345 from pete-ts/fix-1295-c 
Failing transcripts should always show the failing stanza
 2020-04-08 17:03:33 +00:00
mergify[bot]
e7fd115eeb
Merge pull request #1401 from unisonweb/topic/dependents-dependencies-debug.file 
implement `dependents <x>`, `dependencies <x>`, and `debug.file`
 2020-04-08 00:27:30 +00:00
Arya Irani
8438c3a7d8 add column headings and transcript for dependents/dependencies 2020-04-07 20:21:33 -04:00
pete-ts
0daeea86d4 Adds a transcript testing the ambiguous metadata error 2020-04-07 22:03:09 +01:00
Arya Irani
5bfe950850 hide some transcript output 2020-04-03 20:57:10 -04:00
Arya Irani
b73b2c8fa2 implemented create.author command 
closes #1392
 2020-04-03 20:49:07 -04:00
pete-ts
b537682842 updates unexpected error ucm blocks, to select a command that is not a failure 2020-03-24 18:17:48 +00:00
Arya Irani
8863c6a0ef add failing transcript 2020-03-23 19:09:01 -04:00
Arya Irani
bf59f60076
Merge pull request #1372 from pete-ts/fix/1339 
Removes empty string at the end of Name.suffixes output and unittests
 2020-03-22 17:32:58 -04:00
pete-ts
9838b7cbd1 removes Twoolean and == from transcript 2020-03-21 16:59:43 +00:00
mergify[bot]
ac9b5dcd10
Merge pull request #1368 from unisonweb/fix/1356 
Make `link`, `unlink`, and `diff.namespace` work with unnamed metadata (fix for #1356)
 2020-03-20 22:53:01 +00:00
Paul Chiusano
6c0dc0d188 Merge remote-tracking branch 'origin/master' into fix/view-suffixified 
# Conflicts:
#	parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs
#	parser-typechecker/src/Unison/CommandLine/InputPatterns.hs
 2020-03-20 18:16:25 -04:00
Paul Chiusano
95b8517bb1 display gets same treatment 2020-03-19 14:30:30 -04:00
Paul Chiusano
781b2ad5d7 Fix #1241 2020-03-19 14:18:56 -04:00
Runar Bjarnason
f77e116579 Handle misses better 2020-03-19 13:04:25 -04:00
Runar Bjarnason
68021e80ff Transcripts changed 2020-03-18 22:51:49 -04:00
Paul Chiusano
083ed75f3e Metadata display in BranchDiff now uses HashQualified rather than HashQualified'. 2020-03-18 21:56:02 -04:00
Paul Chiusano
ec1a60b83c Transcript refresh 2020-03-18 14:39:24 -04:00
Paul Chiusano
e7c89749b9 Fixed issue with Metadata.delete, transcript now passes! 
Issue was that it was unilaterally deleting the D2 dimension for whatever type was being unlinked (this is the dimension that supports efficient lookup by metadata type - "find me all the docs"). Correct behavior is to only delete from this dimension when there are no more metadata values for a metadata type - for instance, if you delete the last `Doc`, you can delete the index that lets you find all the docs.
 2020-03-18 14:23:38 -04:00
Chris Gibbs
991e266267 Part of a fix for #1363 - preservation of spaces after @ directives in first line when unindenting 
Still need to dig into impact on docs.output.md.
 2020-03-16 23:06:17 +00:00
Runar Bjarnason
4601e293a7 Added transcript 2020-03-13 22:54:31 -04:00
Paul Chiusano
57e14ee3f7 Removed all but one calls to fromJust and added failing transcript 2020-03-13 17:05:48 -04:00
pete-ts
414f4c0128 updates the error not found message 2020-03-12 21:24:58 +00:00
Paul Chiusano
c91a9a7d7f
Merge pull request #1334 from unisonweb/topic/alias-hashonly 
supporting hashes in `alias`; and names and builtins in `replace`
 2020-03-12 09:38:56 -04:00
pete-ts
4d2d044892 adds the outputs of the failing transcripts 2020-03-12 10:13:47 +00:00
pete-ts
94cf0bd591 adds ucm and unison transcripts that fail with unexpected error or unexpected success 2020-03-12 10:10:20 +00:00
Arya Irani
6b5d60cb20 misc todos for #1334: 
- simplify resolveHHQS'Referents
- add missing logic to TermReferentsByShortHash
- don't pass Codebase just to get deserializers
- improve transcript prose
 2020-03-11 21:56:33 -04:00
Arya Irani
5d5f96bcaa add transcript 2020-03-11 16:44:09 -04:00
Paul Chiusano
59e55f0337 Fix #1225 
Uses a post-order traversal of the branch, rebuilding from the bottom up and visiting each node exactly once.
 2020-03-09 22:27:01 -04:00
Runar Bjarnason
64848d5d4e Don't show the name of the term 2020-03-06 10:59:13 -05:00
Rúnar
b5cae909fc
Fix #1276 hang on push (#1279) 
* Fix a bug that causes loops in Causal.
* Ignore loops in Causal when calling sync.
* Fix warnings in Causal test.
* Added a regression test transcript.
 2020-03-02 17:32:07 -05:00
Arya Irani
a252a6eafc add transcripts 2020-03-02 20:12:12 +01:00
Arya Irani
0af4df95b8 add transcripts 2020-03-02 18:50:49 +01:00
Arya Irani
f708f29e33
allow add/update to create aliases (#1254) 2020-02-25 16:15:36 -05:00
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
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
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
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
Mitchell Rosen
38fdcd01a1 Use namespace diff in link output 2020-01-20 14:36:09 -05:00
Arya Irani
de10551edd update the transcript outputs after the sorting changes in 5bf4a200 2020-01-17 16:27:47 -05:00
Paul Chiusano
b3b43e193d Merge remote-tracking branch 'origin/master' into diff.namespace 
# Conflicts:
#	parser-typechecker/src/Unison/Util/Pretty.hs
 2020-01-17 15:07:58 -05:00
Chris Gibbs
22ebf28e8a #936 pretty-print doc literals - improve commenting 2020-01-16 22:54:52 +00:00
Arya Irani
2aedaa2e2f remove traces and fix OBD.isEmpty 2020-01-16 16:58:31 -05:00
Chris Gibbs
22802b90cb #936 pretty-print doc literals - last tests and fixes 2020-01-16 21:55:41 +00:00