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,598 Commits 419 Branches 90 Tags 331 MiB
27e80e61cf
Commit Graph

874 Commits

Author SHA1 Message Date
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
Stew O'Connor
c799ca25d4 additional bitwise operations for Int, Nat 
This adds a few bitwise operations to both Int and Nat:
and or xor compliment leadingZeros trailingZeros.
 2020-04-22 14:43:13 -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
Stew O'Connor
4e06966fde Changes suggested by Paul 
* exponents are all typed as Nat instead of Int
* renamme <<, >> to shiftLeft, shiftRight
* add Nat.{pow,shiftRight,shiftLeft}
* add source tests for Int / Nat

(Thanks @pchiusano!)
 2020-04-14 14:16:30 -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
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
Mitchell Rosen
38fdcd01a1 Use namespace diff in link output 2020-01-20 14:36:09 -05:00
Aaron Novstrup
ec87a60254 fix pretty-printing of handle blocks and fix tests broken by handle-with syntax 2020-01-18 00:49:15 -08: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
Chris Gibbs
e0da5f843c #936 pretty-print doc literals - small fix 2020-01-16 21:50:25 +00:00
Arya Irani
c8136c02dd fix hq bracket alignment and hide some blank lines 2020-01-16 16:39:41 -05:00
Arya Irani
af3f72a822 hide isPropagated in updates, + cleanup 2020-01-16 15:50:50 -05:00
Arya Irani
84207dcc1a don't separately list changed metadata of a definition as part of an update 2020-01-16 14:56:16 -05:00
Arya Irani
96c556ca8b tried to fix regression in Update vs Add/Remove, but not quite there yet. 2020-01-16 13:26:28 -05:00
Arya Irani
8f66210115 split updatedTerms into updatedTerms, newTermConflicts, resolvedTermConflicts 2020-01-16 12:26:33 -05:00
Paul Chiusano
546048261a deleting isPropagated metadata when user does an update for a hash and when propagating and the hash is a target in the patch 2020-01-15 17:52:50 -05:00
Arya Irani
eb0df15e00 update checklist 2020-01-15 13:25:36 -05:00
Arya Irani
0c345c4e1e couple more issues to fix :( 2020-01-14 17:14:25 -05:00
Arya Irani
f1a6f16fe1 switch tallnamespaceUpdates representation & trying to fix bugs 2020-01-14 17:13:52 -05:00
Arya Irani
19181bf2bb finish up the various ShowDiff* outputs 2020-01-14 14:23:49 -05:00
Paul Chiusano
8b9845891a Tweak ordering or adds/removes section - constructors come first 2020-01-10 17:35:33 -05:00
Paul Chiusano
a0844d7652 fix bug: deleted terms with metadata being shown in updates section 2020-01-10 17:05:56 -05:00
Paul Chiusano
6fa73ada53 tweaked formatting of name changes section 2020-01-10 16:32:41 -05:00
Arya Irani
20bc394ec9 Merge branch 'diff.namespace' of github.com:unisonweb/unison into diff.namespace 2020-01-10 12:38:58 -05:00
Arya Irani
30ee10c81e tune up diff output for add/remove groups 2020-01-10 12:38:53 -05:00
Paul Chiusano
6cc988acdc some output tweak proposals 2020-01-10 11:55:09 -05:00
Arya Irani
3a4d2769cd fix some dif.namespace output things (?) 2020-01-10 10:25:07 -05:00
Paul Chiusano
2012f1bb78 more formatting fixes, pulled out column3M and using that in diff formatting now 2020-01-09 11:47:31 -05:00
Paul Chiusano
4bcd58ecef fleshed out transcript some more, fixed a number of bugs 2020-01-08 16:32:18 -05:00
Paul Chiusano
1b8023ce9d WIP on transcript, some formatting tweaks to diff output 2020-01-08 12:51:49 -05:00
Chris Gibbs
f1cb1c943e Merge branch 'master' into topic/docs-936-pretty-literals 2019-12-21 22:09:12 +00:00
Chris Gibbs
e0d49eac06 #936 pretty-print doc literals - draft of parse-time doc normalization - needs debugging 2019-12-21 22:07:11 +00:00
Chris Gibbs
81ce53a4af #936 pretty-print doc literals - paragraphyText now uses wrapPreserveSpaces 2019-12-19 00:08:47 +00:00
Arya Irani
ba85e9a0d1 update transcripts output for metadata.IsPropagated 2019-12-16 20:33:43 -05:00
Chris Gibbs
776af61064 #936 pretty-print doc literals - spec out modified paragraph reflow/wrapping 
Currently Unison takes doc literals like

  [:
  example usage:
   - note the call to bar
     - we pass it 1
  foo =
    bar 1
      baz
  :]

and renders them as

  [: example usage:
  - note the call to bar
  - we pass it 1
  foo =
  bar 1
  baz :]

due to the paragraph reflow/wrapping function.

Also, this function only works the first time you use it on a doc: if you `edit` a doc and mess with it, you won't get the wrapping refreshed the next time you view.  That's because the pretty-printing works by inserting newlines, which are treated as paragraph breaks by Unison the next time it sees the code.

I'm planning to fix this by
 - only doing paragraph reflow/wrapping for lines with zero indent (where zero is the left-most non-whitespace column of the doc)
 - normalizing docs during parse, including removing newlines that are within a paragraph.

See unison-src/transcripts/doc-formatting.md in this commit for more details of how this shakes out.  Not the .md.output because that's showing the current behavior without this change implemented.

Hopefully this is just a few more lines of code to implement, and then #936/#994 is good to merge.
 2019-12-16 23:32:36 +00:00
Chris Gibbs
8f284d902c #936 pretty-print doc literals - unbuggify doc unindenting 2019-12-15 15:25:29 +00:00
Mitchell Rosen
764b2f4ae8 Show term/type hashes (for adds/removes) in diff output, if ambiguous 2019-12-15 09:13:48 -05:00
Mitchell Rosen
c4a10bbe53 Show branch diff after delete 2019-12-14 23:06:27 -05:00
Chris Gibbs
6be8932b38 #936 pretty-print doc literals - unindent docs after parsing - unfinished 
Causes some bogus changes to docs.output.md which I need to debug.
 2019-12-14 18:15:32 +00:00
Paul Chiusano
3db0403865 tweak verbiage of hello transcript 2019-12-13 16:29:31 -05:00
Paul Chiusano
7814fd4b78 Merge remote-tracking branch 'origin/master' into fix/987 
# Conflicts:
#	unison-src/transcripts/merges.output.md
#	unison-src/transcripts/reflog.output.md
 2019-12-12 15:03:27 -05:00
Paul Chiusano
109fbdbc7a Added extensive. transcript 2019-12-11 17:25:32 -05:00
Paul Chiusano
a10f540975 tweak to orderedComponents implementation 2019-12-11 14:07:08 -05:00
Chris Gibbs
81668b644a Merge branch 'master' into topic/docs-936-pretty-literals 2019-12-11 18:51:15 +00:00
Arya Irani
f77836ca0d
Update todo-bug-builtins.output.md 2019-12-11 10:56:07 -05:00
Arya Irani
7dd79ed4b0
Update todo-bug-builtins.md 2019-12-11 10:55:35 -05:00
Noah Haasis
239c06623d Update todo bultin transcript to run deterministically 2019-12-11 14:52:00 +00:00
Noah Haasis
6d43893f60 Update all changed transcript outputs 2019-12-10 05:21:04 +00:00
Noah Haasis
7dd8cb7935 Merge branch 'master' of https://www.github.com/unisonweb/unison into todo-builtin 2019-12-10 05:15:58 +00:00
Noah Haasis
f1538906c6 Add transcript output for todo-bug-builtins 2019-12-10 04:39:36 +00:00
Mitchell Rosen
df0fc25a18 Improve delete term/type feedback 2019-12-09 22:35:29 -05:00
Paul Chiusano
5cd328bf53 refresh transcripts - these changed because root namespace hash changed 
due to blocks getting hashed differrently
 2019-12-09 14:57:21 -05:00
Paul Chiusano
e46ceb8cee Merge remote-tracking branch 'origin/master' into fix/987 2019-12-09 14:46:38 -05:00
Mitchell Rosen
6d8ea064c1 Add 'delete' command, which combines 'delete.term' and 'delete.type' 2019-12-08 17:29:47 -05:00
Paul Chiusano
8b72eb311a added.transcript 2019-12-08 15:23:39 -05:00
Noah Haasis
eb1ff619ee Add implementation for Nat.toFloat 2019-12-02 14:48:08 +00:00
Chris Gibbs
8ee3ea30f8 \:] to escape :] in doc literals 2019-11-30 15:58:31 +00:00
Chris Gibbs
02f3048752 #936 pretty-print doc literals - merge through suffixy names 2019-11-24 22:16:51 +00:00
Chris Gibbs
a4c6dde06a Merge branch 'master' into topic/docs-936-pretty-literals 2019-11-24 22:05:17 +00:00
Chris Gibbs
408f4ca393 #936 pretty-print doc literals - done, with some snags remaining 2019-11-24 22:04:20 +00:00
Paul Chiusano
504e53bbc5 resolve.{term,type} => replace.{term,type} and updated transcripts 
Also curiously transcripts with invalid commands would just silently noop. Now they fail the transcript.
 2019-11-21 13:01:46 -05:00
