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

15335 Commits (267a2eaef3428fd44e7f4ad5088620c6b00d2cdc)
 

Author SHA1 Message Date
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
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
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
Patrick Förster f567ce7863
Compare LARGE_STATE_COUNT change in CI (#153) 2024-07-24 20:59:02 +07:00
Jonáš Dujava 7ee50b2868
Reorder and refactor code (#152) 
Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
 2024-07-24 16:33:35 +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
Jonáš Dujava 6706f88d5b
Better color reference (#151) 
- add `\mathcolor`
- support directly passing color scheme and spec
- (optionally) include following argument

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
 2024-07-23 09:16:06 +07:00
Jonáš Dujava 81acebb480
Add extra math environments (#150) 
Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
 2024-07-23 09:15:06 +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
dependabot[bot] 12523bd1ff
Bump node-addon-api from 8.0.0 to 8.1.0 (#138) 2024-07-21 06:53:02 +07:00
dependabot[bot] eae2f81adf
Bump prettier from 3.3.2 to 3.3.3 (#139) 2024-07-21 06:52:52 +07:00
Jonáš Dujava 55ef65a416
Properly support definition commands from xparse (#148) 
Additionally, handle command definition without curly braces
around the defined command name.

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
 2024-07-21 08:52:18 +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
Jonáš Dujava d018f2e662
Add delimiter node (#147) 
Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
 2024-07-20 21:37:17 +07:00
Patrick Förster 107435ada4
Add luacode and asy as verbatim environments (#141) 
Adds the following source code environments:
- `asy`
- `asydef`
- `luacode`
- `luacode*`

Fixes #140.
 2024-07-18 17:35:26 +07:00
Patrick Förster 5b6b442b2a
Generate parser before running fuzzer tests (#144) 2024-07-18 16:45:19 +07:00
Patrick Förster 2850a4076a
Fix including grammar.json in gitignore (#143) 2024-07-18 16:36:02 +07:00
Patrick Förster 0fb72fb1b2
Fix version numbers for Swift, Python and C (#142) 2024-07-18 16:33:20 +07:00