pijul/pijul - Change 4QGVAI46ZDCZBZWW3EVL3JMG46FXMZRIQUFGN5PZ7AKAE5F4D73AC

parse deletion (and un-deletion) of directories correctly when recording interactively

Created by rohan on April 29, 2022

4QGVAI46ZDCZBZWW3EVL3JMG46FXMZRIQUFGN5PZ7AKAE5F4D73AC

Dependencies

In discussions

#676 Generated diff cannot be parsed

Change contents

Replacement in libpijul/src/change/parse.rs at line 73 [3.64713]

∅:D[2.115] → [3.66706:66773]

B:BD[3.66706] → [3.66706:66773]

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

[2.115]

[3.66773]

    let (i, contents) = if encoding.is_some() {
        parse_contents('-', encoding.clone(), i)?
    } else {
        // must have been a directory
        (i, Vec::new())
    };

Replacement in libpijul/src/change/parse.rs at line 106 [3.64713]

∅:D[2.231] → [3.67414:67481]

B:BD[3.67414] → [3.67414:67481]

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

[2.231]

[3.67481]

    let (i, contents) = if encoding.is_some() {
        parse_contents('+', encoding.clone(), i)?
    } else {
        // must have been a directory
        (i, Vec::new())
    };