diffy 0.5.2

Tools for finding and manipulating differences between files
Documentation
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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
use super::*;

macro_rules! assert_merge {
    ($original:ident, $ours:ident, $theirs:ident, $kind:ident($expected:expr_2021), $msg:literal $(,)?) => {
        let solution = merge($original, $ours, $theirs);

        macro_rules! result {
            (Ok, $s:expr_2021) => {
                Result::<&str, &str>::Ok($s)
            };
            (Err, $s:expr_2021) => {
                Result::<&str, &str>::Err($s)
            };
        }
        assert!(
            same_merge(result!($kind, $expected), &solution),
            concat!($msg, "\nexpected={:#?}\nactual={:#?}"),
            result!($kind, $expected),
            solution
        );

        let solution_bytes =
            merge_bytes($original.as_bytes(), $ours.as_bytes(), $theirs.as_bytes());

        macro_rules! result_bytes {
            (Ok, $s:expr_2021) => {
                Result::<&[u8], &[u8]>::Ok($s.as_bytes())
            };
            (Err, $s:expr_2021) => {
                Result::<&[u8], &[u8]>::Err($s.as_bytes())
            };
        }
        assert!(
            same_merge_bytes(result_bytes!($kind, $expected), &solution_bytes),
            concat!($msg, "\nexpected={:#?}\nactual={:#?}"),
            result_bytes!($kind, $expected),
            solution_bytes
        );
    };
}

fn same_merge(expected: Result<&str, &str>, actual: &Result<String, String>) -> bool {
    match (expected, actual) {
        (Ok(expected), Ok(actual)) => expected == actual,
        (Err(expected), Err(actual)) => expected == actual,
        (_, _) => false,
    }
}

fn same_merge_bytes(expected: Result<&[u8], &[u8]>, actual: &Result<Vec<u8>, Vec<u8>>) -> bool {
    match (expected, actual) {
        (Ok(expected), Ok(actual)) => expected == &actual[..],
        (Err(expected), Err(actual)) => expected == &actual[..],
        (_, _) => false,
    }
}

#[test]
fn test_merge() {
    let original = "\
carrots
garlic
onions
salmon
mushrooms
tomatoes
salt
";
    let a = "\
carrots
salmon
mushrooms
tomatoes
garlic
onions
salt
";
    let b = "\
carrots
salmon
garlic
onions
mushrooms
tomatoes
salt
";

    assert_merge!(original, original, original, Ok(original), "Equal case #1");
    assert_merge!(original, a, a, Ok(a), "Equal case #2");
    assert_merge!(original, b, b, Ok(b), "Equal case #3");

    let expected = "\
carrots
<<<<<<< ours
salmon
||||||| original
garlic
onions
salmon
=======
salmon
garlic
onions
>>>>>>> theirs
mushrooms
tomatoes
garlic
onions
salt
";

    assert_merge!(original, a, b, Err(expected), "Single Conflict case");

    let expected = "\
carrots
<<<<<<< ours
salmon
garlic
onions
||||||| original
garlic
onions
salmon
=======
salmon
>>>>>>> theirs
mushrooms
tomatoes
garlic
onions
salt
";

    assert_merge!(
        original,
        b,
        a,
        Err(expected),
        "Reverse Single Conflict case"
    );

    let original = "\
carrots
garlic
onions
salmon
tomatoes
salt
";
    let a = "\
carrots
salmon
tomatoes
garlic
onions
salt
";
    let b = "\
carrots
salmon
garlic
onions
tomatoes
salt
";
    let expected = "\
carrots
<<<<<<< ours
salmon
tomatoes
||||||| original
=======
salmon
>>>>>>> theirs
garlic
onions
<<<<<<< ours
||||||| original
salmon
tomatoes
=======
tomatoes
>>>>>>> theirs
salt
";

    assert_merge!(original, a, b, Err(expected), "Multiple Conflict case");

    let expected = "\
carrots
<<<<<<< ours
salmon
||||||| original
=======
salmon
tomatoes
>>>>>>> theirs
garlic
onions
<<<<<<< ours
tomatoes
||||||| original
salmon
tomatoes
=======
>>>>>>> theirs
salt
";
    assert_merge!(
        original,
        b,
        a,
        Err(expected),
        "Reverse Multiple Conflict case"
    );
}

