1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
# flickzeug
[](https://crates.io/crates/flickzeug)
[](https://docs.rs/flickzeug/)
[](LICENSE-APACHE)
[](LICENSE-MIT)
A Rust library for computing diffs, parsing and applying patches, and performing three-way merges.
> **Note**: This is a fork of [diffy](https://github.com/bmwill/diffy) maintained by [prefix.dev](https://prefix.dev).
## Highlights
- **Fuzzy patch application**: Apply patches even when line numbers have drifted or context has slightly changed — essential for real-world patching scenarios
- **Battle-tested**: Used in production with thousands of real-world patches from [conda-forge](https://conda-forge.org/), the community-driven collection of conda packages
## Features
- **Diff creation**: Compute differences between texts using Myers' diff algorithm, producing minimal edit sequences
- **Patch parsing & formatting**: Read and write unified diff format (compatible with `git diff`, `diff -u`, etc.)
- **Fuzzy patch application**: Apply patches with configurable fuzzy matching when line numbers don't align exactly, using similarity-based line matching
- **Three-way merge**: Merge changes from two sources against a common ancestor, with conflict detection and multiple conflict marker styles
- **Binary support**: All major APIs have `*_bytes` variants for working with non-UTF-8 content
## Usage
Add `flickzeug` to your `Cargo.toml`:
```toml
[dependencies]
flickzeug = "0.4"
```
### Creating a diff
```rust
use flickzeug::create_patch;
let original = "The quick brown fox\njumps over\nthe lazy dog.\n";
let modified = "The quick brown cat\njumps over\nthe sleepy dog.\n";
let patch = create_patch(original, modified);
println!("{}", patch);
```
### Applying a patch
```rust
use flickzeug::{apply, Patch};
let original = "The quick brown fox\njumps over\nthe lazy dog.\n";
let patch_text = "..."; // unified diff format
let patch = Patch::from_str(patch_text).unwrap();
let result = apply(original, &patch).unwrap();
```
### Three-way merge
```rust
use flickzeug::merge;
let base = "line1\nline2\nline3\n";
let ours = "line1\nmodified by us\nline3\n";
let theirs = "line1\nline2\nline3 changed\n";
let merged = merge(base, ours, theirs).unwrap();
```
## License
This project is available under the terms of either the [Apache 2.0 license](LICENSE-APACHE) or the [MIT license](LICENSE-MIT).
## Acknowledgments
This project is a fork of [diffy](https://github.com/bmwill/diffy) by Brandon Williams. We thank the original author for their excellent work.
|
