pijul/pijul - Change C4TC7UKFYIOOABSXDCS5H4EVOMAIZK5OEQ5IF4O7RQYY72AZJRVQC

Fix the hunk_roundtrip test, simplify code, improve test coverage, fix some edge cases.

Created by FHRXP5Jnb2MWLDrPrnLnkN2ryWcGCo6CRr1dXR9FW2YA on December 9, 2021

C4TC7UKFYIOOABSXDCS5H4EVOMAIZK5OEQ5IF4O7RQYY72AZJRVQC

Dependencies

In discussions

#585 Fix the hunk_roundtrip test

Change contents

Replacement in libpijul/src/tests/unrecord.rs at line 335 [5.248807]
B:BD[4.6130] → [2.50:90]
```
    )?.into_iter().collect::<Vec<_>>();
```
[4.6130]
[5.260719]
```
    )?
    .into_iter()
    .collect::<Vec<_>>();
```
Replacement in libpijul/src/tests/file_conflicts.rs at line 918 [5.305506]
B:BD[4.40603] → [2.291:331]
```
    )?.into_iter().collect::<Vec<_>>();
```
[4.40603]
[5.335741]
```
    )?
    .into_iter()
    .collect::<Vec<_>>();
```
Replacement in libpijul/src/tests/file_conflicts.rs at line 966 [5.305506]
B:BD[4.41437] → [2.332:372]
```
    )?.into_iter().collect::<Vec<_>>();
```
[4.41437]
[4.41438]
```
    )?
    .into_iter()
    .collect::<Vec<_>>();
```
Replacement in libpijul/src/tests/file_conflicts.rs at line 1002 [5.305506]
B:BD[4.41902] → [2.421:461]
```
    )?.into_iter().collect::<Vec<_>>();
```
[4.41902]
[2.461]
```
    )?
    .into_iter()
    .collect::<Vec<_>>();
```

Replacement in libpijul/src/change/printable.rs at line 415 [6.36296]

B:BD[6.47117] → [7.142:293]

                if !content_edges.is_empty() {
                    writeln!(w, "{}", PrintableAtom::Edges(content_edges.to_vec()))?;
                }

[6.47117]

[6.47199]

                writeln!(w, "{}", PrintableAtom::Edges(content_edges.to_vec()))?;

Replacement in libpijul/src/change/printable.rs at line 434 [6.36296]

B:BD[6.47786] → [7.294:445]

                if !content_edges.is_empty() {
                    writeln!(w, "{}", PrintableAtom::Edges(content_edges.to_vec()))?;
                }

[6.47786]

[6.47868]

                writeln!(w, "{}", PrintableAtom::Edges(content_edges.to_vec()))?;

Replacement in libpijul/src/change/printable.rs at line 456 [6.36296]

