jcdickinson/pijul - Change KNB3RZMS4VRNBXGLSA6P6IDSCIKYRNLNCQ5RDMREUO4NVECKWURAC

Fixing path crashes related to the new non-null roots

Created by pmeunier on November 27, 2021

KNB3RZMS4VRNBXGLSA6P6IDSCIKYRNLNCQ5RDMREUO4NVECKWURAC

Dependencies

In channels

main

Change contents

Insertion in libpijul/src/fs.rs at line 718 [4.737429]

[2.18754]

[4.755231]

            if dest.start == dest.end {
                // non-null root.
                return None
            }

Replacement in libpijul/src/fs.rs at line 778 [4.737429]

B:BD[4.756693] → [4.756693:756764]

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

[4.756693]

[5.111963]

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

Replacement in libpijul/src/fs.rs at line 852 [4.737429]

B:BD[4.759605] → [6.1223:1394]

∅:D[6.1394] → [5.113391:113421]

∅:D[7.5912] → [5.113391:113421]

∅:D[8.62720] → [5.113391:113421]

B:BD[5.113391] → [5.113391:113421]

B:BD[5.113421] → [9.132710:132796]

∅:D[7.5997] → [4.759767:759848]

∅:D[8.62804] → [4.759767:759848]

∅:D[10.64035] → [4.759767:759848]

∅:D[5.113502] → [4.759767:759848]

∅:D[9.132796] → [4.759767:759848]

B:BD[4.759767] → [4.759767:759848]

B:BD[4.759848] → [11.32111:32131]

B:BD[11.32131] → [2.19089:19278]

∅:D[2.19278] → [5.113593:113643]

∅:D[9.132907] → [5.113593:113643]

B:BD[5.113593] → [5.113593:113643]

B:BD[5.113643] → [12.0:79]

B:BD[12.79] → [3.0:405]

        for name in iter_adjacent(
            txn,
            txn.graph(channel),
            current.inode_vertex(),
            flag0,
            flag1,
        )? {
            let name = name?;
            let name_dest = txn.find_block(txn.graph(channel), name.dest()).unwrap();
            name_buf.clear();
            debug!("getting contents {:?}", name);
            changes
                .get_contents(
                    |h| txn.get_external(&h).unwrap().map(|x| x.into()),
                    *name_dest,
                    &mut name_buf,
                )
                .map_err(FsErrorC::Changestore)?;
            let FileMetadata { basename, .. } = FileMetadata::read(&name_buf);
            if basename == c {
                let age = txn
                    .get_changeset(txn.changes(&channel), &name.dest().change)
                    .unwrap();
                if let Some((ref mut next, ref mut next_age)) = next {
                    ambiguous = true;
                    if age < *next_age {
                        *next = name_dest;
                        *next_age = age;

[4.759605]

[3.405]

        'outer: loop {
            for name in iter_adjacent(
                txn,
                txn.graph(channel),
                current.inode_vertex(),
                flag0,
                flag1,
            )? {
                let name = name?;
                let name_dest = txn.find_block(txn.graph(channel), name.dest()).unwrap();
                if name_dest.start == name_dest.end {
                    // non-null root, just continue.
                    current = iter_adjacent(txn, txn.graph(channel), *name_dest, flag0, flag1)?
                        .next()
                        .unwrap()?
                        .dest();
                    break 'outer
                }
                name_buf.clear();
                debug!("getting contents {:?}", name);
                changes
                    .get_contents(
                        |h| txn.get_external(&h).unwrap().map(|x| x.into()),
                        *name_dest,
                        &mut name_buf,
                    )
                    .map_err(FsErrorC::Changestore)?;
                let FileMetadata { basename, .. } = FileMetadata::read(&name_buf);
                if basename == c {
                    let age = txn
                        .get_changeset(txn.changes(&channel), &name.dest().change)
                        .unwrap();
                    if let Some((ref mut next, ref mut next_age)) = next {
                        ambiguous = true;
                        if age < *next_age {
                            *next = name_dest;
                            *next_age = age;
                        }
                    } else {
                        next = Some((name_dest, age));

Deletion in libpijul/src/fs.rs at line 893 [4.737429]

B:BD[3.427] → [3.427:503]

                } else {
                    next = Some((name_dest, age));

Insertion in libpijul/src/fs.rs at line 895 [4.737429]

[4.760499]

            if let Some((next, _)) = next {
                current = iter_adjacent(txn, txn.graph(channel), *next, flag0, flag1)?
                    .next()
                    .unwrap()?
                    .dest()
            } else {
                return Err(FsErrorC::NotFound(FsNotFound(path.to_string())));
            }

Deletion in libpijul/src/fs.rs at line 904 [4.737429]
B:BD[4.760509] → [4.760509:760549]
B:BD[4.760549] → [9.132988:133071]
∅:D[7.6157] → [4.760636:760660]
∅:D[8.62962] → [4.760636:760660]
∅:D[10.64107] → [4.760636:760660]
∅:D[5.113722] → [4.760636:760660]
∅:D[9.133071] → [4.760636:760660]
B:BD[4.760636] → [4.760636:760660]
B:BD[4.760660] → [5.113723:113750]
B:BD[5.113750] → [9.133072:133096]
∅:D[9.133096] → [4.760708:760725]
B:BD[4.760708] → [4.760708:760725]
B:BD[4.760725] → [5.113751:113825]
∅:D[11.32315] → [4.760849:760859]
∅:D[5.113825] → [4.760849:760859]
B:BD[4.760849] → [4.760849:760859]
```
        if let Some((next, _)) = next {
            current = iter_adjacent(txn, txn.graph(channel), *next, flag0, flag1)?
                .next()
                .unwrap()?
                .dest()
        } else {
            return Err(FsErrorC::NotFound(FsNotFound(path.to_string())));
        }
```