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

15519 Commits (64e73bb58c2243de15d3767bc7095a992e2acf7d)
 

Author SHA1 Message Date
Wilfred Hughes 618d8dd8ad Distinguish version and short version metadata to make --help clearer 
Fixes #774
 2024-10-23 08:44:28 +07:00
Wilfred Hughes c396bb0102 Note on ASCII assumptions in content_max_width 2024-10-21 22:57:01 +07:00
Wilfred Hughes 511b7579fb Fix min() which should be max() 2024-10-21 22:53:28 +07:00
Wilfred Hughes 845bbeafff Cap the maxmimum size of columns in side-by-side display 2024-10-21 09:04:29 +07:00
Wilfred Hughes 8b2b94a458 Clarify name 2024-10-21 08:39:03 +07:00
Wilfred Hughes 8cdb59fa5e Normalise newlines before diffing 
This produces good, consistent results on different trailing newlines
before, consistent with the behaviour before 7edd2a82cd (see #755).
 2024-10-21 08:34:39 +07:00
Wilfred Hughes f58c9e074a Bump MSRV to 1.66 2024-10-15 23:15:07 +07:00
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
dependabot[bot] 87e4059f01
Bump node-gyp-build from 4.8.1 to 4.8.2 (#165) 2024-10-05 12:22:30 +07:00
dependabot[bot] 210132100f
Bump node-addon-api from 8.1.0 to 8.2.0 (#169) 2024-10-05 12:22:23 +07:00
dependabot[bot] 14460731ab
Update tree-sitter requirement from 0.22.2 to 0.24.1 (#173) 2024-10-05 12:22:15 +07:00
dependabot[bot] 3a7f89ec16
Bump tree-sitter-cli from 0.22.6 to 0.24.1 (#174) 2024-10-05 12:22:08 +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
Rebecca Valentine 57c9951b29
Bump tree-sitter Rust dep to 0.23 (#101) 2024-09-26 08:29:11 +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
Jonáš Dujava 1e4e30342b
Support various \def-like and \let-like commands (#167) 
Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
 2024-09-11 19:17:26 +07:00
Juhan 9586f38658
Add `(block)` for @local.scope (#99) 2024-09-09 07:51:28 +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
Giacomo Cavalieri 0d38bfdc04 Generate parser 2024-09-01 13:30:19 +07:00
Giacomo Cavalieri 16e775f33c
Add support for `%` operator in case guards (#96) 2024-09-01 08:30:01 +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
Jonáš Dujava 90fd9894be
Support argument placeholders for nested command definition (#161) 
When defining a command within other command, the arguments
are accessed by doubling the `#` sign.

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
 2024-08-18 18:12:20 +07:00
Jonáš Dujava 0422e78fb5
Support additional reference commands (#162) 
Mainly extra starred versions of already supported commands.
These are provided by standard packages `hyperref` and `cleveref`.

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
 2024-08-18 18:11:39 +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
Jonáš Dujava efe5afdbb5
Remove dead code (#156) 
Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
 2024-07-27 22:14:30 +07:00
Jonáš Dujava f23cf647fb
Implement *Copy macros for commands/environments (#154) 
This completes the implementation of all command/environment
definition macros which are provided by LaTeX kernel and
described in https://ctan.org/pkg/usrguide.

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
 2024-07-27 22:14:14 +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
Patrick Förster f074e142ad
Fix branch name in grammar size CI job (#158) 2024-07-26 16:51:10 +07:00