261 Commits

Author	SHA1	Message	Date
Josh Vera	ca92f08159	Merge pull request #471 from github/remove-semigroups ... Remove semigroups	2016-02-26 19:07:04 -07:00
joshvera	7cbe330be5	Merge remote-tracking branch 'origin/master' into factor-out-packages	2016-02-26 18:36:57 -07:00
Rob Rix	f25d2754f7	Remove semigroups.	2016-02-26 19:55:18 -05:00
Rob Rix	431b8ff693	Build Data.Option.	2016-02-26 19:54:53 -05:00
Rob Rix	a415ae4d44	Goodbye, 🌈 Chunks.	2016-02-26 19:06:43 -05:00
Rob Rix	8c39ae3c87	Remove the Unified module.	2016-02-26 19:05:51 -05:00
Rob Rix	782b01932f	Replace the dependency on bifunctors with Data.Bifunctor.Join.	2016-02-26 18:57:54 -05:00
Rob Rix	bbf76ad1e6	Merge branch 'master' into factor-out-packages ... # Conflicts: # semantic-diff.cabal	2016-02-26 18:45:38 -05:00
Rob Rix	254d04774a	Merge pull request #467 from github/group-renderers ... Group renderers	2016-02-26 18:43:13 -05:00
Rob Rix	f9bca5ec2d	Set up a semantic-difftool package.	2016-02-26 18:05:10 -05:00
Rob Rix	0892dfd49e	Move DiffOutput into the library.	2016-02-26 17:56:38 -05:00
Rob Rix	4b15f12735	Replace free with Control.Monad.Free & Control.Comonad.Cofree.	2016-02-26 12:20:55 -07:00
Rob Rix	78f8704b13	Move Renderer up.	2016-02-25 13:55:28 -07:00
Rob Rix	fcd8571274	Move Unified under Renderer.	2016-02-25 13:50:35 -07:00
Rob Rix	f8214a9872	Move Split under Renderer.	2016-02-25 13:32:39 -07: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
Rob Rix	7949048e13	Add a function to branches only.	2016-02-24 13:24:51 -07:00
Matt Diephouse	565c7b6ca8	Add todo tests	2016-02-17 17:42:27 -05:00
Rob Rix	adb9d009cb	Merge branch 'master' into hush-little-vector-don’t-you-cry ... # Conflicts: # semantic-diff.cabal	2016-02-17 11:43:29 -05:00
Matt Diephouse	8df993408d	Set the correct flags	2016-02-16 16:45:49 -05:00
Matt Diephouse	c8edf79abb	Add a spec for test files	2016-02-16 16:38:31 -05:00
Matt Diephouse	5127376e68	diffFiles :: Parser -> Renderer T.Text b -> (Source Char, Source Char) -> IO b	2016-02-16 16:09:58 -05:00
Matt Diephouse	ac053940fe	Add a spec for on-disk tests	2016-02-16 12:33:41 -05:00
Rob Rix	52875fdd99	Silence a warning for the DiffOutput module.	2016-02-13 15:09:13 -08:00
Rob Rix	bda4df6731	Build threadily.	2016-02-13 14:16:49 -08:00
Rob Rix	54cf53e639	Add DiffOutput to the cabal file.	2016-02-13 12:41:07 -08:00
Matt Diephouse	4a5c844f34	Move Language to a separate module	2016-02-10 14:30:14 -08:00
Matt Diephouse	170b7c6e1e	Rename Categorizable module to Category	2016-02-04 13:59:33 -05:00
joshvera	724910bf7a	Merge remote-tracking branch 'origin/master' into git-diff	2016-02-01 14:48:30 -05:00
Matt Diephouse	316a7827c3	Add Rainbow to semantic-diff-exe	2016-01-21 13:32:00 -05:00
joshvera	84d8494c3e	Add semantic-diff exe	2016-01-15 16:25:58 -05:00
joshvera	13b676f392	Merge origin/master into git-diff	2016-01-14 14:04:28 -05:00
Matt Diephouse	9c4ea153bc	Add a Renderer type for rendering diffs	2016-01-14 13:18:40 -05:00
Matt Diephouse	6a3f5c4c00	Use Option instead of creating a Union type	2016-01-13 13:34:56 -05:00
Rob Rix	c5059e94ee	Just include-dirs.	2016-01-13 13:34:56 -05:00
Rob Rix	6bffb323c2	Extra include dirs.	2016-01-13 13:34:56 -05:00
Rob Rix	7dbaddf8fa	Add the homebrew icu4c path to extra-lib-dirs on Darwin.	2016-01-13 13:34:56 -05:00
Matt Diephouse	473866cb6a	Use Option instead of creating a Union type	2016-01-13 10:04:26 -05:00
Rob Rix	bfbb1745dd	Just include-dirs.	2016-01-12 20:49:46 -05:00
Rob Rix	57cee8f754	Extra include dirs.	2016-01-12 20:47:50 -05:00
Rob Rix	47ed985a6a	Add the homebrew icu4c path to extra-lib-dirs on Darwin.	2016-01-12 20:39:04 -05:00
joshvera	8f069abbce	Merge master into git-diff	2016-01-12 12:53:09 -05:00
Rob Rix	662e14448e	Just link the libs on Darwin (I hope, oh god I hope)	2016-01-12 11:55:23 -05:00
Rob Rix	fe759bb6cd	Now with 100% more correct syntax!	2016-01-12 11:46:11 -05:00
Rob Rix	d37fcb287e	Don’t use script/g++ on Darwin.	2016-01-12 11:42:55 -05:00
Rob Rix	23ac8b749e	We don’t need these options any more. ... -lstdc++ is handled by g++. The libraries are handled by our wrapper script.	2016-01-11 19:23:53 -05:00
Rob Rix	5519a1dda0	Use the linker wrapper.	2016-01-11 19:18:34 -05:00
Rob Rix	b7030fe9bf	Pass the flags through as tho to g++ itself.	2016-01-11 19:10:57 -05:00
Rob Rix	0ceafb12ac	Pass icui18n first.	2016-01-11 19:09:36 -05:00