ilyagr/pijul - Change 2UMXNSD5XADPYSQKSNF67ATKTAED6ANAS3P6MK6OZC3KEZJ6ZF7QC

Record: simpler detection of moves vs conflicts

Created by pmeunier on December 6, 2021

2UMXNSD5XADPYSQKSNF67ATKTAED6ANAS3P6MK6OZC3KEZJ6ZF7QC

Dependencies

In channels

main

Change contents

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

B:BD[4.508835] → [4.508835:508937]

        if !moved.resurrect.is_empty() {
            moved.resurrect.extend(moved.alive.into_iter());

[4.508835]

[5.6276]

        let is_resurrected = !moved.resurrect.is_empty();
        if is_resurrected {
            moved.resurrect.extend(moved.alive.drain(..));

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

B:BD[4.509284] → [4.509284:509321]

            if moved.need_new_name {

[4.509284]

[2.2036]

            // If there was exactly one alive name, this is a regular
            // move, i.e. not a conflict.
            if moved.n_alive_names == 1 {

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

∅:D[2.2095] → [6.60611:60662]

B:BD[4.509321] → [6.60611:60662]

∅:D[7.1818] → [4.509378:509592]

∅:D[6.60662] → [4.509378:509592]

B:BD[4.509378] → [4.509378:509592]

                self.actions.push(Hunk::FileMove {
                    del: Atom::EdgeMap(EdgeMap {
                        edges: moved.edges,
                        inode: item.v_papa,
                    }),
                    add: Atom::NewVertex(NewVertex {

[2.2095]

[2.2096]

                let add = if moved.need_new_name && !is_resurrected {
                    moved.edges.extend(moved.alive.drain(..));
                    Atom::NewVertex(NewVertex {

Insertion in libpijul/src/record.rs at line 1100 [4.488880]

[2.2196]

[4.509905]

                    })
                } else {
                    Atom::EdgeMap(EdgeMap {
                        edges: moved.alive,
                        inode: item_v_papa,
                    })
                };
                self.actions.push(Hunk::FileMove {
                    del: Atom::EdgeMap(EdgeMap {
                        edges: moved.edges,
                        inode: item.v_papa,

Insertion in libpijul/src/record.rs at line 1112 [4.488880]
[4.509929]
[8.1904]
```
                    add,
```
Insertion in libpijul/src/record.rs at line 1234 [4.488880]
[4.510760]
[4.510760]
```
    n_alive_names: usize,
```
Insertion in libpijul/src/record.rs at line 1255 [4.488880]
[4.511265]
[4.511265]
```
        n_alive_names: 0,
```

Deletion in libpijul/src/record.rs at line 1262 [4.488880]

B:BD[9.36] → [10.0:93]

    // Check for any renaming as that's a priority change
    let mut is_any_rename = false;

Deletion in libpijul/src/record.rs at line 1318 [4.488880]

B:BD[4.513102] → [3.0:77]

∅:D[3.77] → [11.263:341]

B:BD[11.263] → [11.263:341]

        if parent_name != name {
            is_any_rename = true;
        }
        debug!("new_meta = {:?}, parent_meta = {:?}", new_meta, parent_meta);

Deletion in libpijul/src/record.rs at line 1319 [4.488880]

B:BD[12.85] → [10.1052:1128]

        if is_any_rename && !name_changed {
            continue;
        }

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

∅:D[12.444] → [4.514306:514307]

B:BD[4.514306] → [4.514306:514307]

[12.444]

[13.52476]

            if !grandparent.flag().contains(EdgeFlags::DELETED) {
                moved.n_alive_names += 1;
            }

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

B:BD[4.514474] → [4.514474:514525]

                    moved.resurrect.push(NewEdge {

[4.514474]

[13.52542]

                    (if parent_was_resurrected {
                        &mut moved.resurrect
                    } else {
                        &mut moved.alive
                    })
                    .push(NewEdge {