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

11603 Commits (ed0f50fa689a5f7099eb959074b3a06225d8a2a9)
 

Author SHA1 Message Date
Wilfred Hughes ed0f50fa68 Remove --error-limit to prepare for release 2023-02-02 22:22:23 +07:00
Wilfred Hughes 0177ce27f9 Mention #473 in the changelog 2023-02-02 22:19:52 +07:00
Wilfred Hughes b6e756ed1a
Merge pull request #473 from Miksu82/master 
Fix file content type detection for small gzipped files
 2023-02-02 22:18:59 +07:00
Wilfred Hughes b78067a96b Disable unfinished error_limit logic to prepare for release 2023-02-02 22:11:31 +07:00
Wilfred Hughes bf26ec890f Update changelog for #475 2023-02-02 22:11:24 +07:00
Wilfred Hughes 4811192516
Merge pull request #475 from n9v9/bugfix/windows-dev-null 
Check arguments passed from Git for `/dev/null`
 2023-02-02 22:07:05 +07:00
Mika Ristimäki 926055634c Remove application/octet-stream check when checking mime type 2023-02-02 11:08:24 +07:00
Niklas Vogel abdef09bdd Check arguments passed from Git for `/dev/null` 2023-02-01 17:53:16 +07:00
Mika Ristimäki c573094ee5 Make sure gzip files are treated as binary 2023-02-01 11:01:26 +07:00
Mika Ristimäki 289632afcc Fix formatting 2023-02-01 10:20:47 +07:00
Mika Ristimäki bb81f0e524 Fix file content type detection for small gzipped files 2023-02-01 10:20:47 +07:00
Wilfred Hughes fe7b785e32
Merge pull request #474 from yusancky/230201-1 
Update Chinese translation according to 9ce6014
 2023-01-31 17:20:32 +07:00
yusancky 99a0f95379
Update Chinese translation according to 9ce6014 2023-02-01 02:23:06 +07:00
Wilfred Hughes 92d21dc5c0 Silence another clippy lint 2023-01-30 08:35:24 +07:00
Wilfred Hughes 8e1503a11d Add an --error-limit CLI option 
Starts #472.
 2023-01-26 23:55:41 +07:00
Wilfred Hughes cc3f266969 Treat `%in%` as a single atom in R 2023-01-26 22:40:10 +07:00
Wilfred Hughes ad4c0d8b9c Fix folder name in manual 2023-01-26 08:50:13 +07:00
Wilfred Hughes 5ed4bac8a5 Add support for R 
Fixes #470
 2023-01-26 08:50:00 +07:00
Wilfred Hughes c2e047a7bf Add 'vendored_parsers/tree-sitter-r/' from commit '80efda55672d1293aa738f956c7ae384ecdc31b4' 
git-subtree-dir: vendored_parsers/tree-sitter-r
git-subtree-mainline: 5dfa4b64a9
git-subtree-split: 80efda5567
 2023-01-26 08:18:58 +07:00
Wilfred Hughes 5dfa4b64a9 Update new parser instructions 2023-01-26 08:16:06 +07:00
Wilfred Hughes 998c9e94ff Fix crash on repeated, partially novel lists 
Fixes #469
 2023-01-25 23:54:41 +07:00
Wilfred Hughes 12fe91560c Add doc comments to slider functions 2023-01-25 23:17:42 +07:00
Wilfred Hughes 6321b8ece2 Consistently append newlines regardless of colour mode 2023-01-25 16:55:12 +07:00
Wilfred Hughes 3291da6be4 Allow colour to be configured with DFT_COLOR too 
In #468 it's also mentioned that this couldn't be configured with an
environment variable.
 2023-01-25 16:44:41 +07:00
Wilfred Hughes 4337fbbcd8 Show the default value for --color and --display 
Fixes #468
 2023-01-25 16:40:12 +07:00
