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

15134 Commits (09c5e64f88754df667ced8161fb976e2d186eac6)
 

Author SHA1 Message Date
Wilfred Hughes 09c5e64f88 Update comment for bumpalo as 3.15.0 was yanked due to MSRV 2024-10-15 23:10:51 +07:00
Wilfred Hughes f947673108 Bump ignore version 2024-10-15 23:10:02 +07:00
Wilfred Hughes 62aa599a10 Bump cc 2024-10-15 22:57:10 +07:00
Wilfred Hughes 565e2f12a3 Bump tree_magic_mini 
Includes a minor fix for MIME DB from homebrew on ARM mac devices.
 2024-10-15 22:50:22 +07:00
Wilfred Hughes 7edd2a82cd Always consider newlines when diffing lines 
StringIgnoringNewline caused crashes in code that assumed that two
equal values would hav the same string length.

This reverts 86612798ad. A better
approach would be to normalise line endings before diffing, but
additionally print whether files have/lack trailing newlines.

Fixes #755
 2024-10-15 08:46:34 +07:00
Wilfred Hughes 2dd4f7e912 Add doc comment 2024-10-15 08:37:18 +07:00
Mateusz Radomski 663590a3b2 Atomize hex and unicode string literals in Solidity 
Without this, changes inside these string types are not taken into
consideration when performing the diff.
 2024-10-02 08:18:40 +07:00
Wilfred Hughes 393845ddcb Change recommended git configuration 
`git-difftool` has strictly less information than `git-diff`.
`git-difftool` therefore produces worse results, and we shouldn't
recommend it.

`git-difftool` does not have file rename information, and sometimes
makes difftastic claim that file permissions have changed (depending
on the permissions of the temporary directory used).

Instead, recommend `git-diff` with an external diff configured, and
update `git-mergetool` instructions to emulate `git-diff` as much as
possible (respecting $MERGED).

Also link to the upstream git bug on segfaults with external diff
tools.

Thanks to @poliorcetics and @gthb for researching this bug and
discussing possible solutions.

Closes #734
Fixes #620
 2024-09-22 20:11:36 +07:00
Wilfred Hughes a31948384b Tweak name to reflect git internals conventions 2024-09-22 20:09:04 +07:00
Wilfred Hughes c52bca44dd Improve usage docs 
Separate out language detection, add intro sentence, clarify options
docs.
 2024-09-22 20:09:04 +07:00
Wilfred Hughes 324dd037c7 Prefer relative links 2024-09-22 20:09:04 +07:00
Andreas Deininger 5ecf3c1eb2 Bump GitHub action workflows to their latest versions 2024-09-11 21:22:59 +07:00
idea-list 6bbeb53c68 Parse pdm.lock and uv.lock as TOML 2024-09-05 00:11:09 +07:00
Justin Su e389cfe9f6 [docs] Remove unnecessary double quotes in Git alias 
This makes the config option identical to running `git config --global alias.dlog '-c diff.external=difft log -p --ext-diff'`.
 2024-09-02 16:06:27 +07:00
Wilfred Hughes 3c62ff37c0 Include OS in --version 
Fixes #757
 2024-08-29 22:52:36 +07:00
Alexander Ilin 65dab7ef15 Add Windows installation instructions for Scoop 2024-08-26 08:17:51 +07:00
Alexander Ilin b021c079aa Find and replace all instances of "the all the" with "all the" 2024-08-26 08:17:51 +07:00
Wilfred Hughes 96ff1e8dbd Tweak comment 2024-08-26 08:16:36 +07:00
Wilfred Hughes 8cda9f0dc2
Merge pull request #748 from MarcelCoding/mjml 
add mjml as xml
 2024-08-26 08:15:09 +07:00
Wilfred Hughes 53477fb46d 0.60 is released 2024-08-06 22:07:58 +07:00
Marcel 4d6eaf65e2
add mjml as xml 2024-08-03 02:38:27 +07:00
Wilfred Hughes 6f03fab178 Roll version 2024-08-01 08:29:55 +07:00
Wilfred Hughes 1ac95534fe Don't push empty positions when diffing lines 2024-07-30 16:16:34 +07:00
Wilfred Hughes 86612798ad Try ignoring trailing newlines in line-based differ 2024-07-30 16:09:40 +07:00
Wilfred Hughes 0973998de2 Clarify enum variant NovelLinePart and expand doc comments 2024-07-30 15:33:37 +07:00
Wilfred Hughes 5ad8b1bb31 Document the usage of bright colours and Solarized 
See #745 and #611
 2024-07-30 15:02:09 +07:00