#[test]
fn myers_diffy_vs_git() {
    let original = "\
void Chunk_copy(Chunk *src, size_t src_start, Chunk *dst, size_t dst_start, size_t n)
{
    if (!Chunk_bounds_check(src, src_start, n)) return;
    if (!Chunk_bounds_check(dst, dst_start, n)) return;

    memcpy(dst->data + dst_start, src->data + src_start, n);
}

int Chunk_bounds_check(Chunk *chunk, size_t start, size_t n)
{
    if (chunk == NULL) return 0;

    return start <= chunk->length && n <= chunk->length - start;
}
";
    let a = "\
int Chunk_bounds_check(Chunk *chunk, size_t start, size_t n)
{
    if (chunk == NULL) return 0;

    return start <= chunk->length && n <= chunk->length - start;
}

void Chunk_copy(Chunk *src, size_t src_start, Chunk *dst, size_t dst_start, size_t n)
{
    if (!Chunk_bounds_check(src, src_start, n)) return;
    if (!Chunk_bounds_check(dst, dst_start, n)) return;

    memcpy(dst->data + dst_start, src->data + src_start, n);
}
";
    let b = "\
void Chunk_copy(Chunk *src, size_t src_start, Chunk *dst, size_t dst_start, size_t n)
{
    if (!Chunk_bounds_check(src, src_start, n)) return;
    if (!Chunk_bounds_check(dst, dst_start, n)) return;

    // copy the bytes
    memcpy(dst->data + dst_start, src->data + src_start, n);
}

int Chunk_bounds_check(Chunk *chunk, size_t start, size_t n)
{
    if (chunk == NULL) return 0;

    return start <= chunk->length && n <= chunk->length - start;
}
";

    // TODO investigate why this doesn't match git's output
    let _expected_git = "\
int Chunk_bounds_check(Chunk *chunk, size_t start, size_t n)
{
    if (chunk == NULL) return 0;

<<<<<<< ours
    return start <= chunk->length && n <= chunk->length - start;
||||||| original
    memcpy(dst->data + dst_start, src->data + src_start, n);
=======
    // copy the bytes
    memcpy(dst->data + dst_start, src->data + src_start, n);
>>>>>>> theirs
}

void Chunk_copy(Chunk *src, size_t src_start, Chunk *dst, size_t dst_start, size_t n)
{
    if (!Chunk_bounds_check(src, src_start, n)) return;
    if (!Chunk_bounds_check(dst, dst_start, n)) return;

    memcpy(dst->data + dst_start, src->data + src_start, n);
}
";

    let expected_diffy = "\
int Chunk_bounds_check(Chunk *chunk, size_t start, size_t n)
{
    if (chunk == NULL) return 0;

    return start <= chunk->length && n <= chunk->length - start;
}

void Chunk_copy(Chunk *src, size_t src_start, Chunk *dst, size_t dst_start, size_t n)
{
    if (!Chunk_bounds_check(src, src_start, n)) return;
    if (!Chunk_bounds_check(dst, dst_start, n)) return;

    // copy the bytes
    memcpy(dst->data + dst_start, src->data + src_start, n);
}
";

    assert_merge!(original, a, b, Ok(expected_diffy), "Myers diffy merge");
}

