diffy

Fixed

• #85 Merge conflict markers are now always placed on their own lines. Previously, a conflicting hunk at the end of a file without a trailing newline glued the next marker onto its last content line, producing unparseable output. This matches git merge-file --diff3 behavior.

This is a major release introducing multi-file patch support, git binary diff handling, and no_std compatibility.

Breaking Changes

• #73 The crate is now no_std by default. Patch::to_bytes() and PatchFormatter::write_patch_into() now require the std feature. Add features = ["std"] to restore them.
• #46 Color support is now behind the color feature flag. Previously color was always available. Now PatchFormatter::with_color() requires enabling the color feature. The underlying implementation switched from nu-ansi-term to anstyle.

Added

• #55 #59 #61 #66 #74 #76 Multi-file patch support. Parse and apply unified diff and git diff output containing multiple files, including create, delete, modify, rename, and copy operations. Git binary patches (literal and delta) are supported behind the binary feature flag.
• #80 New apply example demonstrating multi-file patch application.

Fixed

• #51 #82 Patch::from_str / from_bytes no longer error on trailing non-patch content after a complete hunk, matching GNU patch and git apply behavior.
• #65 Return an error instead of panicking on non-UTF-8 escaped filenames when parsing as str.
• #47 Fix quoted filename escaping: handle \a, \b, \f, \v, 3-digit octal escapes (\0xx–\3xx), and quote all control characters.
• #83 Fix arithmetic overflow panic when parsing hunk headers with extremely large range values.

Changed

• #79 Bump MSRV to 1.85 (Rust 2024 edition).
• #48 #50 Parse error messages now show the byte offset where parsing failed.

Added

• #37 Allow configuring the "No newline at end of file" message from being printed when formatting a patch.
• #38 Add support for configuring suppress_blank_empty.

Added

• #36 Add ability to configure filenames when creating a patch with DiffOptions.

Fixed

• #28 Fixed an issue where conflicts were being omitted from merges.

Added

• #26 Add ability to reverse a patch.

Changed

• #29 Bump minimum supported rust version (msrv) to 1.62.1.
• #22 update nu-ansi-term dependency to 0.50.

Fixed

• #17 Fix an issue which resulted in a large slowdown when applying a patch with incorrect hunk headers.
• #18 Replace unmaintained ansi_term dependency with nu_ansi_term in order to address RUSTSEC-2021-0139.

Changed

• #19 Bump minimum supported rust version (msrv) to 1.51.0.

Fixed

• #16 Fix an issue where patch files failed to parse when they contained hunks which were adjacent to one another.

Fixed

• #9 Fix an issue where the incorrect range was being used to index an array when calculating a merge resulting in a panic in some cases.

Added

• Support for working with potentially non-utf8 data with the addition of various *_bytes functions.
• Support for writing both utf8 and non-utf8 patches into a writer W: io::write
• Support for a minimum supported rust version (msrv) of 1.36.0.

Changed

• The Patch type is now generic across the text type, either str for utf8 text and [u8] for potentially non-utf8 texts.
• The filenames for the original and modified files of a patch are now optional. This means that patches which don't include filename headers (only include hunks) can now properly be parsed.

Fixed

• Quoted filenames which include escaped characters are now properly parsed.

Added

• Patches can now be parsed from strings with Patch::from_str
• A Patch can now be applied to a base image with apply

• Initial release.