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

13265 Commits (syntax_id)
 

Author SHA1 Message Date
Wilfred Hughes f1d59baf6c Get it working 2023-08-16 21:19:44 +07:00
Wilfred Hughes 6e7518e680 Pass syntax_ids through 2023-08-16 15:25:16 +07:00
Wilfred Hughes 18b96ebdab WIP syntax ID in Vertex 2023-08-16 11:29:58 +07:00
Wilfred Hughes 76fcc933d5 Move changelog parsing to justfile 2023-08-15 23:40:32 +07:00
Wilfred Hughes 11899a237c Roll version 2023-08-15 23:40:23 +07:00
Wilfred Hughes def88bbb43 Fix spelling in CHANGELOG 2023-08-15 23:01:09 +07:00
Wilfred Hughes a87ca9dd87 Mention merge conflicts in FAQ 2023-08-15 23:00:43 +07:00
Wilfred Hughes 8ac4398c48 Automatically bump version after release 2023-08-15 22:26:28 +07:00
Wilfred Hughes 191f42e9d5 Clippy fixes 2023-08-15 21:42:06 +07:00
Wilfred Hughes 6b1c82efdf Prefer Option<&T> over &Option<T> 2023-08-15 21:37:41 +07:00
Wilfred Hughes a43b9ae9eb Dim the extra information section in hunks 2023-08-15 21:33:11 +07:00
Wilfred Hughes e1f97e614f Improve wording of conflict information 
Fixes #555
 2023-08-15 17:52:02 +07:00
Wilfred Hughes e0a1405453 Add the ability to parse conflict markers and diff the two files 2023-08-15 09:01:15 +07:00
Wilfred Hughes f06e95ca02 Renamed `old_path` to `extra_info` and format it during option parsing 
This allows us to use this field for other purposes that aren't
renames.
 2023-08-14 08:41:42 +07:00
Wilfred Hughes f1ba399504 Move local variable closer to first use 2023-08-14 08:27:42 +07:00
Wilfred Hughes c6be0bc16a Mention --check-only in the FAQ 2023-08-13 23:08:06 +07:00
Wilfred Hughes eeb2974967 Move option parsing before argument parsing 
This is useful for additional mode parsing that wants to access these
options.
 2023-08-13 21:34:42 +07:00
Wilfred Hughes 1c60f3efd3 Move content detection out of diff_file_content 
This makes the function useful in cases when we already have a string,
not bytes.
 2023-08-13 21:31:37 +07:00
Wilfred Hughes 0af76db498 Update regression tests for humansize file formatting 2023-08-13 09:10:16 +07:00
Wilfred Hughes 3c702d0490 Use humansize for file size formatting 2023-08-12 22:34:11 +07:00
Wilfred Hughes d901ac6e9e Silence warning on compiling tree-sitter-go 2023-08-12 11:35:48 +07:00
Wilfred Hughes 5f25bc0ebd Rename information in header should only be shown on first hunk 
Fixes #553
 2023-08-11 08:21:29 +07:00
Wilfred Hughes f2f9260542 Use the Kotlin parser's built-in highlighting 2023-08-09 00:04:57 +07:00
Wilfred Hughes 56230d1c69 Merge commit '06a2f6e71c7fcac34addcbf2a4667adad1b9c5a7' 2023-08-08 23:39:19 +07:00
Wilfred Hughes 4e77f83dd9 Merge commit '7dc4fb60390218b09bc351062eeede7dcdbb4d9f' 2023-08-08 23:37:28 +07:00
Wilfred Hughes d0cf8c6d0d Merge commit 'e398400a0b785af3cf571f5a57eccab242f0cdf9' 2023-08-08 23:28:07 +07:00
Wilfred Hughes 20760558ff Merge commit '338db38330f0d25cba8e2c6428240ebc5e020264' 2023-08-08 23:26:49 +07:00
Wilfred Hughes 3612c472f5 Merge commit '5f2c94b897601b4029fedcce7db4c6d76ce8a128' 2023-08-08 23:24:52 +07:00
Wilfred Hughes 34d20d6665 Merge commit 'a2861e88a730287a60c11ea9299c033c7d076e30' 2023-08-08 23:24:08 +07:00
Wilfred Hughes 3eb014c0a7 Merge commit 'bbaa67a180cfe0c943e50c55130918be8efb20bd' 2023-08-08 23:22:22 +07:00
Wilfred Hughes db8797d6c2 Merge commit '7aa24fe8616072fc1a659f72d5b60bd8c01fb5cc' 2023-08-08 23:01:48 +07:00
Wilfred Hughes a187d7a134 Improve rename styling 
It should use the heading with colour, consistent with other modes,
and the header should come before rename information.
 2023-08-08 08:53:33 +07:00
