4150 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Rix	0590af9bc9	Allow all of the tests to run in parallel.	2016-01-05 10:38:51 -05:00
Rob Rix	51e7d382c9	Merge pull request #378 from github/cleanup-main ... Use Bifunctor.Join when mapping sources to diffs in main	2016-01-04 16:34:49 -05:00
joshvera	c61b16d993	move these	2016-01-04 16:04:04 -05:00
joshvera	7a03ac709b	missed one	2016-01-04 15:51:01 -05:00
joshvera	2438de3040	Remove conduit dependency	2016-01-04 15:50:31 -05:00
joshvera	e3777a1c08	inline fmap	2016-01-04 14:50:16 -05:00
joshvera	44e9f50434	remove uses of lens	2016-01-04 14:48:55 -05:00
joshvera	15724218b8	Merge remote-tracking branch 'origin/master' into use-conduit	2016-01-04 14:26:18 -05:00
Josh Vera	9183507e92	Merge pull request #377 from github/a-penny-for-your-thunks ... Limit space overhead in row adjoining	2016-01-04 14:11:28 -05:00
Rob Rix	6c858694b8	Fuse our passes over the sides of the rows.	2016-01-04 13:49:53 -05:00
Rob Rix	0f30598055	Unpack a row into a pair of lines.	2016-01-04 13:49:14 -05:00
Rob Rix	92990d63a5	Merge branch 'master' into a-penny-for-your-thunks	2016-01-04 13:26:24 -05:00
Josh Vera	2bffbe9537	Merge pull request #353 from github/patch ... Patch output	2016-01-04 12:13:09 -05:00
Josh Vera	6a90517d18	Merge pull request #375 from github/fewer-default-extensions ... Fewer default extensions	2016-01-04 12:12:50 -05:00
Rob Rix	653d8bb32d	Merge branch 'master' into fewer-default-extensions	2016-01-04 12:05:26 -05:00
Rob Rix	423858ef41	Revert "Derive Functor, Foldable, and Traversable using pragmas." ... This reverts commit 949f9cab01bc57b892e8b33dc244846c7cf05004.	2016-01-04 12:05:08 -05:00
Rob Rix	1d6e5f41d8	Revert "Derive Generic using pragmas." ... This reverts commit 1fad159e459179d96d6991eaa403c891144702c4.	2016-01-04 12:04:23 -05:00
Rob Rix	d79c6084b1	Revert "Remove the deriving extensions from the cabal file." ... This reverts commit e9f5bd112d55aff2523d8f1b1436bd1e4c70f01a.	2016-01-04 12:04:12 -05:00
Rob Rix	b92ae5159d	Revert "Add overloaded strings to the Split & TreeSitter modules." ... This reverts commit 1138ce8ff7deb0335c9e4506ed4ffb9455005c29.	2016-01-04 12:03:12 -05:00
Rob Rix	5a10bbb374	Revert "Remove OverloadedStrings from the default extensions." ... This reverts commit 6904929f082dd8b2c048884a9f62415ee37c3be5.	2016-01-04 12:03:05 -05:00
Rob Rix	de88674aa1	Merge branch 'master' into a-penny-for-your-thunks	2016-01-04 10:08:59 -05:00
Rob Rix	84a8d3c6a4	Merge pull request #376 from github/who-tags-the-tags-themselves- ... Ignore the hasktags/ctags index.	2016-01-04 09:59:08 -05:00
Rob Rix	14b5aca113	Ignore the hasktags/ctags index.	2016-01-04 09:58:19 -05:00
Rob Rix	dc9113aa6d	Remove OverloadedStrings from the default extensions.	2016-01-04 09:28:16 -05:00
Rob Rix	9f31e74988	Add overloaded strings to the Split & TreeSitter modules.	2016-01-04 09:28:09 -05:00
Rob Rix	b227546e29	Remove FlexibleInstances from the default extensions.	2016-01-04 09:25:44 -05:00
Rob Rix	045fff11ab	Add FlexibleInstances pragmas to the files that need them.	2016-01-04 09:25:37 -05:00
Rob Rix	089752f101	Remove the deriving extensions from the cabal file.	2016-01-04 09:22:45 -05:00
Rob Rix	692fd83e09	Derive Generic using pragmas.	2016-01-04 09:22:36 -05:00
Rob Rix	53ab519bed	Derive Functor, Foldable, and Traversable using pragmas.	2016-01-04 09:19:38 -05:00
Rob Rix	243d3b502d	Import Data.Foldable for foldl'.	2015-12-30 19:07:33 -05:00
Rob Rix	09459a3421	Merge branch 'master' into patch	2015-12-30 18:55:42 -05:00
Rob Rix	c0997d4695	Merge pull request #372 from github/use-text ... Transcode files to unicode before parsing	2015-12-30 18:51:44 -05:00
Rob Rix	c6ef5b4ef8	Remove showRow.	2015-12-30 18:37:38 -05:00
Rob Rix	3f22926e86	Use showLines to render trailing context.	2015-12-30 18:37:25 -05:00
Rob Rix	8cbe4e39fb	Use showLines to render leading context.	2015-12-30 18:37:19 -05:00
Rob Rix	0c87606997	Use showLines to render changes.	2015-12-30 18:36:28 -05:00
Rob Rix	4ba7a017cc	Add showLines to show a list of lines with the same prefix.	2015-12-30 18:34:55 -05:00
Rob Rix	09b81a6c7f	Render deletions before insertions.	2015-12-30 18:29:52 -05:00
Rob Rix	7f849f9aab	Continue the diff through the remainder of the rows.	2015-12-30 18:19:17 -05:00
Rob Rix	c5b3058099	Rename a variable.	2015-12-30 18:10:58 -05:00
Rob Rix	36637b146d	No changes within 7 lines → end of this hunk.	2015-12-30 18:08:06 -05:00
Rob Rix	3e691e63ca	Scan at most 7 lines.	2015-12-30 18:06:47 -05:00
Rob Rix	30a3bd1cf4	Pass both the leading context and the changes to changeIncludingContext.	2015-12-30 18:05:29 -05:00
joshvera	24015141b7	Add conduit	2015-12-30 18:00:57 -05:00
joshvera	609e713580	Move printDiff to its own function	2015-12-30 18:00:44 -05:00
joshvera	3197de4d6e	Merge remote-tracking branch 'origin/use-text' into use-conduit	2015-12-30 17:59:10 -05:00
Rob Rix	2147654a5e	Don’t bother binding the last case.	2015-12-30 17:54:27 -05:00
joshvera	8852f81023	Remove unused modules	2015-12-30 17:53:35 -05:00
joshvera	644adad6eb	Change production names back to String	2015-12-30 17:52:51 -05:00