ilyagr/pijul - Change 3VI4Z7VZBYSMPFDVKJO3BQME7SESRPLTTARIGC5WDFJNXKY6LS5AC

Fix: in repositories converted from the mono-root format, some deleted file name edges could be recorded twice in some cases

Created by pmeunier on March 1, 2023

3VI4Z7VZBYSMPFDVKJO3BQME7SESRPLTTARIGC5WDFJNXKY6LS5AC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/record.rs at line 1515 [6.488880]

∅:D[4.51872] → [5.93:140]

B:BD[6.512449] → [5.93:140]

∅:D[5.140] → [6.512493:512522]

B:BD[6.512493] → [6.512493:512522]

                    .or_insert_with(Vec::new);
                v.push(None)

[4.51872]

[6.512522]

                    .or_insert_with(HashSet::new);
                v.insert(None);

Replacement in libpijul/src/record.rs at line 1520 [6.488880]

∅:D[4.51945] → [5.141:188]

B:BD[6.512643] → [5.141:188]

B:BD[5.188] → [4.51946:51999]

                    .or_insert_with(Vec::new);
                v.push(Some(parent.introduced_by()))

[4.51945]

[6.512738]

                    .or_insert_with(HashSet::new);
                v.insert(Some(parent.introduced_by()));

Insertion in libpijul/src/record.rs at line 1574 [6.488880]

[2.12263]

                // Because repos may have multiple roots there may be
                // a mismatch here.  The "no change" case when
                // `parent_pos` is a root vertex is when
                // `grandparent.dest()` is also a root vertex.

Replacement in libpijul/src/record.rs at line 1621 [6.488880]

∅:D[4.53127] → [5.189:240]

B:BD[6.515681] → [5.189:240]

B:BD[5.240] → [4.53128:53190]

                        .or_insert_with(Vec::new);
                    v.push(Some(grandparent.introduced_by()))

[4.53127]

[6.515789]

                        .or_insert_with(HashSet::new);
                    v.insert(Some(grandparent.introduced_by()));

Replacement in libpijul/src/record.rs at line 1655 [6.488880]

∅:D[4.53740] → [5.241:288]

B:BD[6.516947] → [5.241:288]

B:BD[5.288] → [4.53741:53800]

                    .or_insert_with(Vec::new);
                v.push(Some(grandparent.introduced_by()));

[4.53740]

[3.520]

                    .or_insert_with(HashSet::new);
                v.insert(Some(grandparent.introduced_by()));

Insertion in libpijul/src/record.rs at line 1702 [6.488880]

[2.12431]

/// Is this vertex a (potentially deleted) "root vertex", i.e. a root
/// of the file hierarchy?

Replacement in libpijul/src/record.rs at line 1714 [6.488880]

B:BD[2.12707] → [2.12707:12793]

        EdgeFlags::FOLDER | EdgeFlags::PARENT | EdgeFlags::PSEUDO | EdgeFlags::BLOCK,

[2.12707]

[2.12793]

        EdgeFlags::all(),

Replacement in libpijul/src/record.rs at line 1716 [6.488880]

B:BD[2.12802] → [2.12802:12834]

        let p = parent?.dest();

[2.12802]

[2.12834]

        let parent = parent?;
        if !parent.flag().contains(EdgeFlags::PARENT) {
            continue
        }
        let p = parent.dest();