Paul Chiusano
9a0350a669 Address PR comments 2019-11-19 11:28:23 -05:00
Paul Chiusano
00d0fc8c56 type based search uses suffixed input + regenerated transcripts 2019-11-13 13:57:51 -08:00
Paul Chiusano
aa4990848e Merge remote-tracking branch 'origin/master' into topic/suffix-resolve 
# Conflicts:
#	parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs
#	parser-typechecker/src/Unison/Codebase/Editor/Output.hs
 2019-11-13 13:01:57 -08:00
Arya Irani
bf631d2fcd support remote Unison paths in push/pull (#935) 
* wip git url parser & some Git module cleanup

* modern-uri

* trailing whitespace

* dice up the git uri parser for more easily testable implementation

* ipv6 address reference

* add an ipv4 test for `UriParser.parseProtocol`

* remove duplicate test and typo

* add some autocompletion shortcuts for git urls

* clean up gitUrlArg

* partially update `push` and `pull` InputPatterns & docs

* it compiles!

* sometimes even comments can break the build

* missed a couple of `gitIn`s, so command executed in wrong working dir

* delete UriParser.webRepoParser in favor of autocompletes

* bikeshedding the ConfiguredGitUrlIncludesShortBranchHash error message

* cleanup

* simplify push/pull help

* pretty-print reflog entry for `pull` using RemoteRepo.printNamespace
 2019-11-12 16:52:48 -05:00
Paul Chiusano
d6b903cdca hook up suffix-based resolution to the parser + add test case for it 2019-11-11 16:33:31 -08:00
Noah Haasis
fd166b4c41 Add a transcript testing the behaivour of todo and bug 2019-11-09 12:44:58 +00:00
Paul Chiusano
93ad88a4ac sync master 2019-11-08 08:39:04 -05:00
Paul Chiusano
87ee95bf3e
Merge pull request #944 from unisonweb/topic/edit.all 
View/edit multiple definitions
 2019-11-07 21:16:14 -05:00
Arya Irani
10aebd6211 fix #942; have propagate write new terms and types as it goes 2019-11-07 17:52:20 -05:00
Runar Bjarnason
edf28247c3 Added a transcript for numeric arguments 2019-11-07 16:53:24 -05:00
Paul Chiusano
da9ab8dcdb Add broken test 2019-11-07 16:24:54 -05:00
Paul Chiusano
37c5542390 Merge remote-tracking branch 'origin/master' into topic/docs 2019-11-07 15:14:47 -05:00
Chris Gibbs
7524f0d654 #936 pretty-print doc literals - skeleton 2019-11-06 23:02:05 +00:00
Arya Irani
6b415149d0 update out-of-sync transcript outputs 2019-11-05 08:17:32 -05:00
Paul Chiusano
d296266602 simplify paragraphyText, it's now much better behaved 2019-11-04 21:15:13 -05:00
Paul Chiusano
d28e532aa6 update docs example 2019-11-04 18:18:36 -05:00
Paul Chiusano
d3ab6ae190 Added a documentation transcript 2019-11-04 18:00:25 -05:00
Paul Chiusano
83be276cd1
Merge pull request #901 from unisonweb/topic/links 
First class links / references as Unison values
 2019-10-30 15:06:24 -04:00
Runar Bjarnason
c7722061a0 Workaround for unique type guid nondeterminism 2019-10-30 13:20:59 -04:00
Runar Bjarnason
ecd79f3d1c Merge branch 'master' of github.com:unisonweb/unison into topic/propagatetypes 2019-10-30 11:43:04 -04:00
Runar Bjarnason
6d95544bc2 I accidentally a line. 2019-10-30 11:42:32 -04:00
Paul Chiusano
646733981e Merge remote-tracking branch 'origin/topic/propagatetypes' into topic/links 2019-10-30 09:44:37 -04:00
Paul Chiusano
41ef402e4f Added test case 2019-10-28 21:18:17 -04:00
Runar Bjarnason
1636d8ea32 I accidentally this file 2019-10-28 16:25:28 -04:00
Paul Chiusano
63122606f7
Merge pull request #902 from unisonweb/topic/891b 
display synthetic reflog entries for initial and external changes
 2019-10-28 15:39:37 -04:00
Arya Irani
cce64e3c03 change "branch" to "namespace" 2019-10-28 15:11:57 -04:00
Arya Irani
2dfb7958e9 update transcripts 2019-10-28 15:02:39 -04:00
Paul Chiusano
77e16533cb Merge remote-tracking branch 'origin/topic/propagatetypes' into topic/links 
# Conflicts:
#	parser-typechecker/src/Unison/Term.hs
 2019-10-28 14:42:18 -04:00
Noah Haasis
dcbf1dee25 Allow boolean operators to be used in sequence 2019-10-27 10:47:49 +00:00
Runar Bjarnason
ef640acb3b Make sure propagation only applies to local branch 2019-10-24 15:19:57 -04:00
Runar Bjarnason
38f7d1eda2 Test the preservation of user type variables 2019-10-23 15:27:35 -04:00
Runar Bjarnason
b35cc5875f Make the propagation actually replace stuff 2019-10-23 12:51:35 -04:00
Paul Chiusano
b28fad6172
Merge pull request #883 from noahhaasis/char-comparison 
Implement ordering for char literals (fix #850)
 2019-10-21 13:45:31 -04:00
Noah Haasis
c6c8c46798 test char comparison 2019-10-21 17:06:07 +00:00
Paul Chiusano
130519b258
Merge pull request #880 from noahhaasis/infix-boolean-operators 
Infix boolean operators (Fix #530)
 2019-10-21 11:32:32 -04:00
Noah Haasis
f312f8fc62 Update tests to use infix boolean operators and backtrack on failure 2019-10-20 14:16:33 +00:00
George Marrows
8abeb68331 Add Char test to literals.u 2019-10-20 15:16:58 +03:00
Arya Irani
6bce3188e1
Merge pull request #875 from noahhaasis/guard-and-or 
Fix #770: Allow boolean operators in pattern guards
 2019-10-19 13:06:19 -04:00
Arya Irani
4c2a8f23e1 add a transcript test to close #873 2019-10-19 11:01:12 -04:00
Noah Haasis
b12f3e9f77 Allow boolean operators in pattern guards 2019-10-19 13:53:44 +00:00
Arya Irani
a570e63baf fix #868, #870 2019-10-16 15:23:16 -04:00
Noah Haasis
9b68fedcee
Update link to language reference in readme (#864) 
Update readme to point to the new language reference on unisonweb.org and delete the old reference
 2019-10-14 13:13:49 +02:00
Prat T
d49164fdb8 Add a transcript for find-patch 2019-10-11 22:20:57 -07:00
Arya Irani
93647cd8da expand numbered args in TranscriptParser 2019-10-11 15:49:25 -04:00
Arya Irani
fba10a4a62 Merge branch 'master' into topic/reflog 
# Conflicts:
#	unison-src/transcripts/merges.output.md
 2019-10-10 18:55:19 -04:00
Arya Irani
006b8837f6 add transcript test for reflog 2019-10-10 18:45:53 -04:00
Paul Chiusano
d0f15c917e improved parsing of ShortBranchHash by not trying to use the base32hex decoder, just do alphabet check 2019-10-09 18:39:43 -04:00
Paul Chiusano
8ce44ccca4 fix #849 2019-10-07 15:55:01 -04:00
Paul Chiusano
1f827886d2
Merge pull request #847 from noahhaasis/fix-issue-785 
Fix #785: Allow sequence literals as arguments to constructors
 2019-10-07 09:49:21 -04:00
Noah Haasis
2bce239af8 Add test for parsing a sequence literal as an argument 2019-10-07 13:33:09 +00:00
Runar Bjarnason
51852b6414 Resolve merge bug between resolve.term and init 2019-10-03 16:37:55 -04:00
Rúnar
392b25068a
Runarorama/317 resolve edit command for resolving edit (#830) 
* Fixed branchdiff semigroup
* Fixed patch diff application in 3-way merge
* Added a transcript for resolve.term
 2019-10-03 12:59:12 -04:00
Paul Chiusano
ec4e952b9d added merge transcript test 2019-09-24 13:13:52 -04:00
Paul Chiusano
ebe1e05849 test harness for running integration tests 2019-09-24 12:10:35 -04:00
Arya Irani
8cee89dc29 rename Builtins in initial namespace construction, and update tests 
- () -> Unit
- ().() -> Unit.Unit
- Pair -> Tuple
- Pair.Pair -> Tuple.Cons
- Sequence -> List
- Effect -> Request
- {Int,Nat,Float,Text}.{==,<,<=,>,>=} -> {Int,Nat,Float,Text}.{eq,lt,lteq,gt,gteq}
- mark Text.!= as a deprecated builtin
 2019-08-22 16:34:12 -04:00
Scott Christopher
3b46f5d780 Fixes #739: Add optional semi to record field separators in FileParser 2019-08-21 21:09:30 +10:00
Paul Chiusano
133589002a remove garbage past the fold 2019-08-19 16:36:40 -04:00
Paul Chiusano
30eb92c90e added failing test 2019-08-19 16:32:00 -04:00
Runar Bjarnason
ccfbfa6df0 Tests for int/float/text roundtrips 2019-08-16 22:54:16 -04:00
Runar Bjarnason
6b09e30e9d Fix text with !! in a name 2019-08-03 23:34:11 -04:00
Paul Chiusano
3c6fa57856 Fix #595 2019-07-27 00:17:29 -04:00
William Carroll
95632a2c75 Rename unison2 -> unison 
Prefer "unison" to "unison2" for the executable.

See this thread for more details:
https://github.com/unisonweb/unison/issues/593#issuecomment-515462774
 2019-07-26 15:03:13 +01:00
Paul Chiusano
dfeb9f7bc2 pending test per #595 2019-07-24 19:04:49 -04:00
Paul Chiusano
726d25445d lexer change and test for allowing closing ) to be past the end of a layout block, example is like - 
ex2 = '(let
  use List ++
  [1] ++ [3]
)
 2019-07-19 14:08:43 -04:00
Paul Chiusano
0800a02c0d wildcard imports fixes #579 2019-07-17 23:24:22 -04:00
Paul Chiusano
6f4a18fcdb dots are BACK and ready for action 🎸🤘 was like a 2 line change 
added tests for this and also added result file for the semis.u test
 2019-07-13 22:15:54 -04:00
Paul Chiusano
2abc45c08f allow actual semicolons, for the occasional one-liner 2019-07-13 21:33:07 -04:00
Paul Chiusano
740cc7e570 131 failures - fix bug in Term.freeTypeVars that was causing some tests to fail 2019-07-12 00:46:14 -04:00
Chris Gibbs
ea27c162a2 #287 pretty-print in color - colored in data declarations 2019-07-06 16:32:02 +01:00
Chris Gibbs
52d5de1d4e Merge branch 'wip/branchless' into topic/287-prettyprint-color 2019-07-06 15:25:13 +01:00
Paul Chiusano
ba976142c9 new and improved add/update output 2019-07-03 17:08:32 -04:00
Paul Chiusano
7e4d87d1c1 fix #514 2019-07-02 22:59:49 -04:00
Paul Chiusano
0b1ace1c92 use . Nat now works to give .Nat the local name Nat, also simplified use statement parser 2019-07-02 20:18:11 -04:00
Chris Gibbs
765e938c41 #287 pretty-print in color - fix test 2019-07-01 23:17:46 +01:00
Chris Gibbs
cd283c69b5 #287 pretty-print in color - add example that hits all the colors 2019-07-01 23:17:46 +01:00
Paul Chiusano
77bbe47c8f fix #528 2019-06-30 23:16:57 -04:00
Arya Irani
1b0588d17a renames and cleanup 2019-06-29 12:05:50 -04:00
Paul Chiusano
0612e27a27 further minimized 2019-06-28 14:26:09 -04:00
Paul Chiusano
add1e992cb minimized #528 to totally self contained example 2019-06-28 11:43:27 -04:00
Paul Chiusano
173aad36d3 pending test for #528 2019-06-28 11:41:32 -04:00
Runar Bjarnason
d6511c3204 Usability changes to testing lib 2019-06-28 10:00:54 -04:00
Runar Bjarnason
5d84681070 Improved test library dx 2019-06-28 00:15:45 -04:00
Runar Bjarnason
982e1d9a43 Weighted search fromList 2019-06-27 18:03:52 -04:00
Runar Bjarnason
645218e546 Weighted search library 2019-06-27 17:52:09 -04:00
Runar Bjarnason
85997dfb3c stashing 2019-06-27 14:30:50 -04:00
Runar Bjarnason
fd452f1068 Rename sequence to list in unison tests 2019-06-27 11:07:22 -04:00
Runar Bjarnason
10f54037c1 Really rename Sequence to List 2019-06-27 11:01:19 -04:00
Runar Bjarnason
6760afc938 Rename Sequence to List 2019-06-27 09:36:57 -04:00
Runar Bjarnason
461eaf2882 Merge branch 'wip/branchless' of github.com:unisonweb/unison into wip/branchless 2019-06-26 10:07:28 -04:00
Runar Bjarnason
6080616922 Add - on nat to base 2019-06-26 10:07:19 -04:00
Paul Chiusano
183f8d7433 remove trailing line whitespace 2019-06-26 09:43:26 -04:00
Arya Irani
97831acf4e updated sheepshead.u to compile 2019-06-19 10:51:11 -04:00
Runar Bjarnason
c519587b8e Deduplicating name resolutions 
when two names refer to the same thing.
 2019-06-18 21:35:09 -04:00
Runar Bjarnason
b1e7ca7b2e Base compiling 2019-06-18 16:12:47 -04:00
Runar Bjarnason
9463b55aef Merge branch 'wip/branchless' of github.com:unisonweb/unison into wip/branchless 2019-06-18 15:53:54 -04:00
Paul Chiusano
6b4037f2fc added some tests 2019-06-03 21:58:07 -04:00
Runar Bjarnason
15e83539ba wip 2019-05-28 17:44:56 -04:00
Runar Bjarnason
407c4a0a32 Resolved infinite loop in Trie 2019-05-23 10:24:44 -04:00
Runar Bjarnason
6b5c663600 Testing library things 2019-05-22 17:50:08 -04:00
Runar Bjarnason
00b2e9e444 Deduplicate TDNR resolutions 2019-05-22 12:00:15 -04:00
Runar Bjarnason
473405d457 No monads and no effects 2019-05-22 11:47:18 -04:00
Runar Bjarnason
6fec47cb56 Generating test reports 2019-05-14 13:43:21 -04:00
Runar Bjarnason
86abb4d47b Cofree and tries 2019-05-13 17:36:04 -04:00
Runar Bjarnason
41baba00ca Basic model of test framework 2019-05-13 16:25:29 -04:00
Paul Chiusano
c76a40c282 parser and prettypinter fix 2019-05-10 03:20:47 -04:00
Paul Chiusano
00a1258b61 record accessor generation moved to DataDeclaration.hs 2019-05-10 00:55:24 -04:00
Paul Chiusano
f11022933e generating get, set, modify for fields 2019-05-09 23:37:11 -04:00
Paul Chiusano
727bad7478 added test 2019-05-09 18:17:59 -04:00
Paul Chiusano
086b01efbb unique introduces a layout block, removed effect keyword (and updated tests) and nicer "file typechecked" message 2019-05-09 10:36:29 -04:00
Paul Chiusano
cb6cadde75 delete abomination that was qualifiedId, just defined wordyId and symbolyId directly, now test> watches parse 2019-04-30 23:17:48 -04:00
Paul Chiusano
cd18b95f56 just kidding, now added the test! 2019-04-29 15:17:02 -04:00
Paul Chiusano
deff4b2e26 fix #469 2019-04-26 16:43:16 -04:00
Paul Chiusano
5b6edd6b33
Merge pull request #467 from mrdziuban/pattern-match-vec-fns 
Add pattern matching on sequences
 2019-04-26 14:50:13 -04:00