sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
a structural diff that understands syntax 🟥🟩
6,956 Commits
43 Branches
77 Tags
1.9 GiB
Rust 80.2%
CSS 8.1%
HTML 6.8%
JavaScript 4.2%
Roff 0.7%
 
 
 
 
 
Go to file
Wilfred Hughes 4529018d1d Attempt to set C++ standard for Windows compilers 
There's no helper in the cc crate for this, but it's been proposed:
https://github.com/alexcrichton/cc-rs/issues/565

Hopefully will improve #67
 		2021-12-05 10:43:29 +07:00
.github/workflows Use rustdoc as subdir name 2021-11-21 19:03:13 +07:00
img Improve README 2021-11-23 22:38:25 +07:00
manual Minor grammar fix to contributing guide 2021-12-04 23:56:59 +07:00
sample_files Treat float values as atoms in CSS 2021-12-04 18:34:24 +07:00
src Remove unused type 2021-12-04 23:53:35 +07:00
vendor Merge commit 'e43ea50e8701bbe319e2a42922caab393267ee1c' 2021-11-28 11:41:26 +07:00
.codecov.yml Disable 'patch' test coverage in GitHub status 2021-09-13 00:44:08 +07:00
.gitignore
…
CHANGELOG.md Roll version 2021-12-04 23:56:42 +07:00
CITATION.cff Add citation information 2021-11-23 09:52:39 +07:00
Cargo.lock Roll version 2021-12-04 23:56:42 +07:00
Cargo.toml Roll version 2021-12-04 23:56:42 +07:00
LICENSE
…
README.md Add support for Common Lisp 2021-11-26 22:53:21 +07:00
build.rs Attempt to set C++ standard for Windows compilers 2021-12-05 10:43:29 +07:00
text_diff_notes.md
…

README.md

it's difftastic!
crates.io codecov.io manual

Difftastic is an experimental structured diff tool that compares files based on their syntax.

See the manual to get started.

Demo: Wrapping Expressions

Difftastic understands expression nesting. If you wrap an expression in an if statement, difftastic understand that the inner values are unchanged.

Elisp screenshot

Compare this with git's default diff. It is confused by indentation changes, and doesn't know which closing parenthesis has been added.

Elisp comparison screenshot

Demo: Reflowing Code

Difftastic is robust to code formatting changes. If you change how many items appear on a single line, difftastic will only show you items which have changed.

Rust screenshot

In git's default diff, it's harder to see that iter and the curly braces are unchanged. It's also harder to see the affected line numbers.

Rust comparison screenshot

Languages

Difftastic supports the following languages:

  • Bash
  • C
  • C++
  • C#
  • Clojure
  • Common Lisp
  • CSS
  • Elixir
  • Emacs Lisp
  • Go
  • Haskell
  • Java
  • JavaScript (and JSX)
  • JSON
  • OCaml
  • Python
  • Ruby
  • Rust
  • TypeScript (and TSX)

If a file has an unrecognised extension, difftastic uses a line-oriented diff.

Known Issues

Performance. Difftastic scales relatively poorly on files with a large number of changes, and can use a lot of memory. This might be solved by A* search.

Display. Difftastic has a side-by-side display which usually works well, but can be confusing.

Diff accuracy. Some delimiter moves are currently ignored (see #30).

Integration. Difftastic only has limited support for git and mercurial today.

Non-goals

Patch files. If you want to create a patch that you can later apply, use diff. Difftastic ignores whitespace, so its output is lossy. (AST patching is also a hard problem.)

License

Difftastic is open source under the MIT license, see LICENSE for more details.

Files in sample_files/ are also under the MIT license unless stated otherwise in their header.