5715 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Josh Vera	666b56b713	Merge branch 'master' into fix-filemode-change-header	2016-03-17 14:12:38 -04:00
joshvera	190729a156	fmap null over sources and check that they're both null	2016-03-17 14:12:25 -04:00
Rob Rix	00da8bc641	Merge pull request #520 from github/fix-deleted-file-mode-header ... Fix deleted file mode header format	2016-03-17 14:08:14 -04:00
joshvera	cdd96b2deb	blobOidHeader should be on a new line if there's a mode change	2016-03-17 13:58:49 -04:00
joshvera	77f7b8ff02	Use the empty hunk if the sources are equal	2016-03-17 13:51:52 -04:00
joshvera	98c0242056	add a space after old mode	2016-03-17 13:51:38 -04:00
joshvera	339c0c5376	s/old/deleted	2016-03-17 13:11:14 -04:00
Rob Rix	1a55c8c750	Merge pull request #518 from github/end-with-newline ... Check if the patch ends with a newline	2016-03-16 19:01:20 -04:00
joshvera	2d711d2a56	just one slash	2016-03-16 18:56:57 -04:00
joshvera	c7aeec0e0e	unindent	2016-03-16 18:41:56 -04:00
joshvera	739cc3ad91	unindent	2016-03-16 18:38:56 -04:00
joshvera	da27a75da1	Move newline check to patch function	2016-03-16 18:23:42 -04:00
Josh Vera	90764b74b1	Merge pull request #509 from github/adjoin-associatively ... Adjoin (mostly) associatively	2016-03-15 17:33:35 -04:00
Rob Rix	e699481549	Merge branch 'master' into adjoin-associatively	2016-03-15 17:09:32 -04:00
Rob Rix	6b2b2a811b	Move the nested insert tests to the todo pile.	2016-03-15 15:53:04 -04:00
Rob Rix	8e07d40a0d	Disable the Monoid tests over Both Line Char.	2016-03-15 15:52:54 -04:00
Rob Rix	970a3b24d3	Revert "Explicitly preserve Closedness on both sides under mappend." ... This reverts commit bd4094153350b67d383edffd1f22fbd97de81774.	2016-03-15 15:08:26 -04:00
Rob Rix	718b905375	Merge remote-tracking branch 'origin/adjoin-associatively' into adjoin-associatively	2016-03-15 13:42:55 -04:00
Rob Rix	795d9eb51b	Merge branch 'master' into adjoin-associatively	2016-03-15 13:42:41 -04:00
Rob Rix	2e3fe854f2	Merge branch 'master' into adjoin-associatively	2016-03-15 13:42:36 -04:00
Rob Rix	7c6a6649be	Merge pull request #513 from github/semantic-diff-as-subproject ... Semantic diff as subproject	2016-03-15 13:26:53 -04:00
Rob Rix	b9dfb2e44c	Explicitly preserve Closedness on both sides under mappend.	2016-03-15 13:21:29 -04:00
Rob Rix	56afa453b0	Merge branch 'master' into semantic-diff-as-subproject	2016-03-15 13:18:00 -04:00
Rob Rix	6e375f7b3e	Simplify the Monad instance.	2016-03-15 12:53:55 -04:00
Rob Rix	0cc33fcc79	Use the same empty value consistently.	2016-03-15 12:53:50 -04:00
Rob Rix	3df1af53d9	Better docs for Data.Adjoined.	2016-03-15 12:43:56 -04:00
Rob Rix	7da4a180b7	Shrink Adjoined.	2016-03-15 11:46:15 -04:00
Rob Rix	493f55aa65	Shrink Both.	2016-03-15 11:46:09 -04:00
Rob Rix	943e0b7a40	Shrink Lines.	2016-03-15 11:46:05 -04:00
Rob Rix	3182f61140	Test the Monoid instance for Adjoined over Both Line.	2016-03-15 11:19:05 -04:00
Rob Rix	777aef345e	Test the Monoid instance for Adjoined over Line.	2016-03-15 11:18:27 -04:00
Rob Rix	01f817a77e	Move the other arbitrary instances into ArbitraryTerm.	2016-03-15 11:17:47 -04:00
Rob Rix	86f41d4ce8	Empty lines get inserted before merged ones.	2016-03-15 11:13:01 -04:00
Rob Rix	164a4fdd6f	Sequence coalesced lines by aligning.	2016-03-15 11:11:27 -04:00
Rob Rix	0fc6dd758b	Redefine the Coalescent instance for Both over Both (Line a).	2016-03-15 11:10:34 -04:00
Rob Rix	f3c6f8b3f6	Compute lines within Adjoined.	2016-03-15 10:58:54 -04:00
Rob Rix	e7702fd11d	Add a (failing) test that Both coalesces asymmetrically at right.	2016-03-15 10:55:20 -04:00
Rob Rix	2ea0fa9109	Add a (failing) test that Both coalesces asymmetrically at left.	2016-03-15 10:54:28 -04:00
Rob Rix	01330d9d2e	Add a (failing) test that it doesn’t coalesce when neither side coalesces.	2016-03-15 10:52:43 -04:00
Rob Rix	ab33fb3ace	Clean up the test with the Applicative instance.	2016-03-15 10:51:30 -04:00
Rob Rix	b3bb9e2c3e	Test that Both coalesces when both sides coalesce.	2016-03-15 10:50:13 -04:00
Rob Rix	0129bffe6e	Stub in a spec for Both.	2016-03-15 10:40:35 -04:00
Rob Rix	a46915b58c	Inline rangeUntilNext.	2016-03-15 10:36:18 -04:00
Rob Rix	86b3d700a4	Rename placeChildAndRangeInContainer to match makeContextLines.	2016-03-15 09:23:14 -04:00
Rob Rix	9c69c1b6a6	🔥 unionLineRangesFrom.	2016-03-15 09:22:39 -04:00
Rob Rix	5677e6abf9	Reindent some stuff.	2016-03-15 08:56:18 -04:00
Rob Rix	745765417e	Use makeContextLines to construct the leading context.	2016-03-15 08:55:04 -04:00
Rob Rix	c3fa0eb986	Extract and rename pairWithNothing.	2016-03-15 08:54:35 -04:00
Rob Rix	d1b8a94b75	🔥 the janky Align instance for lists.	2016-03-15 08:28:27 -04:00
Rob Rix	0fd1c65ce8	🔥 modifyBoth.	2016-03-15 08:24:50 -04:00