B:BD[8.73] → [8.73:116]

                    if e[0].flag.deleted {

[8.73]

[8.116]

                    if e.is_empty() || e[0].flag.deleted {

Insertion in libpijul/src/change/printable.rs at line 698 [6.36296]

[6.55511]

            AddRoot {
                start: f(g),
            },
            DelRoot {
                name: f(g), inode: f(g)
            },

Replacement in libpijul/src/change/printable.rs at line 708 [6.36296]

B:BD[6.55556] → [6.55556:55759]

    // Shrinking frequently blows stack. Investigate how to fix it.
    // You can disable shrinking by commenting out this function.
    // This may be best solved by switching to proptest crate
    /*

[6.55556]

[6.55759]

    // Shrinking frequently blows stack.
    // See https://github.com/BurntSushi/quickcheck/pull/294.
    // We can't really solve this problem without introducing a ton of boilerplate.

Insertion in libpijul/src/change/printable.rs at line 712 [6.36296]
[6.55816]
[6.55816]
```
        use std::iter::empty;
```

Replacement in libpijul/src/change/printable.rs at line 714 [6.36296]

B:BD[6.55845] → [6.55845:56198]

B:BD[6.56198] → [6.56198:56199]

B:BD[6.56199] → [6.56199:56816]

            FileMoveV { path, name, perms, pos, up_context, down_context, del } =>
                Box::new((path, name, perms, pos, up_context, down_context, del)
                .shrink().map(|(path, name, perms, pos, up_context, down_context, del)|
                fix_encoding(FileMoveV { path, name, perms, pos, up_context, down_context, del }))),
            FileMoveE { path, pos, add, del } =>
                Box::new((path, pos, add, del)
                .shrink().map(|(path, pos, add, del)|
                fix_encoding(FileMoveE { path, pos, add, del }))),
            FileAddition { name, parent, perms, encoding, up_context, start, end, contents } =>
                Box::new((name, parent, perms, encoding, up_context, start, end, contents)
                .shrink().map(|(name, parent, perms, encoding, up_context, start, end, contents)|
                fix_encoding(FileAddition { name, parent, perms, encoding, up_context, start, end, contents }))),

[6.55845]

[6.56816]

            // Example of shrinking for future reference:

Replacement in libpijul/src/change/printable.rs at line 716 [6.36296]

B:BD[6.56817] → [6.56817:59826]

            FileDel { path, pos, encoding, del_edges, content_edges, contents } =>
                Box::new((path, pos, encoding, del_edges, content_edges, contents)
                .shrink().map(|(path, pos, encoding, del_edges, content_edges, contents)|
                fix_encoding(FileDel { path, pos, encoding, del_edges, content_edges, contents }))),
            FileUndel { path, pos, encoding, undel_edges, content_edges, contents } =>
                Box::new((path, pos, encoding, undel_edges, content_edges, contents)
                .shrink().map(|(path, pos, encoding, undel_edges, content_edges, contents)|
                fix_encoding(FileUndel { path, pos, encoding, undel_edges, content_edges, contents }))),
            Edit { path, line, pos, encoding, change, contents } =>
                Box::new((path, line, pos, encoding, change, contents)
                .shrink().map(|(path, line, pos, encoding, change, contents)|
                fix_encoding(Edit { path, line, pos, encoding, change, contents }))),
            Replace { path, line, pos, encoding, change, replacement, change_contents, replacement_contents } =>
                Box::new((path, line, pos, encoding, change, replacement, change_contents, replacement_contents)
                .shrink().map(|(path, line, pos, encoding, change, replacement, change_contents, replacement_contents)|
                fix_encoding(Replace { path, line, pos, encoding, change, replacement, change_contents, replacement_contents }))),
            SolveNameConflict { path, pos, names, edges } =>
                Box::new((path, pos, names, edges)
                .shrink().map(|(path, pos, names, edges)|
                fix_encoding(SolveNameConflict { path, pos, names, edges }))),
            UnsolveNameConflict { path, pos, names, edges } =>
                Box::new((path, pos, names, edges)
                .shrink().map(|(path, pos, names, edges)|
                fix_encoding(UnsolveNameConflict { path, pos, names, edges }))),
            SolveOrderConflict { path, line, pos, encoding, change, contents } =>
                Box::new((path, line, pos, encoding, change, contents)
                .shrink().map(|(path, line, pos, encoding, change, contents)|
                fix_encoding(SolveOrderConflict { path, line, pos, encoding, change, contents }))),
            UnsolveOrderConflict { path, line, pos, encoding, change, contents } =>
                Box::new((path, line, pos, encoding, change, contents)
                .shrink().map(|(path, line, pos, encoding, change, contents)|
                fix_encoding(UnsolveOrderConflict { path, line, pos, encoding, change, contents }))),
            ResurrectZombies { path, line, pos, encoding, change, contents } =>
                Box::new((path, line, pos, encoding, change, contents)
                .shrink().map(|(path, line, pos, encoding, change, contents)|
                fix_encoding(ResurrectZombies { path, line, pos, encoding, change, contents }))),

[6.56817]

[6.59826]

            // FileMoveV { path, name, perms, pos, up_context, down_context, del } =>
            //     Box::new((path, name, perms, pos, up_context, down_context, del)
            //     .shrink().map(|(path, name, perms, pos, up_context, down_context, del)|
            //     fix_encoding(FileMoveV { path, name, perms, pos, up_context, down_context, del }))),
            _ => Box::new(empty()),

Deletion in libpijul/src/change/printable.rs at line 723 [6.36296]
B:BD[6.59842] → [6.59842:59849]
```
    */
```

Replacement in libpijul/src/change/parse.rs at line 68 [6.64713]

B:BD[6.66660] → [3.0:115]

    let (i, content_edges) = if let Ok(x) = parse_edges(i) {
        x
    } else {
        (i, Vec::new())
    };

[6.66660]

[6.66706]

    let (i, content_edges) = map(opt(parse_edges), |o| o.unwrap_or(Vec::new()))(i)?;

Replacement in libpijul/src/change/parse.rs at line 92 [6.64713]

B:BD[6.67368] → [3.116:231]

    let (i, content_edges) = if let Ok(x) = parse_edges(i) {
        x
    } else {
        (i, Vec::new())
    };

[6.67368]

[6.67414]

    let (i, content_edges) = map(opt(parse_edges), |o| o.unwrap_or(Vec::new()))(i)?;

Replacement in libpijul/src/change/parse.rs at line 119 [6.64713]

B:BD[6.68289] → [3.232:389]

    let (i, contents) = if let PrintablePerms::IsDir = perms {
        (i, Vec::new())
    } else {
        parse_contents('+', encoding.clone(), i)?
    };

[6.68289]

[6.68356]

    let (i, contents) = parse_contents('+', encoding.clone(), i)?;

Replacement in libpijul/src/change/parse.rs at line 144 [6.64713]

B:BD[6.69024] → [8.354:436]

B:BD[8.436] → [3.390:513]

    let (i, contents) = if let Ok(s) = parse_contents('+', encoding.clone(), i) {
        if s.1.is_empty() {
            parse_contents('-', encoding.clone(), i)?
        } else {
            s
        }

[6.69024]

[8.446]

    let (i, contents_plus) = parse_contents('+', encoding.clone(), i)?;
    let (i, contents_minus) = parse_contents('-', encoding.clone(), i)?;
    let contents = if contents_plus.is_empty() {
        contents_minus

Replacement in libpijul/src/change/parse.rs at line 149 [6.64713]
B:BD[8.459] → [8.459:509]
```
        parse_contents('-', encoding.clone(), i)?
```
[8.459]
[8.509]
```
        contents_plus
```
Deletion in libpijul/src/change/parse.rs at line 358 [6.64713]
B:BD[6.74568] → [9.293:336]
```
    let has_encoding = encoding.is_some();
```

Replacement in libpijul/src/change/parse.rs at line 359 [6.64713]

B:BD[6.74618] → [3.514:721]

∅:D[9.382] → [10.1000:1033]

∅:D[3.721] → [10.1000:1033]

B:BD[8.546] → [10.1000:1033]

        let not_empty = if backslash.is_some() && vec[vec.len() - 1] == b'\n' {
            vec.pop().is_some()
        } else {
            !vec.is_empty()
        };
        if has_encoding || not_empty {
            return Ok((i, vec));

[6.74618]

[8.578]

        if backslash.is_some() && vec[vec.len() - 1] == b'\n' {
            vec.pop();

Insertion in libpijul/src/change/parse.rs at line 362 [6.64713]

[8.588]

[6.74871]

        Ok((i, vec))
    } else {
        Err(nom::Err::Error(nom::error::Error::new(
            i,
            nom::error::ErrorKind::Verify,
        )))

Deletion in libpijul/src/change/parse.rs at line 369 [6.64713]

B:BD[6.74877] → [8.589:695]

    Err(nom::Err::Error(nom::error::Error::new(
        i,
        nom::error::ErrorKind::Verify,
    )))

Fix the hunk_roundtrip test, simplify code, improve test coverage, fix some edge cases.

Dependencies

In discussions

Change contents

Replacement in libpijul/src/tests/unrecord.rs at line 335 [5.248807]

Replacement in libpijul/src/tests/file_conflicts.rs at line 918 [5.305506]

Replacement in libpijul/src/tests/file_conflicts.rs at line 966 [5.305506]

Replacement in libpijul/src/tests/file_conflicts.rs at line 1002 [5.305506]