Wilfred Hughes 1e97003da9 Update to latest rayon 
This is also a tiny perf win (2.467B instructions to 2.429B
instructions for slow_before.rs).
 2023-08-08 08:22:30 +07:00
Wilfred Hughes 4fdc8eebcd Increase MSRV to 1.59 2023-08-07 20:32:08 +07:00
Wilfred Hughes ab1b87eebb Update year in in LICENSE 2023-08-05 22:28:45 +07:00
Wilfred Hughes 2f3f0a875a Add note about how MSRV is chosen 2023-08-05 10:17:58 +07:00
Wilfred Hughes ba92a93f9b Fix rustc warning on recent nightly 2023-08-04 23:31:31 +07:00
Wilfred Hughes 19cbf1d458 Implement some other useful traits on EqOnFirstItem 
These aren't immediately used, but they're handy for experimenting
with the similar library which requires these.
 2023-08-04 23:29:29 +07:00
Wilfred Hughes 892d4fdb58 Ensure size_hint never exceeds graph_limit 
If we have thousands of syntax nodes on both sides, we can end
up attempting to preallocate a very large hashmap.

In #542, a user hit an issue with two JSON files where the LHS had
33,000 syntax nodes and the RHS had 34,000 nodes, so we'd attempt to
preallocate a hashmap of capacity 1,122,000,000. This required
allocating 70,866,960,400 bytes (roughly 66 GiB).

Impose a sensible limit on the hashmap.

Fixes #542
 2023-08-04 17:19:27 +07:00
Wilfred Hughes c937f819a1 Log the number of bytes in the arena at the end of route finding 2023-08-04 17:04:23 +07:00
Wilfred Hughes 0c01c73398 Be consistent in lifetime names for Vertex 2023-08-03 08:32:16 +07:00
6cdh 7dc4fb6039 add comment for symbol/number parse 2023-08-03 18:04:41 +07:00
6cdh 47f9148a66 bump version: v0.3.0 
* rewrite scanner from C++ to C, thanks @amaanq
* optimize symbol/number parse
 2023-08-02 13:37:42 +07:00
6cdh dbfe8096bc feat: optimize symbol/number parse and reduce library size 2023-08-02 13:34:17 +07:00
Wilfred Hughes 757c297412 Adjust header style 
Show the hunk count and detected language in a dimmed style. This
information is less important than the diff content itself, so this
change makes the important information more prominent.

First part of #544
 2023-07-31 08:35:27 +07:00
Wilfred Hughes 37683db6de Don't fail CI if coverage upload fails 
This step sometimes fails, which does not mean our code is bad.
 2023-07-29 10:40:32 +07:00
Wilfred Hughes 797af40ae8 Improve Java highlighting 2023-07-27 08:33:38 +07:00
Amaan Qureshi a2861e88a7
Mark helper functions static to avoid compile time conflicts with other scanners (#60) 2023-07-27 09:25:48 +07:00
Wilfred Hughes b2c8cb640f Update crossbeam-channel dependency 
0.5.x prior to 0.5.8 have been yanked:
https://github.com/crossbeam-rs/crossbeam/blob/master/crossbeam-channel/CHANGELOG.md
 2023-07-26 20:38:34 +07:00
Wilfred Hughes de0e1f5bda Add test for --ignore-comments option 2023-07-26 20:15:13 +07:00