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

15327 Commits (ca9b7da43f079a27bccfd5457276fa51937c6cb0)
 

Author SHA1 Message Date
Wilfred Hughes 45e5cd8157 Mention mergiraf 2024-11-26 01:41:46 +07:00
Wilfred Hughes 00f6959a29 Ensure JSON output is consistently ordered 
Closes #780
 2024-11-15 23:17:27 +07:00
Wilfred Hughes 3a1e398edc Improve handling of named pipe arguments 
Use display_name in more places, and prefer file names with extensions
when we have two arguments.

Fixes #783
 2024-11-15 23:11:25 +07:00
Wilfred Hughes 956b09a63e Remove another mention of old flag name 2024-11-15 22:54:58 +07:00
Wilfred Hughes 430db0efc5 Update options parsing for new flag spelling 2024-11-15 22:51:48 +07:00
Wilfred Hughes 39e645832e Fix compilation on older Rust versions 2024-11-15 22:08:15 +07:00
Wilfred Hughes 90f108105d The syntax is dot, not dotty 2024-11-15 22:04:07 +07:00
Wilfred Hughes 13b8252d8b Fix typo 2024-11-14 23:41:35 +07:00
Wilfred Hughes d5b1e26d70 Add a debug helper for syntax tree as DOT 2024-11-14 22:55:00 +07:00
Wilfred Hughes 4df51dc57c Improve syntax highlighting on tree-sitter lists that are just keywords 
Closes #777
 2024-11-15 00:03:30 +07:00
Wilfred Hughes 819a672df8 Clarify content ID in debug output on Syntax 2024-11-15 00:03:30 +07:00
Wilfred Hughes 1c0dd04ef1 Allow debug printing of HighlightedNodeIds 2024-11-15 00:03:30 +07:00
Wilfred Hughes 549cb483fe Fix crash due to trailing newlines in string nodes at EOF 
Fixes #782
 2024-11-15 00:03:30 +07:00
dependabot[bot] 7b06f6ed39
Bump tree-sitter/setup-action from 1 to 2 (#179) 2024-11-11 18:56:52 +07:00
dependabot[bot] 45fe67712c
Bump node-addon-api from 8.2.0 to 8.2.2 (#180) 2024-11-11 18:56:43 +07:00
dependabot[bot] 42c550e940
Bump tree-sitter-cli from 0.24.1 to 0.24.4 (#181) 2024-11-11 18:56:34 +07:00
Jan Klass 0412e13fcc docs(contributing): Add mdbook install note about toolchain 
The difftastic `Cargo.toml` currently specifies Rust version 1.66 to be used.

When running `cargo install mdbook` in the repository directory or manual sub-directory, the installation fails.

With a more recent Rust toolchain active, which can reasonably be assumed outside of the repository directory, the mdbook installation works fine.

If the user does not have a more recent toolchain active outside of the directory, the note at least serves as a pointer to the issue.

---

The error in question:

```
error: failed to compile `mdbook v0.4.40`, intermediate artifacts can be found at `[…]\Temp\cargo-install[…]`

Caused by:
  failed to select a version for `env_logger`.
      ... required by package `mdbook v0.4.40`
  versions that meet the requirements `^0.11.1` are: 0.11.5, 0.11.4, 0.11.3, 0.11.2, 0.11.1

  the package `mdbook` depends on `env_logger`, with features: `anstream` but `env_logger` does not have these features.
   It has an optional dependency with that name, but that dependency uses the "dep:" syntax in the features table, so it does not have an implicit feature with that name.

  failed to select a version for `env_logger` which could resolve this conflict
```
 2024-10-30 07:45:02 +07:00
Jan Klass a01efbf5f2 docs(install): Improve latest release wording 2024-10-26 13:38:24 +07:00
Jan Klass f299fa1157 docs(install): Add winget install instruction 
The 'difftastic' is not linked like in the other sections because winget does not have a package-frontend website. We could link to the package source [pkgsrc], but that seems inappropriate for end-users.

[pkgsrc]: https://github.com/microsoft/winget-pkgs/tree/master/manifests/w/Wilfred/difftastic
 2024-10-26 13:38:24 +07:00
Jan Klass 0b3b187d02 docs(install): Improve Installation docs 
* Introduce OS sections
* Introduce general intro text
* Highlight differentiators (OS and package managers)
* Use consistent source code spacing
 2024-10-26 13:38:24 +07:00
Wilfred Hughes c2e98bb65a Roll version 2024-10-24 08:17:18 +07:00
Wilfred Hughes 870d1411a0 Link to relevant page in manual 2024-10-23 22:27:01 +07:00
Wilfred Hughes 05378e4554 Silence a clippy lint 2024-10-23 08:51:13 +07:00
Wilfred Hughes 6a5f5d6f00 Document side-by-side changes 2024-10-23 08:47:28 +07:00
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
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