|
|
||
|---|---|---|
| .github | ||
| demo_files | ||
| homepage | ||
| img | ||
| manual | ||
| sample_files | ||
| src | ||
| tests | ||
| translation/zh-CN | ||
| vendored_parsers | ||
| .codecov.yml | ||
| .gitattributes | ||
| .gitignore | ||
| build.rs | ||
| Cargo.lock | ||
| Cargo.toml | ||
| CHANGELOG.md | ||
| CITATION.cff | ||
| difft.1 | ||
| difft.1.md | ||
| justfile | ||
| LICENSE | ||
| README.md | ||
| rust-toolchain.toml | ||
Difftastic is a structural diff tool that compares files based on their syntax.
For installation instructions, see Installation in the manual.
Basic Example
In this JavaScript example, we can see:
(1) Difftastic understands nesting. It highlights the matching { and
}, but understands that foo() hasn't changed despite the leading
whitespace.
(2) Difftastic understands which lines should be aligned. It's aligned
bar(1) on the left with bar(2) on the right, even though the
textual content isn't identical.
(3) Difftastic understands that line-wrapping isn't
meaningful. "eric" is now on a new line, but it hasn't changed.
One Minute Demo
This one minute screencast demonstrates difftastic usage with both standalone files and git.
Languages
Difftastic supports over 30 programming languages, see the manual for the full list.
If a file has an unrecognised extension, difftastic uses a textual diff with word highlighting.
Known Issues
Performance. Difftastic scales relatively poorly on files with a large number of changes, and can use a lot of memory.
Display. Difftastic has a side-by-side display which usually works well, but can be confusing.
Robustness. Difftastic regularly has releases that fix crashes.
Non-goals
Patching. Difftastic output is intended for human consumption, and it
does not generate patches that you can apply later. Use diff if you
need a patch.
(Patch files are also line-oriented, which is too limited for difftastic. Difftastic might find additions and removals on the same line, and it tracks the relationship between line numbers in the old and new file.)
Merging. AST merging is a hard problem that difftastic does not address.
FAQ
Isn't this basically --word-diff --ignore-all-space?
Word diffing can't do this.
Difftastic parses your code. It understands when whitespace matters,
such as inside string literals or languages like Python. It understands
that x-1 is three tokens in JS but one token in Lisp.
Can I use difftastic with git?
You can! The difftastic manual includes instructions for git usage. You can also use it with mercurial.
If you're a magit user, check out this blog post showing one way to use difftastic with magit.
Does difftastic integrate with my favourite tool?
Probably not. Difftastic is young. Consider writing a plugin for your favourite tool, and I will link it in the README!
Can difftastic help me with merge conflicts?
Yes! As of version 0.50, difftastic understands merge conflict markers
(i.e. <<<<<<<, ======= and >>>>>>>).
Pass your file with conflicts as a single argument to difftastic. Difftastic will construct the two conflicting files and diff those.
$ difft file_with_conflicts.js
Can difftastic do merges?
No. AST merging is a hard problem that difftastic does not address.
AST diffing is a lossy process from the perspective of a text diff. Difftastic will ignore whitespace that isn't syntactically significant, but merging requires tracking whitespace.
Can difftastic ignore reordering?
No. Difftastic always considers order to be important, so diffing
e.g. set(1, 2) and set(2, 1) will show changes.
If you're diffing JSON, consider sorting the keys before passing them to difftastic.
$ difft <(jq --sort-keys < file_1.json) <(jq --sort-keys < file_2.json)
See also Tricky Cases: Unordered Data Types in the manual.
Can I use difftastic to check for syntactic changes without diffing?
Yes. Difftastic can check if the two files have the same AST, without calculating a diff. This is much faster than normal diffing, and useful for building tools that check for changes.
For example:
$ difft --check-only --exit-code before.js after.js
This will set the exit code to 0 if there are no syntactic changes, or 1 if there are changes found.
Why aren't colours appearing in my terminal?
Difftastic uses ANSI bright colours by default, but some terminal themes show bright colours as grey. Solarized is a popular theme that does this.
If you're a Solarized user, use export DFT_BACKGROUND=light to
disable bright colours, or try a different terminal colour scheme.
How does it work?
Difftastic treats structural diffing as a graph problem, and uses Dijkstra's algorithm.
My blog post describes the design, and there is also an internals section in the manual.
Translation
License
Difftastic is open source under the MIT license, see LICENSE for more details.
This repository also includes tree-sitter parsers by other authors in
the vendored_parsers/ directory. These are a mix of the MIT license and the
Apache license. See vendored_parsers/*/LICENSE for more details.
Files in sample_files/ are also under the MIT license unless stated
otherwise in their header.