#[test]
fn correct_range_is_used_for_both_case() {
    let base = r#"
class GithubCall(db.Model):

`url`: URL of request Example.`https://api.github.com`
"#;

    let theirs = r#"
class GithubCall(db.Model):

`repo`: String field. Github repository fields. Example: `amitu/python`
"#;

    let ours = r#"
class Call(models.Model):
`body`: String field. The payload of the webhook call from the github.

`repo`: String field. Github repository fields. Example: `amitu/python`
"#;

    let expected = r#"
class Call(models.Model):
`body`: String field. The payload of the webhook call from the github.

`repo`: String field. Github repository fields. Example: `amitu/python`
"#;

    assert_merge!(base, ours, theirs, Ok(expected), "MergeRange::Both case");
}

#[test]
fn delete_and_insert_conflict() {
    let base = r#"
{
    int a = 2;
}
"#;

    let ours = r#"
{
}
"#;

    let theirs = r#"
{
    int a = 2;
    int b = 3;
}
"#;

    let expected = r#"
{
<<<<<<< ours
||||||| original
    int a = 2;
=======
    int a = 2;
    int b = 3;
>>>>>>> theirs
}
"#;

    assert_merge!(
        base,
        ours,
        theirs,
        Err(expected),
        "MergeRange (Ours::delete, Theirs::insert) conflict"
    );

    let expected = r#"
{
<<<<<<< ours
    int a = 2;
    int b = 3;
||||||| original
    int a = 2;
=======
>>>>>>> theirs
}
"#;

    assert_merge!(
        base,
        theirs,
        ours,
        Err(expected),
        "MergeRange (Theirs::delete, Ours::insert) conflict"
    );
}

#[test]
fn conflict_hunks_without_trailing_newline_glue_markers_by_default() {
    let base = "This is line 1.\nThis is line 2.";
    let ours = "This is line 1.\nThis is line 2 changed.";
    let theirs = "This is line 1.\nThis is line 2 also changed.";

    // The default IncompleteHunkStyle::Diff3 matches GNU `diff3 -m`, which
    // appends the succeeding markers directly to incomplete lines.
    let expected = "\
This is line 1.
<<<<<<< ours
This is line 2 changed.||||||| original
This is line 2.=======
This is line 2 also changed.>>>>>>> theirs
";

    assert_merge!(
        base,
        ours,
        theirs,
        Err(expected),
        "file-final hunks without trailing newline",
    );
}

#[test]
fn conflict_hunks_without_trailing_newline_git_style_keeps_markers_on_own_lines() {
    let base = "This is line 1.\nThis is line 2.";
    let ours = "This is line 1.\nThis is line 2 changed.";
    let theirs = "This is line 1.\nThis is line 2 also changed.";

    // IncompleteHunkStyle::Git matches `git merge-file --diff3`, which inserts
    // a newline after an incomplete line so that every marker starts a line.
    let expected = "\
This is line 1.
<<<<<<< ours
This is line 2 changed.
||||||| original
This is line 2.
=======
This is line 2 also changed.
>>>>>>> theirs
";

    let mut options = MergeOptions::new();
    options.set_incomplete_hunk_style(IncompleteHunkStyle::Git);

    assert_eq!(
        options.merge(base, ours, theirs),
        Err(String::from(expected)),
        "file-final hunks without trailing newline with the git style",
    );
    assert_eq!(
        options.merge_bytes(base.as_bytes(), ours.as_bytes(), theirs.as_bytes()),
        Err(expected.as_bytes().to_vec()),
        "file-final hunks without trailing newline with the git style (bytes)",
    );
}