Wilfred Hughes 897305ed6b Allow --ignore-comments to be used with --dump-syntax 2023-01-25 16:31:09 +07:00
Wilfred Hughes 9bdd1964b0 Improve doc comments 2023-01-23 08:47:52 +07:00
Wilfred Hughes 6c3dc6b69e Fix formatting in comment 2023-01-23 08:38:40 +07:00
Wilfred Hughes 9ce60140ce Update screenshot and ensure sample files match 2023-01-22 20:19:36 +07:00
Wilfred Hughes edb51ece86 Disable a clippy warning that we can't satisfy for Syntax 2023-01-22 20:03:44 +07:00
Wilfred Hughes a37edbab8d Silence some clippy warnings 2023-01-22 20:03:44 +07:00
Wilfred Hughes 1294fcf31f
Merge pull request #467 from sgkoishi/patch-1 
Update linguist-vendored attribute
 2023-01-19 16:21:55 +07:00
Stargazing Koishi 809ca7a04a
Update linguist-vendored attribute 2023-01-19 14:13:25 +07:00
Wilfred Hughes fe68f43e93 Use crossterm for is_tty and terminal width 
This is activly maintained, handles stdout being directed, and seems
to be tested more on Windows too (potentially improving #363).
 2023-01-17 00:03:08 +07:00
Wilfred Hughes 64f8baf921 Update Cargo.lock for d8fa9f82b 2023-01-16 09:45:08 +07:00
Wilfred Hughes 4cc6c399c1
Merge pull request #464 from yusancky/yusancky-trans-zh-1 
[translation] Adjust content of Chinese translation
 2023-01-16 08:30:48 +07:00
yusancky 390fa6f4a5
fix: `这个博客` -> `这篇博客` 2023-01-16 18:05:24 +07:00
yusancky f4fda2479f
Adjust content of Chinese translation 2023-01-16 17:18:26 +07:00
Wilfred Hughes d8fa9f82b2 Update terminal_size 2023-01-15 23:24:51 +07:00
Wilfred Hughes 48c64297c5 Roll version 2023-01-15 20:15:40 +07:00
Wilfred Hughes dffc72d1ca cargo fmt 2023-01-15 20:13:08 +07:00
Wilfred Hughes daa7156a2c Fix crash with --display=inline and trailing whitespace 
Line numbers may be less than .max_line(), as .max_line() trims
whitespace. Ensure pad_after() is robust to this, and add a test.

I could only reproduce the crash in inline display mode, but in
principle this could be an issue in all modes.

Fixes #452
 2023-01-15 20:04:12 +07:00
Wilfred Hughes e17b6e6109 Clarify wording 2023-01-15 15:56:37 +07:00
Wilfred Hughes c9105ca0ba cargo fmt 2023-01-15 15:49:24 +07:00
Wilfred Hughes b8a2910c26 Reuse the tree-sitter tree for extracting comments 
This reduces instruction counts by 9% on some test
files (e.g. samples_files/typing_before.ml).
 2023-01-15 15:47:15 +07:00
Wilfred Hughes 2536fe7396 Factor out parsing to tree in main.rs 2023-01-15 15:42:44 +07:00
Wilfred Hughes 2d6ee94ac1 Split out to_tree and to_syntax functions in parser 2023-01-15 15:39:07 +07:00
Wilfred Hughes a488efd63b Add highlighting for ignored syntactic elements 
This finishes --ignore-comment support.

Fixes #449.
 2023-01-15 14:49:46 +07:00
Wilfred Hughes f3b02f7b47 cargo fmt 2023-01-15 11:43:09 +07:00
Wilfred Hughes 0e3c57c64a Skip unique items before computing Myer's diff on text 
This substantially improves performance on text files where there are
few lines in common.

For example, 10,000 line files with no lines in common is more than 10x
faster (8.5 seconds to 0.49 seconds on my machine), and
sample_files/huge_cpp_before.cpp is nearly 2% faster.

Fixes the case mentioned by @quackenbush in #236.

This is inspired by the heuristics discussions at
https://github.com/mitsuhiko/similar/issues/15
 2023-01-15 11:38:02 +07:00