Improved handling of multiline strings, which could cause a crash if they occurred at the end of the file. This was particularly noticeable with YAML.
Improved language detection when one argument is a named pipe.
Improved syntax highlighting, particularly for keywords.
Recommended git configuration has changed! Please update your
~/.gitconfig
to match the git
instructions, regardless
of your difftastic version.
Side-by-side display is now smarter on very wide terminals when the content is narrow.
Fixed a crash (introduced in 0.60) when the final line in a file does not have a trailing newline and occurs more than once in the file.
difftastic now requires Rust 1.66 to build.
Fixed a crash (introduced in 0.59) when the final changed hunk included the last line of the file.
Fixed an issue where files with no common content would show duplicate hunks.
Fixed a performance issue when files had extremely long lines (e.g. 100,000+ characters).
Fixed crash on some textual files where a single change contained more than 1,000 words.
Added support for device tree and F#.
Difftastic now uses tree-sitter comment highlighing as a hint that nodes should be treated as atoms. This ensures comments are treated more consistently across languages. This fixes cases in Elm where comment differences were ignored, and may improve other languages too.
Difftastic now preserves tree-sitter parse tree structure on parse error nodes. This reverts the flattening behaviour introduced in 0.38. Preserving structure tends to produce better diffs, although it increases the risk that difftastic will show fewer changes in the presence of parse errors.
Since difftastic is now conservative with parse errors (DFT_PARSE_ERROR_LIMIT is 0 by default), this seems like a better tradeoff.
Updated C, C++, CMake, CSS, Elm, Go, Lua and Python parsers.
--strip-cr
now defaults to on
, so comparing a file with CRLF
endings with a file with unix line endings will not show spurious
changes.
Difftastic now has a man page, see the difft.1
file.
Fixed a memory leak and improved performance in some cases.
Fixed a crash when difftastic could not detect the terminal width, such as inside eshell.
Difftastic now also considers $COLUMNS when detecting the terminal width.
Text file detection is now stricter, considering null bytes as a hint that files are binaries.
Fixed an issue where hidden files (filename starting with .
) were
ignored when diffing directories.
Scheme now uses the same slider heuristics as other lisps, preferring the outer delimiter.
Fixed an issue with line-based diffing where only the first line in a large changed region was highlighted. This was particularly noticeable when diffing brand new files.
Fixed an issue when reporting changes in binary files, where trailing whitespace was inconsistent with other changes shown.
Fixed an issue with building difftastic on aarch64 with rust 1.71 or earlier.
Updated JavaScript, TypeScript, QML and Perl parsers.
Makefile*.in
is now detected as Makefile syntax.
Improved shebang parsing with whitespace, e.g. #! /bin/bash
is now
detected as a shell script.
Added support for Scheme and Smali.
Fixed an issue with runaway memory usage on text files with very long lines.
Fixed an issue where all files would show a permissions change when
using difftastic with git difftool
.
Fixed an issue with paths not showing the containing directory when
using difftastic with git difftool
.
Difftastic now correctly reports file permission changes when called
from git diff
.
Fixed an issue with the experimental JSON display mode where it
ignored --skip-unchanged
.
Fixed an issue with tabs not being replaced in single-column display.
Added support for Objective-C and VHDL.
Files starting with <?xml
are now parsed as XML.
Fixed a munmap_chunk(): invalid pointer
crash on parsing some
large files, particularly JSON.
The default display width for tabs has changed to 4.
Fixed an issue where difftastic would sometimes output literal tabs rather than respecting the display width for tabs.
difftastic now requires Rust 1.65 to build.
Added support for Salesforce Apex.
Improved parsing of regex literals in Clojure and strictness annotations in Haskell.
Difftastic will now also report file permission changes.
Fixed an issue where directory diffing would show a file more than once.
Fixed a rare crash when the last non-blank line had changes for certain parsers, particularly YAML.
Difftastic now errors if given a single path, unless that file contains conflict markers. Previously this was a warning.
Difftastic now requires Rust 1.63 to build.
Fixed a dependency issue that broke aarch64 builds on older rustc versions.
Added support for SCSS.
Updated the Kotlin parser and improved handling of Kotlin nullable types.
.snap
files (Jest snapshots) are now detected as JavaScript files.
Fixed an issue where adding or removing blank lines would be ignored by the textual diffing logic.
Directory diffing now respects .gitignore
files.
Directory diffing can now be sorted by path with the --sort-paths
option.
Added the option --strip-cr
. This removes all carriage return
characters before diffing, which is helpful when dealing with a mix of
Windows and non-Windows flies.
The option --skip-unchanged
now has a corresponding environment
option DFT_SKIP_UNCHANGED
.
Difftastic now requires Rust 1.60 to build.
Added support for XML and JSONL.
Text nodes now get word diffing, consistent with string literals and comments. This is used in languages like HTML and XML that have separate text nodes.
Improved syntax highlighting of constructors (i.e. type names when
values are constructed, such as Foo {}
).
Improved syntax highlighting for C#.
This release does not provide a prebuilt musl binary, due to a dynamic linking issue with binaries in the release script.
musl remains tested in CI and supported for users, but you will need to compile difftastic from source.
Fixed an issue with GitHub actions that prevented prebuilt binaries being attached to the release.
This is the same code as 0.51.0 otherwise.
Updated Bash, Python and Rust parsers.
Added a JSON display option. This is currently unstable, and requires you to set DFT_UNSTABLE. The JSON structure may change in future.
Please give it a try and give feedback on GitHub issues.
Added support for Linux with musl, Linux on aarch64, and macOS on aarch64.
Note that Difftastic already worked on these platforms, but they are now tested in CI and will be included in prebuilt binaries in releases.
Difftastic now supports parsing files with conflict markers, enabling you to diff the two conflicting file states.
$ difft file_with_conflicts.js
Updated Elixir, Erlang, Go, Kotlin and Racket parsers.
Tweaked the colours on the file header, to make metadata less prominent.
Improved styling of file rename information.
Improved syntax hightling for Java built-in types.
Fixed an issue with runaway memory usage when the two files input files had a large number of differences.
Difftastic now requires Rust 1.59 to build.
Added support for LaTeX.
Updated grammars for C, C++ and Java.
Improved parsing of qualified constructors in Haskell.
Difftastic is now stricter about valid UTF-8 and UTF-16, considering more of the file's bytes during filetype detection. This fixes cases where e.g. PDF was sometimes incorrectly considered as UTF-8.
Improved handling of delimiters ("nested sliders") in languages that prefer the outer delimiter, such as JSON and Lisps.
Difftastic now requires Rust 1.58 to build.
Updated Scala parser.
Improved parsing of qualified modules and variables in Haskell.
Replaced strings now have subword highlighting, consistent with replaced comments. Thanks @amnore!
Fixed an issue with the cost model for comment replacement, leading difftastic to prefer modified comments even when exact comment matches are possible.
Simplified the cost model, which previously had an inconsistent heuristic depending on whether there were multiple items on the same line. This can lead to slightly different items being marked as changed, but on average the results are better.
Improved word highlighting in comments when they contain numbers or hyphens.
Difftastic's logging is now configured with the environment variable
DFT_LOG
. This was previously RUST_LOG
, which could interfere with
users configuring logging for their own development work.
Fixed an issue where file extensions of the form *.foo.bar
(e.g. *.cmake.in
) were ignored.
Added an option --override
which overrides language detection based
on a glob, e.g. --override='*.js:javascript jsx'
. See --help
for
full documentation and more examples.
Removed the --language
option. This option was confusing (it took a
file extension rather than a language name) and not very useful
(it overrode language detection for all files together).
Added support for Solidity.
When difftastic is invoked with two file paths, it will now truncate the path shown to the shared common parts. This is particularly helpful when using difftastic with mercurial.
$ difft dir1/foo/bar.py dir2/foo/bar.py
foo/bar.py -- Python
...
Removed the option --missing-as-empty
. This is no longer needed as
difftastic handles /dev/null
gracefully on all platforms.
Added support for Ada.
.ino
files are now treated as C++.
Improved parsing for TOML.
Updated grammars for Bash, C, C++, C#, Clojure, CMake, Elixir, Go, Java, JavaScript, OCaml, Perl, QML and TypeScript.
Difftastic now prefers treating files as 'mostly UTF-8' or binary rather than UTF-16. Many files can be decoded as UTF-16 without decoding errors but produce nonsense results, so this heuristic seems to work better.
Fixed an issue where difftastic would discard the last newline in a file before diffing. This was most noticeable when doing textual diffs and the last line had changed.
Difftastic no longer uses purple to highlight regions that are missing styling. This was intended as a debug feature, but it in practice it only highlighted trailing whitespace for a few languages.
Racket and Newick are now treated as lisps for the purposes for parenthesis heuristics.
Fixed an issue where parse errors were undercounted, particularly in YAML files.
Improved parsing for Makefiles.
Added support for Newick and Racket.
Difftastic now uses a textual diff on files that have any parse
errors. The parse error limit defaults to 0, but it is configurable
with DFT_PARSE_ERROR_LIMIT
or --parse-error-limit
.
Textual diffing now respects --check-only
, consistent with syntactic
diffing.
Improved syntax highlighting for keywords.
If a file exceeds DFT_BYTE_LIMIT
, difftastic now displays its size in
the header.
This release has no logic changes from 0.43.
The only difference is that the test_gzip_is_binary
test is ignored by default, as it depends on MIME database availability. This database isn't always installed in packaging environments, so packagers saw this test failing.
Added support for R.
Difftastic now considers gzipped files to be binary, even if they happen to be valid UTF-16.
Fixed a rare crash when one file had repeated lists that partially matched the other side.
Fixed an issue with single-column display when colour is disabled, where newlines were missing from the output.
--help
now shows the default value for all arguments (it was
previously missing --color
and --display
).
--color
can now be configured with the environment variable
DFT_COLOR
.
Fixed an issue where git on Windows would fail with an error about
/dev/null
.
Improved CSS parsing and HTML sublanguage parsing.
Added an --ignore-comments
option.
Improved textual diffing performance, particularly when the two files have few lines in common.
Fixed an issue with unwanted underlines with textual diffing when DFT_BYTE_LIMIT is reached.
Fixed a crash in inline display when the file ends with whitespace.
Renamed the vendored parser directory to vendored_parsers/, as cargo vendor
would clobber the vendor/
directory.
Difftastic now supports embedded languages in HTML and Makefiles. This enables difftastic to parse embedded CSS or JavaScript in HTML, or Bash in Makefiles, leading to better diffs in those files.
Tab replacement is now done after parsing. If tab characters are syntactically important, they are now handled correctly. This was particularly an issue in Makefiles, where indentation must be tabs.
Improved word highlighting in changed comments. Whitespace is never
underlined and the characters -
and _
are now considered word
constituents.
--display=inline
now respects --tab-width
.
Fixed an issue with unwanted underlines with textual diffing when DFT_GRAPH_LIMIT is reached.
Improved syntax highlighting for predefined types in TypeScript.
Diffing is now more efficient: the generated graphs have ~20% fewer
vertices. This improves performance (less memory, shorter runtime),
and also enables difftastic to handle larger files (you're less likely
to reach DFT_GRAPH_LIMIT
).
This improvement was contributed by @QuarticCat, thanks!
rebar
files (e.g. rebar.lock
) are no longer associated with
Erlang, only *.erl
files, as the Erlang parser does not currently
support them.
--list-languages
now shows filenames associated with languages
(e.g. Cargo.lock
is TOML) in addition to extensions.
Symlinks are now expanded before calculating relative paths, resulting in relative paths being shown in more cases.
Difftastic is now built with Ubuntu 20.04 on GitHub, so prebuilt binaries do not require libc version 2.32. This was broken in 0.39 due to a GitHub default changing.
Added support for Erlang.
Improved detection of binary content when the MIME type database incorrectly claims a text file is another format.
Paths are now always displayed relative to the current working directory.
Fixed a race condition where diffing directories would lead to interleaved output from different files.
Added a --check-only
flag that reports if there are any syntactic
differences, but doesn't calculate or print them. This is much faster
than normal syntactic diffing.
Difftastic now sets the exit code if it finds changes and
--exit-code
is set. See usage in the
manual for the full list
of exit codes used.
Syntax error nodes are now always treated as atoms. This produces better results when difftastic doesn't fully support the syntax (e.g. PostCSS is a superset of CSS) or when there are actual syntax errors.
Fixed a crash on file content detection when the local MIME database contains blank lines.
Line numbers styling has been tweaked to make it more visually distinct from file content.
Fixed an issue with inline display discarding newlines when color is disabled, leading to broken display.
Two column display now ensures that both columns have the same width, so line wrapping is at the same point on both sides.
Added a Chinese translation: https://difftastic.wilfred.me.uk/zh-CN/
Improved runtime performance and memory usage (thanks to @QuarticCat).
Standalone .
is now considered punctuation in the diff cost model,
which improves diff results in some cases.
Updated to the latest tree-sitter parser for Swift.
Difftastic will now read a file from stdin if given -
as a path
argument.
Added an option --context
to control the number of lines of context
displayed.
--list-languages
now respects the value of --color
, whose default
only uses styling when stdout is a TTY.
Fixed side-by-side display width when color is disabled (when piping
difftastic stdout or with --color=never
).
Fixed an issue with building on Windows with gcc.
Fixed a release script that prevented 0.36.0 from including Windows binaries.
Improved diff cost model to prefer finding unchanged variable names over unchanged punctuation.
Added support for Hare, Pascal and QML.
ZIP files are now always treated as binary files.
Difftastic is now stricter about text content validity, so more binary files are correctly detected.
Changed words in changed comments are now also underlined, to make them more visible.
Fixed crash when word-wrapping lines containing Unicode combining diacritics characters.
Difftastic now fixes sliders in more cases, producing better diff results.
Difftastic will now autodetect files in UTF-16-BE and UTF-16-LE. Previously it required files to be UTF-8.
Added support for Makefiles.
Fixed an issue with HCL language detection on .workflow
files. Fixed
an issue with Makefile language detection.
Fixed terminal width detection when only stderr is a TTY (e.g. when using difftastic with git). This was broken in 0.34.
Added an option --list-languages
which reports all the languages
supported, along with the extensions associated with them.
Fixed build on Rust 1.61+.
Fixed an issue where side-by-side display would sometimes print the line number from the second file rather than the first file.
Difftastic now explores 2x more parenthesis nesting possibilities. This can make diffing slower, but produces substantially better results.
Added support for CMake.
Improved comment detection using tree-sitter syntax highlighting queries.
Fixed an issue with language detection when file names were very short.
Difftastic prefers to show the second path when called with two
arguments. This fixes an issue (broken in 0.31) where the path would
be shown as /tmp/git-blob-abc/file_name
.
Difftastic now requires Rust 1.57 to build.
Fixed build on Windows. Previously it would fail non-deterministically.
Improved performance in many cases, particularly for files with a fairly flat structure.
Difftastic now treats the path /dev/null
as an empty file, even if
that path doesn't exist on the current machine. This fixes a crash
when using difftastic with git on Windows.
Added Hacklang and SQL support.
Updated to the latest tree-sitter parsers for C#, Dart, Elm, Gleam, Haskell, HCL, Java, JSON, OCaml, PHP, Python, Ruby, Scala and TypeScript.
Fixed an issue with inline mode where there was a blank line between every line.
Fixed language detection and filename display when one path was
/dev/null
and difftastic was invoked with two arguments.
Added support for HTML and Julia.
Fixed an issue where line numbers were coloured even when colour was disabled.
Improved alignment when files contain Unicode characters that are more than one column wide.
Improved syntax highlighting for conditionals, particularly for Dart, Elvish and HCL.
--node-limit
has been replaced by --graph-limit
, and the
corresponding environment variable DFT_NODE_LIMIT
has been replaced
with DFT_GRAPH_LIMIT
.
--graph-limit
makes difftastic give up on structural diffs after
traversing this many graph nodes. --node-limit
applied a limit based
on an estimate of how big the graph would be, leading to very slow
diffs when the estimate was wrong.
This new setting sets a more accurate limit on difftastic
performance. It also means that difftastic will always try a
structural diff first. This will be slower for files that exceed
--graph-limit
, but guarantees that files with a small number of
changes will always get a structural diff.
Fixed a major memory regression in 0.29 when performing large line-based diffs (e.g. files of 100 KLOC or more).
Performance has improved in 0.29, and larger files typically see a 30% reduction in runtime.
Improved detection of binary files, including using
/usr/share/mime/magic
when available.
Improved handling of comments and regexp literals in Perl.
Added Elvish support.
Improved delimiter heuristics in lisp-like languages.
Difftastic now displays information about file renames. Previously, it would only show the new name.
Added support for HCL, Perl and Swift.
Improved language detection for JSON. More file extensions and file
names are recognised as JSON, e.g. .jsonl
.
Fixed crash in inline mode.
Added an option --tab-width
that controls how many spaces are used
to display tabs. The default value is 8, consistent with older
versions.
Added an option --syntax-highlight
that controls whether the output
is syntax highlighted.
Difftastic now diffs files in parallel when diffing whole directories, increasing performance.
Directory diffing now correctly handles files that are only in one of the directories.
Fixed handling of paths that aren't valid UTF-8.
--missing-as-empty
now only applies when diffing files, and has no
effect when diffing directories.
Due to the 10 MB crate limit, two patches were applied before uploading to crates.io. The source code on crates.io therefore does not exactly match this git tag.
Cargo.toml
had the include list changed (committed on master as
d9ef270d273e3f7c61e2e167b7efbd33b36d0c96), and the vendored perl
parser had whitespace removed with sed "s/^[ \t]*//" -i vendor/tree-sitter-perl-src/parser.c
.
Added support for Kotlin and TOML.
Fixed an issue with YAML and |
block strings.
Updated to the latest upstream C++, C#, Elixir, Go, Haskell, Java, Python, Ruby, Rust and TypeScript parsers.
Improved performance in large files when changes are clustered together.
Improved syntax highlighting.
Tabs are now rendered with eight spaces.
Difftastic now validates environment variables the same way as
arguments. DFT_DISPLAY=no-such-mode
will now error rather than
silently using the default display mode.
The upstream Haskell parser has been ported from C++14 to pure C. This should allow difftastic to build on platforms with older C++ compilers.
Difftastic now uses GitHub releases with precompiled binaries for Linux, macOS and Windows.
Fixed compilation error on Windows due to GCC extension usage in the tree-sitter-nix library.
This version of difftastic is also available as a GitHub release with precompiled binaries available.
Fixed Zig parsing of @foo
identifiers.
Fixed a crash when inserting newlines in JSX literals.
Fixed an issue where C++ libraries were built before before the C libraries that they depended on.
The side-by-side display no longer pads the right column to fill the terminal. This improves display when the terminal is slightly shrunk, or when wide characters (e.g. emoji) are used.
Improved syntax highlighting for boolean constants and character literals.
Added Gleam, Elm, YAML and Zig support.
Improved Clojure parsing with ^Metadata
.
Added the --display
option to switch between side-by-side
,
side-by-side-show-both
, and inline
display modes. This replaces
the INLINE
and DFT_SHOW_BOTH
environment variables.
Added the --language
option to enable overriding language
detection. When specified, language detection is disabled, and the
input file is assumed to have the extension specified.
Improved diff results for nested sequences foo(bar(baz()))
in C-like
languages.
Difftastic no longer shows "1/1" when a file only has a single hunk.
Improved Clojure and Scala syntax highlighting.
When a file is entirely unchanged, difftastic now shows "no changes" even if it successfully parsed. Previously it would only show "no syntactic changes".
Fixed an issue where some colors were shown when --color never
was
specified.
Fixed a crash when a text file ended with a multibyte character.
Fixed side-by-side display when source files contained CRLF.
Fixed an issue in C and C++ where blank lines were highlighted after novel preprocessor lines.
Fixed an issue with parsing [
and ]
in Java.
Fixed an issue with parsing interpolated strings in PHP.
Added support for Janet, Lua and Nix.
Reduced the default value of DFT_NODE_LIMIT from 100,000 to 30,000. This fixes cases where files near the limit would use too much memory and not terminate.
Fixed an issue where hunks would be missing lines. This occurred in certain circumstances when a line contained both changed and unchanged parts.
Fixed an issue where blank lines at the beginning or end of a file would be excluded from context.
Fixed an issue where lines containing only whitespace would be highlighted in purple.
Fixed an issue with changed multiline strings where blank lines were not highlighted.
Improved Clojure syntax highlighting.
Added support for Dart.
Difftastic will now warn if both arguments point to the same file.
When diffing directories, diff results are printed incrementally rather than waiting for the results of all files before printing.
Fixed crash where the 'shrink unchanged' logic would not set the change state on the outer list.
Improved performance on very large files that are compared by text.
Fixed some cases where changing list delimiters would lead to incorrect diffs.
Fixed an issue where lines were not aligned correctly after correcting sliders.
Fixed an issue the outermost delimiter in lists was sometimes incorrectly marked as unchanged, producing non-optimal diffs.
Display now prefers to align blank lines in the display, producing significantly better results in many cases.
Fixed an issue where some lines in a hunk were not displayed.
Difftastic now requires Rust 1.56 to build.
Added support for PHP.
Fixed handling of <
>
delimiters in C++ and Rust.
Difftastic will now split files that contain obviously unchanged regions, substantially improving performance when a file has multiple changes that have many unchanged items between them.
Improved diff results when choosing between syntax nodes at different nesting levels. This is restoring a heuristic that was removed in 0.20.
Improved diff results when lists have unequal sizes.
Improved diff results when the language parser thinks that names occur in different syntactic positions.
Adjusted the heuristics for 'so much has changed in this expression that it is confusing to highlight the unchanged parts'. The heuristic is now less aggressive, which helps performance and seems to produce slightly better results.
Difftastic now understands -*-
file headers (as used by Emacs) when
performing language detection.
Improved alignment logic. This fixes a bug where the last line of a file wasn't displayed, and generally improves how difftastic chooses to align content.
Fixed a crash when line wrapping produced an entirely blank line.
Improved word diffing (in both comments and textual diffs) when source contains Unicode characters. Word splitting now uses the Unicode alphabetic property.
Fixed a crash when comments contained multibyte Unicode characters.
Diffing now correctly handles nodes being moved to parent lists. Previously this would be ignored, leading to difftastic incorrectly claiming things were unchanged. This also leads to better diffing results in general, although is somewhat slower (2x in testing).
Improved slider logic in larger expressions.
Increased the default value DFT_NODE_LIMIT to 100,000 (from 50,000). This increases the likelihood that files get a syntactic diff whilst still having acceptable performance.
Fixed an issue where whole file additions/removals were printed twice.
Fixed an issue where difftastic didn't show context on hunks where the unchanged content was on different lines.
Hunks are now merged if the lines are immediately adjacent (e.g. hunk 1 ends on line 11, hunk 2 starts on line 12), not just if they're overlapping.
Difftastic will now use a text dif for large files that are too big to
parse in a reasonable amount of time. This threshold is
configurable with --byte-limit
and DFT_BYTE_LIMIT
.
Fixed a crash when called with zero arguments.
Fixed an issue with changes being ignored in OCaml's {||}
string
literals.
Fixed an issue where larger additions were not lined up with removals.
Improved syntax highlighting for Clojure, Common Lisp and TypeScript.
Comments are now highlighted with italics, making it easier to see syntax even when text is red.
Built-in constants are now highlighted consistently with other constants.
Improved minor display issues when one file is longer than the other.
If given binary files, difftastic will now report if the file contents are identical.
Difftastic will now use a text diff for large files, rather than
trying to use more memory than is available. This threshold is
configurable with --node-limit
and DFT_NODE_LIMIT
.
Fixed a bug in the text diff logic where lines weren't shown if they did not have both word additions and word removals.
Difftastic will now error if either argument does not exist, unless
--missing-as-empty
(new argument) is passed. This is a better
default, but requires Mercurial uses to specify this
flag in their
configuration.
Fixed a compilation issue on Rust 1.54 (0.18 only built on newer versions of Rust).
Fixed an issue with missing positions in OCaml attribute syntax.
Fixed parsing issues in Common Lisp: character literals, loop
macro
usage with maximizing
.
Improved performance when diffing a single large expression.
Fixed display issues where lines were printed more than once.
Subword changes in comments are now shown in bold, to make them more visible.
Improved colours on terminals with light coloured backgrounds.
Added a --width
option which allows overriding DFT_WIDTH
, and is
more discoverable.
Added a --color
option which allows explicitly enabling/disabling
colour output.
Added a --background
option which controls whether difftastic uses
bright or dark colours. This can also be controlled by
DFT_BACKGROUND
.
Added a --skip-unchanged
option which suppresses printing for files
that have no changes.
Improved performance when all file changes are close together.
Fixed a bug where syntax after the last changed item was incorrectly marked as added.
Added syntax highlighting for unchanged comments, strings and types.
Fixed a bug (introduced in 0.15) where identical text files were reported as binary files.
Whitespace in JSX is parsed more closely to React's whitespace trimming rules.
Fixed parsing of heredocs in shell scripts. They are now treated as string literals.
Fixed parsing of type variables and tags in OCaml.
Improved language detection for files with bash/sh syntax.
Fixed a crash when on Mercurial diffs when a whole file has been removed.
Improved display performance when there are a large number of hunks.
Fixed several issues where lines were displayed more than once in a hunk.
Fixed an issue where the first changed line was not displayed.
Improved diffing performance (both time and memory usage).
Sliders are now fixed up after diffing. This produces better looking results in more cases, and makes the primary diffing faster.
Fixed some corner cases in the line parser where it would match up isolated newline character as unchanged, leading to weird alignment.
Moved to the official Elixir parser.
Updated the Bash, C, C++, C#, Haskell, Java, OCaml, Python, Ruby and TypeScript parsers to the latest upstream version.
Fixed a parsing performance regression introduced in 0.13.
Text diffing now has a standalone implementation rather than reusing structural diff logic. This is signficantly faster and highlighted better.
Improved performance when diffing two identical files. This is common when diffing directorires.
Improved highlighting heuristics for added/removed blank lines.
Fixed an alignment bug where the last line being novel would lead to poor alignment of unchanged lines.
Fixed minor formatting issues when reporting that a file is binary.
Improved display performance on large files.
Improved language detection if a file has a recognised filename
(e.g. Rakefile
) or a shebang (e.g. #!/usr/bin/env node
).
Display width can now be overridden by setting the environment variable DFT_WIDTH.
Fixed terminal width calculations on Windows.
Fixed crash when only one side has changes, but the other side has additional blank lines.
Fixed crash on displaying unicode characters on line boundaries.
Fixed some build issues on Windows.
Added Bash, Common Lisp and Ruby support.
Updated the C, CSS and JSON parsers to the latest upstream versions.
Expanded filename associations, so difftastic recognises more files.
Improved parsing for regex and template string literals in JavaScript and TypeScript.
Improved parsing for float values in CSS.
Improved word diffing on punctuation in comments.
When logging is enabled (e.g. RUST_LOG=warn
), difftastic now warns
on syntax errors. Difftastic is intended to be robust against syntax
errors, so this is primarily intended for parser debugging.
Difftastic now requires fewer C compiler flags, so it should build in more environments (e.g. compiling with MSVC).
Every hunk is now shown with the file name and a hunk number. This makes it easier to see which file you're looking at when there are many changes.
Keywords in added/removed regions are now shown in bold, to give modified regions basic syntax highlighting. Previously, all added/removed regions were bold.
Lines with changes are now shown in a different colour in side-by-side display.
The display logic has been written in terms of a Hunk
type. This
produces more accurate context, with better alignment, especially when
the context contains blank lines.
If only a single side has changes (e.g. additions but no removals), only one column is shown, to maximise display usage.
Difftastic now wraps rather than truncating lines that are too long for the terminal width.
If a file has no syntactic changes, difftastic now shows the file name consistently with changed files.
The difftastic binary is now named difft
, to reduce typing during
usage.
Updated to latest upstream Haskell parser (commit d72f2e4).
Fixed a bug when diffing multiline comments where unchanged parts were not highlighted correctly.
Improved handling of paired delimiters, particularly in C, C++ and C#.
Improved word splitting in when diffing similar comments (it's now more granular).
Fixed a rare issue where single-item lists were flattened.
Diff calculations are now greedier when syntax nodes are identical, making diffing significantly faster when most syntax nodes are the same.
Added support for Mercurial, see this section in the manual for instructions.
Added basic syntax highlighting for comments (dimmed) and keywords (bold) in unchanged source code.
Characters that don't have a position in the parsed syntax tree are now displayed in purple, to make bugs more obvious. Previously they were dimmed.
Fix compilation on macOS where the C++ compiler defaulted to a version of C++ older than C++14.
Added a C parser.
Added a C++ parser. Difftastic prefers the C++ parser for .h
files. Please file a bug if you see issues.
Added a C# parser.
Added a Haskell parser.
Removed legacy regex-based parsing backend.
Some additional runtime optimisations.
Added a chapter on difficult cases for tree diff algorithms.
Added TypeScript parser and TSX parser. Added Elixir parser.
The following extensions are now associated with Clojure: .bb
,
.boot
, .clj
, .cljc
, .clje
, .cljs
, .cljx
, .edn
, .joke
and .joker
.
Fixed an issue with parsing integer values in CSS with units,
e.g. 123px
.
Improved parsing of Rust punctuation like &
and ::
inside macro
invocations. Improved handling of |closure_param|
and [
]
delimiters in Rust.
The line-based parser for text files now uses word-level diffs.
Optimised Dijkstra implementation, improving runtime performance.
Side-by-side displays now uses the same width for the left and right columns, regardless of the content.
Difftastic is now a library with a main binary. No APIs are considered stable for external usage. This is intended to make benchmarking easier.
Fixed a crash on removing whole files.
Tree-sitter parsing is now the default, unless the environment variable DFT_RX is set.
Tree-sitter parser: Improved handling of string literals. Improved matching of delimiters.
Added Python parser.
Added Java parser.
JSON (legacy parser): fixed parsing string literals (broken in 0.7).
Removed Scheme support, as there's no tree-sitter parser available.
Fixed crashes on files with non-ASCII characters on long lines.
Fixed an issue where multiline comments were not highlighted correctly.
Improved display to better use the whole width when whole files are added or removed.
Removed the unused --lang
argument.
Difftastic now handles writing to a closed pipe (SIGPIPE) gracefully rather than crashing.
Difftastic now has some debugging logs available. RUST_LOG=trace
will show information on the route found during graph solving.
Fixed issues when adding/removing a whole file meant that difftastic didn't display anything.
Fixed a crash on renaming a file.
Colour is now enabled when using git with a pager.
Side-by-side display now uses "..." for column numbers when aligning lines. This makes hunks more obvious, but hunks now also have two blank lines between them to make it clearer.
Fixed an issue where screen width was not shared evenly by LHS and RHS.
Side-by-side display will now use the full width of the screen when using a pager (i.e. if stdout is a not a TTY).
Side-by-side display now handles whole file additions better, preferring a single column display.
Display width calculations are now based on the longest line visible in the diff, not the longest line in the file.
Added tree-sitter parsers. These have known bugs, but you can try
them by setting the environment variable DFT_TS=y
.
Fixed handling of ->
in Rust.
Difftastic will now prefer matching up comments that are similar (according to levenshtein distance).
Contiguous syntax logic now considers close delimiter positions, so
[ \n ];
now treats the ;
atom as contiguous.
Fixed an issue where diffs would prefer prefer a low depth change on a delimiter over a delimiter that gave contiguous changes.
Removed the --width
argument.
Added debug options --dump-syntax
and --dump-ts
for viewing parse
trees. The output of these options may change without notice.
Fixed handling of @
, <
and >
in elisp.
Fixed crash on binary files. Difftastic now simply shows "binary" for files that don't look like text.
Added a basic Go parser.
Fixed an issue where comment replacements were not detected.
Changed words in comments are now only highlighted when comments are relatively similar (according to their Levenshtein distance).
Multiline comments are now considered unchanged if only their indentation changes.
Improved alignment for lines at the beginning of a changed group of lines.
Improved horizontal spacing between before and after code shown.
Fixed an issue where source code containing tab characters was not correctly aligned.
Removed unused --inline
and --context
arguments.
Fixed crash when called with no arguments.
Fixed a crash on parsing non-ASCII source files. Fixed a crash on files without an extension. Fixed crashes on empty files.
Input files that aren't valid UTF-8 are now replaced with � rather than giving up.
Improved parsing for Rust punctuation.
Improved parsing for OCaml punctuation, including :=
and method!
.
Improved parsing for Emacs Lisp symbols containing +
and =
, and
punctuation of #
, .
and &
.
Improved parsing for Scheme symbols containing =
, and punctuation of
#
and .
.
Improved parsing of =
and &
in Clojure.
Improved parsing of :
, ,
, and constants in JSON.
Improved parsing of string literals in all languages, supporting
escaped delimiters such as "\""
and removing incorrect support for
single-quoted strings in JSON.
Reduced memory usage when diffing.
Difftastic now highlights word-level changes between comments.
Diffing now prefers contiguous nodes even when entering a list, so
(foo
is considered contiguous.
Large AST trees with very few common nodes are now considered wholly
novel, rather than trying to match up the few common nodes. This
avoids nonsensical diffs when toplevel function A is completely
replaced with function B and they only have something trivial in
common (e.g. the function
keyword).
Improved --help
.
It's now possible to use difftastic
with git diff
and git show
!
Improved parsing for Rust macro definitions and punctuation.
Improved parsing for OCaml punctuation, and added .mli
as an OCaml
file extension.
Diff calculation is now significantly faster.
Difftastic now considers nesting depth when comparing AST nodes, and tries to match nodes with similar nesting levels.
Difftastic now prefers marking multiple items on the same line as novel, rather than adjacent items on different lines. This helps avoid sliders, where the diff chooses a keyword on the 'wrong' side.
Fixed an issue where complex diffs would not display some unchanged lines.
Fixed a crash when diff context included the first line.
Fixed a crash when plain text content contained certain non-ASCII characters.
Diffs are now displayed with unchanged lines aligned to the other side.
Improved Rust parsing to recognise lifetime syntax 'foo
, character
literals 'x'
and punctuation.
Improved punctuation parsing for OCaml and JS.
Fixed an issue where the diff calculated may not be minimal.
Fixed a crash on files with no changes.
First version using Dijkstra's algorithm for calculating diffs.
Experimenting with different implementation ideas.