#[test]
fn conflict_hunk_trailing_newline_permutations() {
    const BASE: &str = "This is line 1.\nThis is line 2.";
    const BASE_NL: &str = "This is line 1.\nThis is line 2.\n";
    const OURS: &str = "This is line 1.\nThis is line 2 changed.";
    const OURS_NL: &str = "This is line 1.\nThis is line 2 changed.\n";
    const THEIRS: &str = "This is line 1.\nThis is line 2 also changed.";
    const THEIRS_NL: &str = "This is line 1.\nThis is line 2 also changed.\n";

    // Each case lists the inputs along with the expected output of the
    // default IncompleteHunkStyle::Diff3. The expected outputs were verified
    // against GNU diff3 3.12 (`diff3 -m`), which glues the marker succeeding
    // each incomplete hunk onto the hunk's final line.
    let cases = [
        (
            BASE,
            OURS,
            THEIRS,
            "\
This is line 1.
<<<<<<< ours
This is line 2 changed.||||||| original
This is line 2.=======
This is line 2 also changed.>>>>>>> theirs
",
        ),
        (
            BASE,
            OURS,
            THEIRS_NL,
            "\
This is line 1.
<<<<<<< ours
This is line 2 changed.||||||| original
This is line 2.=======
This is line 2 also changed.
>>>>>>> theirs
",
        ),
        (
            BASE,
            OURS_NL,
            THEIRS,
            "\
This is line 1.
<<<<<<< ours
This is line 2 changed.
||||||| original
This is line 2.=======
This is line 2 also changed.>>>>>>> theirs
",
        ),
        (
            BASE,
            OURS_NL,
            THEIRS_NL,
            "\
This is line 1.
<<<<<<< ours
This is line 2 changed.
||||||| original
This is line 2.=======
This is line 2 also changed.
>>>>>>> theirs
",
        ),
        (
            BASE_NL,
            OURS,
            THEIRS,
            "\
This is line 1.
<<<<<<< ours
This is line 2 changed.||||||| original
This is line 2.
=======
This is line 2 also changed.>>>>>>> theirs
",
        ),
        (
            BASE_NL,
            OURS,
            THEIRS_NL,
            "\
This is line 1.
<<<<<<< ours
This is line 2 changed.||||||| original
This is line 2.
=======
This is line 2 also changed.
>>>>>>> theirs
",
        ),
        (
            BASE_NL,
            OURS_NL,
            THEIRS,
            "\
This is line 1.
<<<<<<< ours
This is line 2 changed.
||||||| original
This is line 2.
=======
This is line 2 also changed.>>>>>>> theirs
",
        ),
        (
            BASE_NL,
            OURS_NL,
            THEIRS_NL,
            "\
This is line 1.
<<<<<<< ours
This is line 2 changed.
||||||| original
This is line 2.
=======
This is line 2 also changed.
>>>>>>> theirs
",
        ),
    ];

    // `git merge-file --diff3` (verified with git 2.55.0) appends a newline to
    // every incomplete hunk, so all of the permutations render identically
    // with IncompleteHunkStyle::Git.
    let expected_git = "\
This is line 1.
<<<<<<< ours
This is line 2 changed.
||||||| original
This is line 2.
=======
This is line 2 also changed.
>>>>>>> theirs
";

    let diff3_options = MergeOptions::new();
    let mut git_options = MergeOptions::new();
    git_options.set_incomplete_hunk_style(IncompleteHunkStyle::Git);

    for (base, ours, theirs, expected_diff3) in cases {
        assert_eq!(
            diff3_options.merge(base, ours, theirs),
            Err(String::from(expected_diff3)),
            "diff3 style: base={base:?} ours={ours:?} theirs={theirs:?}",
        );
        assert_eq!(
            diff3_options.merge_bytes(base.as_bytes(), ours.as_bytes(), theirs.as_bytes()),
            Err(expected_diff3.as_bytes().to_vec()),
            "diff3 style (bytes): base={base:?} ours={ours:?} theirs={theirs:?}",
        );
        assert_eq!(
            git_options.merge(base, ours, theirs),
            Err(String::from(expected_git)),
            "git style: base={base:?} ours={ours:?} theirs={theirs:?}",
        );
        assert_eq!(
            git_options.merge_bytes(base.as_bytes(), ours.as_bytes(), theirs.as_bytes()),
            Err(expected_git.as_bytes().to_vec()),
            "git style (bytes): base={base:?} ours={ours:?} theirs={theirs:?}",
        );
    }
}