Arya Irani
|
e60971675c
|
minor cleanup
|
2020-02-14 16:58:36 -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 |
|
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 |
|
Chris Gibbs
|
30516d73d4
|
Code review markup from #994
Move helper function to Unison.Util.List.intercalateMapWith. Tested to check it's not actually restricted to even-length inputs.
|
2020-01-20 23:03:10 +00: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
|
52ef0681d2
|
Merge branch 'master' into topic/docs-936-pretty-literals
|
2020-01-16 22:56:33 +00:00 |
|
Arya Irani
|
c8136c02dd
|
fix hq bracket alignment and hide some blank lines
|
2020-01-16 16:39:41 -05:00 |
|
Arya Irani
|
8f66210115
|
split updatedTerms into updatedTerms, newTermConflicts, resolvedTermConflicts
|
2020-01-16 12:26:33 -05:00 |
|
Arya Irani
|
f1a6f16fe1
|
switch tallnamespaceUpdates representation & trying to fix bugs
|
2020-01-14 17:13:52 -05:00 |
|
Arya Irani
|
5c5cf6b65a
|
use BranchDiff.allNameChanges to compute adds, removes, and renames
|
2020-01-10 13:40:58 -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
|
3adbc476e3
|
Merge remote-tracking branch 'origin/master' into diff.namespace
# Conflicts:
# parser-typechecker/src/Unison/Codebase/Branch.hs
# parser-typechecker/src/Unison/Codebase/Editor/HandleCommand.hs
# parser-typechecker/src/Unison/Codebase/Editor/Output.hs
# parser-typechecker/src/Unison/Codebase/TranscriptParser.hs
# parser-typechecker/src/Unison/CommandLine/Main.hs
# parser-typechecker/src/Unison/CommandLine/OutputMessages.hs
|
2020-01-08 12:00:38 -05:00 |
|
Mitchell Rosen
|
09afe1e1f0
|
Show aliases when searching by type
|
2020-01-04 21:16:15 -05:00 |
|
Arya Irani
|
1a4533af99
|
prettyUpdate{Type,Term}
|
2019-12-23 16:59:39 -05:00 |
|
Chris Gibbs
|
f1cb1c943e
|
Merge branch 'master' into topic/docs-936-pretty-literals
|
2019-12-21 22:09:12 +00:00 |
|
Arya Irani
|
02153976ea
|
fleshed out HandleInput.DiffNamespaceI
|
2019-12-19 16:46:06 -05:00 |
|
Arya Irani
|
d839766831
|
Output.branchDiff.toOutput.updatedTypes
|
2019-12-19 14:31:59 -05:00 |
|
Arya Irani
|
0b95e69941
|
deprecate Names2.hq{Term,Type}Name...
...because they didn't use a codebase-wide notion of hqlen
|
2019-12-19 12:18:00 -05:00 |
|
Arya Irani
|
aee88cad25
|
I left some "undefined"s in Output.BranchDiff.toOutput
|
2019-12-18 17:28:53 -05:00 |
|
Arya Irani
|
c039a51f8c
|
rejiggered Codebase.BranchDiff
|
2019-12-18 15:07:32 -05:00 |
|
Arya Irani
|
516c5e3771
|
Switch BranchDiff.metadata to Relation3
|
2019-12-17 19:19:16 -05:00 |
|
Arya Irani
|
337fb2154e
|
redesigning and fleshing out Output.BranchDiff.toOutput
|
2019-12-17 18:00:25 -05:00 |
|
Arya Irani
|
e1e8a5937b
|
Merge branch 'master' into diff.namespace
|
2019-12-16 14:45:45 -05:00 |
|
Arya Irani
|
ae23874712
|
split up deepTerms/deepTermMetadata
diff0 still todo
|
2019-12-16 14:26:04 -05:00 |
|
Mitchell Rosen
|
6e554823ef
|
Move Unison.Codebase.NameSegment to unison-core
|
2019-12-15 11:38:02 -05: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
|
24adf5060a
|
Make Name an abstract type
|
2019-12-14 14:02:58 -05:00 |
|
Arya Irani
|
c442523c11
|
building cleanly, but one test is failing due to undefinedsomewhere
|
2019-12-13 19:13:19 -05:00 |
|
Arya Irani
|
227c103fe0
|
Refactored deep{Terms,Types} into Relation4 & started refactoring HandleInput.getLinks
|
2019-12-13 17:25:23 -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
|
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
|
823a39c032
|
first pass at implementing from datalog
|
2019-12-10 13:28:34 -05:00 |
|
Tomas Mikula
|
705bb08a7f
|
Merge branch 'master' into demote-TypeVar
|
2019-12-09 22:19:42 +01:00 |
|
Paul Chiusano
|
e46ceb8cee
|
Merge remote-tracking branch 'origin/master' into fix/987
|
2019-12-09 14:46:38 -05:00 |
|
Arya Irani
|
68fa185a83
|
Merge remote-tracking branch 'origin/master' into diff.namespace
|
2019-12-09 09:17:53 -05:00 |
|
Mitchell Rosen
|
dbc1006eea
|
Move Unison.Paths to unison-core
|
2019-12-08 23:07:06 -05:00 |
|
Mitchell Rosen
|
e38f3046c9
|
Move Unison.Codebase.SearchResult from unison-core to unison-parser-typechecker
|
2019-12-08 01:43:47 -05:00 |
|
Arya Irani
|
1bde90bd92
|
started implementing BranchDiff.toOutput
|
2019-12-06 16:14:40 -05:00 |
|
Paul Chiusano
|
172e8e7337
|
minimizeOrdered function
|
2019-12-05 23:43:07 -05:00 |
|
Arya Irani
|
fdbbc1d4f5
|
Merge branch 'master' into topic/bug991
|
2019-12-05 13:46:05 -05:00 |
|
Mitchell Rosen
|
83af25773b
|
Carve out unison-core package
|
2019-12-04 18:57:26 -05:00 |
|