sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,778 Commits
44 Branches
77 Tags
1.9 GiB
Commit Graph

5778 Commits (7c5a0aec0cd4f45b132bec57fbd762da480dd441)
 

Author SHA1 Message Date
Wilfred Hughes 7c5a0aec0c Merge commit 'a03f1d2d1dfbf6f8e0fdca5f9ff030228241eb57' 2021-11-19 23:57:48 +07:00
Wilfred Hughes 153cc5eeca Merge commit '203e239408d642be83edde8988d6e7b20a19f0e8' 2021-11-19 23:56:55 +07:00
Wilfred Hughes f8427c6970 Merge commit 'fdeb68ac8d2bd5a78b943528bb68ceda3aade2eb' 2021-11-19 23:54:58 +07:00
Wilfred Hughes 4761f3872a Add a command for tracking parser updates 2021-11-19 23:46:18 +07:00
Wilfred Hughes 7fdbaff6fe Update build dependencies 2021-11-19 23:29:17 +07:00
Wilfred Hughes 7f6b8174d5 Update pretty_assertions and use consistently 2021-11-19 23:27:41 +07:00
Wilfred Hughes 9079567695 Update radix-heap 
Upstream has had some optimisations and it saves 7% in instructions
executed for slow_before/slow_after.rs according to `perf stat`.
 2021-11-19 23:20:37 +07:00
Wilfred Hughes e8f45d91b8 Roll version 2021-11-19 00:49:14 +07:00
Wilfred Hughes 440ca8d0de Style single-line display consistently with other displays 2021-11-19 00:31:55 +07:00
Wilfred Hughes 70f384652a Remove dead code 2021-11-19 00:29:29 +07:00
Wilfred Hughes c2570d379c Don't truncate long lines on single-column display 2021-11-19 00:25:18 +07:00
Wilfred Hughes e128e64b56 Colour line numbers on full file add/remove consistent with smaller changes 2021-11-19 00:21:54 +07:00
Wilfred Hughes 5708308e55 Don't let-bind variables outside that are only used in one pattern 2021-11-19 00:17:58 +07:00
Wilfred Hughes 204b85e273 Display file header for single-column (i.e. deletion/addition) changes too 2021-11-19 00:14:57 +07:00
Wilfred Hughes 8cb321ebf6 Document logging used for debugging 2021-11-19 00:06:09 +07:00
Wilfred Hughes 7ee37868a1 Make 1-indexed display of LineNumber values explicit 
This fixes .. (or 'missing') line numbers on boundaries, where we'd
show too few dots after 10 or 100.
 2021-11-18 23:24:39 +07:00
Wilfred Hughes b65d9d8c90 Fix formatting 2021-11-18 23:21:22 +07:00
Wilfred Hughes e9792db333 Remove duplicated definition 2021-11-18 23:15:50 +07:00
Wilfred Hughes e1ffa2af2a Prefer chain over manually building a vec 2021-11-18 23:11:46 +07:00
Wilfred Hughes 90122a6d3c Also consider matched lines when calculating which lines to show after 
After merging hunks, we may have lines on the opposite side.
 2021-11-18 23:02:10 +07:00
Wilfred Hughes f675ce3ecc Add regression unit test for LHS/RHS bug in previous commit 2021-11-18 22:51:01 +07:00
Wilfred Hughes 09eea0b93d Fix column width calculation due to LHS/RHS typo 
Fixes #57
 2021-11-15 22:59:02 +07:00
Wilfred Hughes 56d6e4d814 Don't repeat the line number columns if they're identical 2021-11-14 22:44:01 +07:00
Wilfred Hughes 579d21eeb9 Only use a single column if hunk line numbers are <= 9 2021-11-14 22:33:39 +07:00
Wilfred Hughes 9d8d37957f Use the max opposite line when computing after context 
Previously we'd use the maximum line of the current side, leading us
to try to access nonexistent line numbers. This occurred when diffing
old/new.jsx from sample_files/.
 2021-11-14 22:24:33 +07:00
Wilfred Hughes a5965b8292 Update screenshots for 0.12 2021-11-14 17:05:53 +07:00
Wilfred Hughes d2f73e343c Document newer haskell parser commit 2021-11-14 16:51:47 +07:00
Wilfred Hughes 987791253c Merge commit 'd72f2e42c0d5ccf8e8b1c39e3642428317e8fe02' 2021-11-14 16:51:15 +07:00
Wilfred Hughes 546391e9c0 Fix subword highlighting in multiline comments 2021-11-14 16:48:55 +07:00
Wilfred Hughes 6e955793db Tweak wording on manual intro 2021-11-14 15:29:40 +07:00
Torsten Schmits d72f2e42c0 skip initial whitespace instead of consuming it (#48) 2021-11-14 23:21:37 +07:00
Wilfred Hughes 67bea22434 Rename Java sample file for consistency 2021-11-14 13:34:46 +07:00
Wilfred Hughes 9693d813d2 Document Haskell parser upgrade 2021-11-14 13:27:55 +07:00
Wilfred Hughes 36bb384b82 Merge commit '6668085e7d3dc6205a3ef27e6293988cf4a10419' 2021-11-14 13:25:34 +07:00
Wilfred Hughes 1ad04f10bb Add a Haskell sample file 2021-11-14 13:18:58 +07:00
Wilfred Hughes 932b4ba0f1 Clarify that changed MatchedPos may be Novel or ChangedCommentPart 2021-11-14 13:13:18 +07:00
Wilfred Hughes 15b6172ed1 Remove unused function 2021-11-14 13:11:16 +07:00
Wilfred Hughes bc96b702ba Update screenshot repro commands 2021-11-14 13:11:08 +07:00
Wilfred Hughes 25dae40dfa Display the file name even when there are no syntactic changes 2021-11-14 13:04:06 +07:00
Wilfred Hughes 8f0603e22b Merge branch 'truncate_lines' 2021-11-14 13:02:56 +07:00
Wilfred Hughes 4e622e10f7 Update previous line numbers even with single-side display 2021-11-14 12:51:18 +07:00
Wilfred Hughes 0e543a3feb Reduce padding to use horizontal space more effectively 2021-11-14 12:51:18 +07:00
Wilfred Hughes 2125d12fcf Factor out width calculation and compute it per-hunk 2021-11-14 12:51:17 +07:00
Wilfred Hughes 410f60c845 Factor out string line number munging 2021-11-14 12:50:38 +07:00
Wilfred Hughes d050b92158 Collapse the unchanged side if a hunk is exclusively adds/removes 2021-11-14 12:45:36 +07:00
Wilfred Hughes 21ac5f012f Line truncation/reflowing WIP 2021-11-14 12:45:36 +07:00
Wilfred Hughes af170a90ba Don't sort lines when merging hunks 
They should already be in MatchedPos order, so sorting by line number
breaks that.
 2021-11-14 12:44:46 +07:00
Wilfred Hughes 23b9092bd6 Add sample file pair that has shown a ton of hunk merging bugs 2021-11-14 11:49:37 +07:00
Wilfred Hughes 22a4acef15 Increase context to three lines 
This matches the default in other diff tools.

Also increase the gap to increase the likelihood of merging adjacent
hunks.
 2021-11-14 10:37:27 +07:00
Wilfred Hughes 0e0ae58fb1 Add a basic unit test for sorted_novel_positions 2021-11-14 10:35:00 +07:00