Commit Graph

24 Commits

Author SHA1 Message Date
Mitchell Rosen
7b43d6ada6 remove printLine from diff.md transcript because it no longer exists 2021-04-25 20:30:25 -04: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
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
Runar Bjarnason
89bdfd61b9 Merge branch 'master' of github.com:unisonweb/unison into topic/multilink 2020-02-10 10:21:36 -05:00
Runar Bjarnason
ea9684efaf Fixed argument order and transcripts 2020-02-07 15:17:43 -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
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
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