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

271 Commits (711d39975806233ce505abcea45998170d402579)

Author SHA1 Message Date
Antonin Delpeuch 2a65dd7e02
Migrate to tree-sitter-sequel (#905) 
For #891.
 2025-10-15 00:52:40 +07:00
Antonin Delpeuch b666424bbd
manual: Update instructions to add a parser (#902) 
* manual: Update instructions to add a parser

This changes the manual so that it doesn't encourage people to vendor parsers if they are available on crates.io.

For #891.

* Fix language inconsistency
 2025-10-14 00:03:19 +07:00
Wilfred Hughes f458eb5598 Document mercurial alias 
Fixes #887
 2025-10-06 22:25:03 +07:00
Antonin Delpeuch 6fbd425b55 Unvendor tree-sitter-dart 2025-10-05 21:09:41 +07:00
Antonin Delpeuch 6d7b594aca Unvendor tree-sitter-hcl 2025-10-04 09:31:32 +07:00
Wilfred Hughes 0c2ba27886 Fix copy-paste mistake in language list 2025-10-01 22:29:47 +07:00
Wilfred Hughes 8e06e74f76 Update changelog 2025-10-01 22:29:01 +07:00
Wilfred Hughes 1a4313423d Increase minimum Rust version 2025-08-29 22:53:54 +07:00
Wilfred Hughes 62014159d1 Tweak wording 2025-07-03 09:36:46 +07:00
Wilfred Hughes eb3735a90c Update reference command for seeing parser ages 2025-07-02 23:00:49 +07:00
Wilfred Hughes c797641838 Tweak sidebar order 2025-07-02 22:48:06 +07:00
Wilfred Hughes b3995cd967 Switch to a newer, actively maintained Zig parser 
Fixes #851
 2025-07-02 22:42:05 +07:00
Abdul-Rahman Sibahi 0a24f131a1
add jj link 2025-06-17 13:20:03 +07:00
Abdul-Rahman Sibahi ef890856c1
Correct jj links 2025-06-17 13:18:47 +07:00
Abdul-Rahman Sibahi c0c33517e3
Update jj.md 
old setting was deprecated. this setting worked for me
 2025-06-17 08:51:04 +07:00
Bryce Berger 791b0e2bec add verilog, systemverilog support 2025-06-13 00:15:53 +07:00
Wilfred Hughes 36037cf7e0 Use line-oriented terminology consistently in manual 2025-05-24 23:22:14 +07:00
Wilfred Hughes 1341ec68e5 Fix typo 2025-05-21 00:13:29 +07:00
Wilfred Hughes bbe681013d Expand packaging manual page 2025-05-13 09:56:09 +07:00
Wilfred Hughes 76e9eae32e Document how to build difftastic for packaging 
Closes #531
Closes #813
 2025-05-13 01:14:24 +07:00
Wilfred Hughes 149c040c45 Prefer 'line-oriented diff' terminology 
'Text diff' is confusing as the input files to difftastic's structural
diffing logic is also text. Line-oriented more accurately captures the
important aspect.
 2025-04-28 09:05:11 +07:00
Wilfred Hughes d920839be1 Configure typos for more directories and fix issues found 2025-03-31 23:35:27 +07:00
Wilfred Hughes 97bab83730 Update Pascal parser to use crate 
Closes #817
 2025-02-22 21:34:10 +07:00
Wilfred Hughes de601cbfc5 Position no longer has any effect on diffing 2025-02-21 08:27:08 +07:00
Wilfred Hughes f34a901476 Update version number in build instructions 2025-02-15 14:28:24 +07:00
Wilfred Hughes 22e4693c57 Document usage with jj 2025-02-11 08:44:57 +07:00
Wilfred Hughes d42797fa7e Update Nix parser and use the crate from crates.io 2025-02-10 08:59:52 +07:00
0xflotus b570325568 chore: fixed small error in docs 2025-01-02 13:04:36 +07:00
Wilfred Hughes dfcb26c7af Use tree-sitter-yaml from crates.io 2024-12-21 14:19:40 +07:00
Wilfred Hughes dda64336e6 Use tree-sitter-make from crates.io 2024-12-21 14:10:07 +07:00
Wilfred Hughes b3606fc219 Use tree-sitter-xml from crates.io 2024-12-20 09:16:19 +07:00
Wilfred Hughes a6eb339f71 Use tree-sitter-toml from crates.io 2024-12-20 09:07:52 +07:00
Wilfred Hughes edf28cdc37 Fix incorrect link text 2024-12-20 00:09:23 +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 f58c9e074a Bump MSRV to 1.66 2024-10-15 23:15:07 +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 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
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
Alexander Ilin 65dab7ef15 Add Windows installation instructions for Scoop 2024-08-26 08:17:51 +07:00
Stephan Klinger 7bc92290d1
Fix typo 2024-07-26 21:30:46 +07:00
Wilfred Hughes 9b6bc7486f Fix invocation of flamegraph command in manual 2024-07-20 23:38:16 +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
Wilfred Hughes a259c858a1 Update F# docs 2024-05-14 10:13:37 +07:00
Wilfred Hughes d92b65c5fd Merge remote-tracking branch 'thecentury/f#' 2024-05-14 09:46:55 +07:00