4050 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Rix	0cf930efb4	Sum the lengths of the leading rows for the offset.	2015-12-30 16:30:52 -05:00
Rob Rix	61ddae853c	Compute (wrong) offsets to changes and hunks.	2015-12-30 16:26:02 -05:00
Rob Rix	8a22a8a0c8	Leave Hunk lengths in Sum.	2015-12-30 16:25:18 -05:00
Rob Rix	b20aca9459	Leave Hunk offsets in Sum.	2015-12-30 16:24:33 -05:00
Rob Rix	a842048ae1	Offsets are pairs.	2015-12-30 16:05:42 -05:00
Rob Rix	2b352e44d4	Render lines in Maybe.	2015-12-30 16:03:38 -05:00
Rob Rix	0fff708848	Render empty lines to empty strings.	2015-12-30 16:00:56 -05:00
Rob Rix	72f5e22fde	Hunk headers include the hunk lengths.	2015-12-30 15:59:00 -05:00
Rob Rix	2547306a56	Add a function to compute the lengths of hunks in Sum.	2015-12-30 15:57:36 -05:00
Rob Rix	f6fbefb36e	changeLength doesn’t unpack the Sums.	2015-12-30 15:56:52 -05:00
Rob Rix	bf2651da67	Sum the lengths of changes.	2015-12-30 15:56:12 -05:00
Rob Rix	e7dc4e89ae	Add a rowLength function in Sum.	2015-12-30 15:56:03 -05:00
Rob Rix	def3237ace	Add a lineLength function in Sum.	2015-12-30 15:55:55 -05:00
Rob Rix	c3b2459528	Merge branch 'master' into patch	2015-12-30 15:39:15 -05:00
Rob Rix	dc39aa4007	Remove the Eq constraints.	2015-12-30 15:38:53 -05:00
Rob Rix	ebaf291a33	Render context rows with showRow.	2015-12-30 15:38:11 -05:00
Rob Rix	0010ec796a	Rename lineString to showLine.	2015-12-30 15:37:04 -05:00
Rob Rix	3c4cf3c514	Remove showLine.	2015-12-30 15:36:51 -05:00
Rob Rix	386ae52c77	Test string equality when rendering rows as changes.	2015-12-30 15:36:31 -05:00
Rob Rix	7763423e9d	Capture strings for row lines.	2015-12-30 15:36:11 -05:00
Rob Rix	4c31d94350	Use lineString to render leading context.	2015-12-30 15:35:21 -05:00
Rob Rix	2647390232	Use lineString to render trailing context.	2015-12-30 15:34:53 -05:00
Rob Rix	8d0df93193	Use lineString to show rows.	2015-12-30 15:34:05 -05:00
Rob Rix	4b222e6fbd	Add a lineString function.	2015-12-30 15:32:51 -05:00
Rob Rix	8b4d158f4c	Pass sources as a pair.	2015-12-30 15:31:27 -05:00
Rob Rix	d2f63f77f1	Render hunks’ trailing context.	2015-12-30 15:29:17 -05:00
Rob Rix	2fc7d8f537	Move showRow to the top level.	2015-12-30 15:27:04 -05:00
Rob Rix	636e526311	Move showLine to the top level.	2015-12-30 15:27:00 -05:00
Rob Rix	be2476cfda	Move getRange to the top level.	2015-12-30 15:26:49 -05:00
Rob Rix	725ef9c1d0	Pass the sources around as a pair.	2015-12-30 15:23:52 -05:00
Rob Rix	ebafcab8df	Add trailing context to hunks.	2015-12-30 15:21:26 -05:00
Josh Vera	64167f320a	Merge pull request #365 from github/diff-performance ... Diff performance tweaks	2015-12-30 14:32:46 -05:00
Rob Rix	27a877e861	Generalize unionRanges to Foldable Functors. ... We use `Foldable` and `Functor`, and not `Traversable`, because the latter is not automatically implied by the former. I.e. we use the minimum necessary set of constraints.	2015-12-30 13:45:04 -05:00
Rob Rix	176d45b59d	Union the ranges rather than concatenating them.	2015-12-30 12:35:27 -05:00
Rob Rix	a225fb20fe	Workaround default Num constraint warnings.	2015-12-30 12:31:38 -05:00
Rob Rix	4e96478cbb	Merge branch 'diff-performance' into patch ... # Conflicts: # src/Split.hs	2015-12-30 12:17:33 -05:00
Rob Rix	e1fa8d089e	Merge branch 'master' into diff-performance	2015-12-30 12:14:44 -05:00
Josh Vera	700277abb9	Merge pull request #370 from github/nest-split-diff-nodes ... Nest split diff nodes	2015-12-30 12:03:28 -05:00
Rob Rix	96f98b6bed	Revert "Generate syntax with String leaves." ... This reverts commit ba92cc702f8f4585fbcb8eb61a2567b3c336afd4.	2015-12-30 10:39:28 -05:00
Rob Rix	20b87aff70	Revert "Info is a Monoid." ... This reverts commit f7dad5a28dcd7fb693f2d13c8e2d6ad0b893957e.	2015-12-30 10:37:17 -05:00
Rob Rix	6f415c577f	Generalize split rendering to arbitrary leaf type.	2015-12-30 10:35:25 -05:00
Rob Rix	b54c4c8265	Bool, not ().	2015-12-30 10:33:49 -05:00
Rob Rix	ad31669f07	Revert "Generalize openMaybe." ... This reverts commit 9a056744cfb33ac0454d07fd89356fb620b7cb50.	2015-12-30 10:33:28 -05:00
Rob Rix	3e3c7be082	Test openLineBy over openMaybe.	2015-12-30 10:31:30 -05:00
Rob Rix	d5d8095a4e	pure.	2015-12-30 10:28:40 -05:00
Rob Rix	494d7f83c8	Spacing.	2015-12-30 10:28:16 -05:00
Rob Rix	093700c571	Generalize openMaybe.	2015-12-30 10:27:45 -05:00
Rob Rix	6dfb6b3ff7	Wrap terms in Identity.	2015-12-30 10:26:40 -05:00
Rob Rix	722422108f	contextRows doesn’t take categories.	2015-12-30 10:23:51 -05:00
Rob Rix	8edf12573a	Remove openInfo.	2015-12-30 10:23:16 -05:00