456 Commits

Author	SHA1	Message	Date
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
joshvera	d7db984616	Merge remote-tracking branch 'origin/master' into git-patch-modes	2016-02-22 13:54:32 -07:00
joshvera	4e28026019	remove diff	2016-02-22 13:40:08 -07: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	4c6c9b4f72	Centralize logic in parserForType	2016-02-10 15:07:27 -08:00
Matt Diephouse	f45fd562a1	Move languageForType to Language	2016-02-10 14:32:11 -08:00
joshvera	e008fda7d1	output the right paths in patch	2016-02-10 11:32:26 -08:00
Matt Diephouse	76a115a77c	Make Language a sum type of programming languages	2016-02-10 11:30:32 -08:00
Matt Diephouse	e35da995a2	Let's call this treeSitterParser	2016-02-10 11:02:51 -08:00
joshvera	a812b41c27	Merge branch 'source-blobs' into git-patch-modes	2016-02-09 13:18:43 -08:00
Rob Rix	cc2c0b7883	Merge pull request #420 from github/the-final-documentation ... The final documentation	2016-02-03 17:24:55 -05:00
Matt Diephouse	b351f5faca	Document Parsers.hs	2016-02-03 13:25:30 -05:00
Matt Diephouse	9c7d3f97b6	Merge branch 'master' into belly-of-the-beast ... # Conflicts: # app/Main.hs	2016-02-02 11:58:59 -05:00
Matt Diephouse	1f7df7d940	Remove unnecessary imports	2016-02-02 11:46:39 -05:00
Matt Diephouse	6a961ff6ff	Restore changes lost from #402, #408, and #410	2016-02-02 11:46:31 -05:00
joshvera	1b44c44aea	Revert "--RecordWildCards" ... This reverts commit 74c1cd9b5dafc1ba38014d90097a2ac7a7b75c7c.	2016-02-01 15:52:17 -05:00
joshvera	ce87286049	--RecordWildCards	2016-02-01 15:50:22 -05:00
joshvera	724910bf7a	Merge remote-tracking branch 'origin/master' into git-diff	2016-02-01 14:48:30 -05:00
Matt Diephouse	d76fbfa60e	No IO needed	2016-01-28 16:14:24 -05:00
joshvera	8c7d82b363	store strings in SourceBlob	2016-01-26 16:46:27 -05:00
joshvera	d0a3c517a9	Pass around source blobs with oid info	2016-01-26 16:25:40 -05:00
Matt Diephouse	45de586389	Merge branch 'master' into unified	2016-01-22 11:04:53 -05:00
Matt Diephouse	0671d46590	Fix off-by-one error	2016-01-22 10:27:00 -05:00
Matt Diephouse	b074325f67	Make unified into a Renderer of [Chunk String]	2016-01-21 13:27:16 -05:00
Matt Diephouse	160c2e309a	Pass the chunk renderer into unified	2016-01-21 13:05:15 -05:00
joshvera	b4dc0056ec	fix unused variable warning	2016-01-20 12:27:01 -05:00
joshvera	5fd539765c	Share printDiff	2016-01-20 12:25:17 -05:00
joshvera	3e72417c77	Move shared IO to DiffOutput	2016-01-20 11:43:31 -05:00
joshvera	b188febbe7	share diff and breakDownLeavesByWord between SemanticDiff and Main	2016-01-20 11:36:06 -05:00
joshvera	263ea09dd2	diff functions take tuples of sources now	2016-01-20 10:39:44 -05:00
joshvera	99f8fb18a4	Revert main	2016-01-15 16:26:16 -05:00
joshvera	84d8494c3e	Add semantic-diff exe	2016-01-15 16:25:58 -05:00
joshvera	33b2331a23	Merge origin/master into git-diff	2016-01-15 16:15:44 -05:00
Matt Diephouse	9e6e125477	Update the documentation	2016-01-14 15:31:20 -05:00
Matt Diephouse	140cfa88b6	Try to make the overall structure clearer	2016-01-14 15:27:47 -05:00
Matt Diephouse	55666a5586	Monadically	2016-01-14 15:13:26 -05:00
Matt Diephouse	61b65533ef	printDiff can return a Renderer now	2016-01-14 15:10:56 -05:00
Matt Diephouse	3a9803ee15	Make Renderer take a pair of Source Chars	2016-01-14 15:09:47 -05:00
Matt Diephouse	fa68f78c39	Put the diff first	2016-01-14 14:56:00 -05:00
Matt Diephouse	78852e4041	Get rid of the where clause	2016-01-14 14:54:43 -05:00
Matt Diephouse	44a1c68f8f	Create a separate diff function	2016-01-14 14:54:30 -05:00
joshvera	ac77ed1ba0	rename to Format	2016-01-14 14:08:23 -05:00
joshvera	13b676f392	Merge origin/master into git-diff	2016-01-14 14:04:28 -05:00
joshvera	2a00945ae7	Remove unused readAndTranscodeFile	2016-01-14 13:54:36 -05:00
joshvera	1e094aba90	docs	2016-01-14 13:52:26 -05:00
joshvera	2c3ff936b7	Merge origin/master into git-diff	2016-01-14 13:44:29 -05:00
Matt Diephouse	f0760188b9	Rename Renderer to Format ... This is more consistent with the terminology around the command-line `diff` tool.	2016-01-14 13:12:28 -05:00