Rob Rix
|
1668e94427
|
Define Info as a synonym over Data.Record.
|
2016-06-17 13:33:50 -04:00 |
|
Rob Rix
|
bcbb590b1f
|
Add a cost field to Info.
|
2016-06-02 23:34:16 -04:00 |
|
joshvera
|
cf21fddc08
|
Fix up tests
|
2016-05-31 16:38:47 -04:00 |
|
Rob Rix
|
de6d7edec2
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# semantic-diff.cabal
# src/Alignment.hs
# src/Control/Comonad/Cofree.hs
# src/Data/Adjoined.hs
# src/Diffing.hs
# src/Interpreter.hs
# src/Prologue.hs
# src/Renderer/JSON.hs
# src/Renderer/Patch.hs
# src/Renderer/Split.hs
# src/SplitDiff.hs
# src/Term.hs
# test/AlignmentSpec.hs
# test/ArbitraryTerm.hs
# test/PatchOutputSpec.hs
|
2016-05-27 09:35:26 -04:00 |
|
Rob Rix
|
cfe15a5afa
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# src/Alignment.hs
# src/Control/Comonad/Cofree.hs
# src/Data/Adjoined.hs
# src/Data/Align.hs
# src/Data/Bifunctor/These.hs
# src/Data/Coalescent.hs
# src/Data/Copointed.hs
# src/Data/Functor/Both.hs
# src/Data/Option.hs
# src/Line.hs
# src/Patch.hs
# src/Range.hs
# src/Renderer/JSON.hs
# src/Renderer/Patch.hs
# src/Renderer/Split.hs
# src/SplitDiff.hs
# stack.yaml
# test/AlignmentSpec.hs
# test/CorpusSpec.hs
# test/Data/Adjoined/Spec.hs
# test/Data/Functor/Both/Spec.hs
|
2016-05-26 15:25:45 -04:00 |
|
joshvera
|
473ec980b1
|
Merge remote-tracking branch 'origin/master' into diff-summaries
|
2016-05-26 13:40:54 -04:00 |
|
joshvera
|
ed144bbb1f
|
Fix tests
|
2016-05-26 13:11:34 -04:00 |
|
joshvera
|
170110ee8e
|
Fix up tests
|
2016-05-04 15:15:25 -04:00 |
|
Rob Rix
|
e3ace6408c
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# test/AlignmentSpec.hs
# test/PatchOutputSpec.hs
|
2016-04-14 12:57:45 -04:00 |
|
Rob Rix
|
1a22eaebf6
|
Correct the tests.
|
2016-04-12 04:54:32 -04:00 |
|
Rob Rix
|
60d6cfeb90
|
Use the curried both constructor.
|
2016-04-04 14:53:09 -04:00 |
|
Rob Rix
|
f1b2308405
|
Annotate a leaf type to prevent spew in the REPL.
|
2016-04-01 10:40:21 -04:00 |
|
Rob Rix
|
20bb94bf5e
|
Also, tests.
|
2016-03-30 17:33:07 -04:00 |
|
joshvera
|
8ddc5eb000
|
Add defaultPlainBlob
|
2016-03-08 16:05:01 -05:00 |
|
joshvera
|
c5fc04904e
|
Store modes as Word32
|
2016-03-07 19:20:28 -05:00 |
|
joshvera
|
a2dcdcab6e
|
Fix tests
|
2016-03-03 17:41:15 -05:00 |
|
joshvera
|
b124b461c0
|
Empty diffs have empty hunks
|
2016-03-01 17:13:53 -05:00 |
|
Rob Rix
|
c889174aee
|
Use Both to represent Diff annotations.
|
2016-02-29 10:12:34 -05:00 |
|
Rob Rix
|
0626228917
|
Data.Bifunctor.Join is actually Data.Functor.Both.
|
2016-02-28 21:29:59 -05:00 |
|
Rob Rix
|
ea87105b4b
|
Use Join for sources everywhere.
|
2016-02-28 21:10:56 -05:00 |
|
Rob Rix
|
f44455c372
|
Rename Renderer.PatchOutput to Renderer.Patch.
|
2016-02-25 13:20:25 -07:00 |
|
Rob Rix
|
c710b3c713
|
Move PatchOutput into Renderer.
|
2016-02-25 13:14:56 -07:00 |
|
joshvera
|
e008fda7d1
|
output the right paths in patch
|
2016-02-10 11:32:26 -08:00 |
|
Rob Rix
|
0590af9bc9
|
Allow all of the tests to run in parallel.
|
2016-01-05 10:38:51 -05:00 |
|
Rob Rix
|
8b4d158f4c
|
Pass sources as a pair.
|
2015-12-30 15:31:27 -05:00 |
|
Rob Rix
|
c9ab8a131d
|
Correct the tests.
|
2015-12-24 16:38:50 -05:00 |
|
Rob Rix
|
dd924c68dd
|
Test that empty diffs have no hunks.
|
2015-12-18 09:49:33 -05:00 |
|
Rob Rix
|
bf8de73934
|
Stub in a PatchOutput spec.
|
2015-12-18 09:49:21 -05:00 |
|