pijul/pijul - Change EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC

Fixing a bug with empty new files, and another one with empty replacements

Created by pmeunier on February 1, 2021

EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC

Dependencies

In channels

main

In discussions

#290 reset generates conflict

#301 Fix tests compilation failures

#333 Typo in help output

Change contents

Replacement in libpijul/src/record.rs at line 291 [4.488880]

B:BD[4.497247] → [4.497247:497313]

            if self.rec.contents.len() as u64 > inode_pos.0 + 1 {

[4.497247]

[4.497313]

            if end > start {

Insertion in libpijul/src/diff/replace.rs at line 63 [4.779907]

[4.781789]

        if start >= end {
            return;
        }

Deletion in libpijul/src/diff/replace.rs at line 75 [4.779907]
B:BD[5.45] → [3.119:145]
∅:D[3.145] → [6.0:20]
B:BD[7.93] → [6.0:20]
∅:D[6.20] → [7.112:122]
B:BD[7.112] → [7.112:122]
```
        if start >= end {
            return;
        }
```

Replacement in libpijul/src/change/text_changes.rs at line 810 [8.37976]

B:BD[8.68732] → [8.68732:68816]

B:BD[8.68816] → [2.0:174]

∅:D[2.174] → [8.68897:69085]

B:BD[8.68897] → [8.68897:69085]

                        if let Some(Atom::NewVertex(ref mut contents)) = contents {
                            if contents.end > contents.start
                                && contents_[contents.end.0 as usize - 1] == b'\n'
                            {
                                assert_eq!(contents.end.0 as usize, contents_.len());
                                contents_.pop();
                                contents.end.0 -= 1;

[8.68732]

[8.69085]

                        if let Some(Atom::NewVertex(mut c)) = contents.take() {
                            if c.end > c.start {
                                if  contents_[c.end.0 as usize - 1] == b'\n' {
                                    assert_eq!(c.end.0 as usize, contents_.len());
                                    contents_.pop();
                                    c.end.0 -= 1;
                                }
                                *contents = Some(Atom::NewVertex(c))