Wilfred Hughes 42f69025d3
Merge pull request #744 from staeff/patch-1 
Fix typo
 2024-07-27 13:54:50 +07:00
Stephan Klinger 7bc92290d1
Fix typo 2024-07-26 21:30:46 +07:00
Wilfred Hughes 5a51c02157 Fix crash when the last hunk includes the trailing newline at EOF 
Input cleaning should happen before we diff the content, not during
display. Previously display would crash due to line numbers
referencing the line that had been stripped.

Fixes #713
Fixes #739
Fixes #742
 2024-07-26 08:54:20 +07:00
Wilfred Hughes 954979b19f
Merge pull request #659 from hugo-vrijswijk/update-scala-treesitter 
update scala treesitter
 2024-07-23 07:08:49 +07:00
Hugo van Rijswijk df76ea2369 Update compare result 2024-07-23 12:55:49 +07:00
Hugo van Rijswijk 20db4283e7 Merge commit 'a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8' 
# Conflicts:
#	vendored_parsers/tree-sitter-scala/queries/scala/highlights.scm
 2024-07-23 12:49:30 +07:00
Wilfred Hughes 78650c310a Improve accuracy of conservative width estimation optimisation 2024-07-21 11:37:27 +07:00
Wilfred Hughes c2f4b1f2ee Update tests and changelog for 1e8be4558b 2024-07-21 11:15:54 +07:00
Wilfred Hughes 92fa3fb3de Ensure files with no common content are aligned 2024-07-20 23:43:04 +07:00
Wilfred Hughes 1e8be4558b Fix performance when splitting very long lines during display 2024-07-20 23:38:16 +07:00
Wilfred Hughes 9b6bc7486f Fix invocation of flamegraph command in manual 2024-07-20 23:38:16 +07:00
Wilfred Hughes fa2ec359d7 Roll version 2024-07-20 16:11:55 +07:00
Wilfred Hughes ffe27c575e Ensure line splitting distinguishes "foo" and "foo\n" 
We rely on being able to split lines and rejoin them to obtain the
original string. `str::lines()` in the Rust stdlib does not have this
property.

This was causing crashes in word-diffing on textual diffing, where
code paths differed on the number of lines they thought a string had.

This was broken in 8b842387a1.

Fixes #688.
 2024-07-20 16:09:44 +07:00
Yedaya Katsman efe1b10e8d Update the cc package to 1.1.5 
This includes the fix to https://github.com/rust-lang/cc-rs/issues/909
which spams warnings on ubuntu 22.04
 2024-07-18 07:25:35 +07:00
eugene yokota a13f2d1ee9
Merge pull request #405 from eed3si9n/wip/array 
refactor(scanner): use new array header for stack
 2024-07-17 14:56:27 +07:00
Amaan Qureshi 3fb3931142 refactor(scanner): use new array header for stack 2024-07-17 11:36:47 +07:00
Wilfred Hughes 7248e334b7 Update to latest rustc-hash version 
This is a very minor performance win, a few percent in my
benchmarking.

typing_1.ml went from 3.013M to 2.996M instructions (0.6% reduction).
slow_1.rs went from 2.153M to 2.046M instructions (5% reduction).

Fixes #728
 2024-07-09 00:18:59 +07:00
Wilfred Hughes f1bd870382 Document how difftastic handles unordered syntax 
Closes #723
 2024-07-08 23:41:58 +07:00
Wilfred Hughes 79af24a577 Fix typo 2024-07-08 08:39:20 +07:00
eugene yokota 599d12b59f
Merge pull request #402 from eed3si9n/wip/corpus 
Move corpus
 2024-06-30 17:57:27 +07:00
Eugene Yokota a6e8f24623 Move corpus 
**Problem/Solution**
I noticed that corpus tests weren't running.
Apparently tree-sitter 0.22.0 moved the directory -https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.0
 2024-06-30 17:52:41 +07:00
Wilfred Hughes 27a0cfba16 Silence some clippy warnings 2024-06-29 23:08:11 +07:00
eugene yokota de465b0fd6
Merge pull request #401 from eed3si9n/wip/smoke 
Bump smoke test targets
 2024-06-29 23:08:45 +07:00
Eugene Yokota ae91190a6f Bump smoke test targets 
**Problem**
We currently use scala/scala and scala/scala3 to run the smoke test,
but the versions are slightly older.

**Solution**
1. This bumps the versions to latest. Thankfully not much regression on the percentage.
2. This also adds lila for testing.
 2024-06-29 23:04:18 +07:00