ilyagr/pijul - Change MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC

Fix a panic when switching between channels that have different files

Created by pmeunier on February 26, 2021

MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/reset.rs at line 127 [4.97650]
B:BD[3.1394] → [3.1394:1395]
[3.1394]
[3.1395]
```
                let mut paths = Vec::with_capacity(inodes.len());
```

Replacement in pijul/src/commands/reset.rs at line 129 [4.97650]

B:BD[3.1438] → [3.1438:1499]

                    let (path, _) = libpijul::fs::find_path(

[3.1438]

[3.1499]

                    if let Some((path, _)) = libpijul::fs::find_path(

Replacement in pijul/src/commands/reset.rs at line 135 [4.97650]

B:BD[3.1672] → [3.1672:1696]

)?;

[3.1672]

[3.1696]

                    )? {
                        paths.push(path)
                    } else {
                        paths.clear();
                        break;
                    }
                }
                for path in paths.iter() {

Insertion in pijul/src/commands/reset.rs at line 153 [4.97650]

[3.2075]

[4.101179]

                if paths.is_empty() {
                    txn.output_repository_no_pending(
                        &mut repo.working_copy,
                        &repo.changes,
                        &mut channel,
                        "",
                        true,
                        None,
                    )?;
                }

Replacement in pijul/src/commands/pushpull.rs at line 458 [4.111631]

B:BD[5.343] → [5.343:369]

B:BD[5.369] → [2.12019:12120]

            touched_paths
                .push(libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, *i)?.0)

[5.343]

[5.469]

            if let Some((path, _)) =
                libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, *i)?
            {
                touched_paths.push(path)
            } else {
                touched_paths.clear();
                break;
            }

Insertion in pijul/src/commands/pushpull.rs at line 484 [4.111631]

[6.11136]

[7.2211]

        if touched_paths.is_empty() {
            txn.output_repository_no_pending(
                &mut repo.working_copy,
                &repo.changes,
                &mut channel,
                "",
                true,
                None,
            )?;
        }

Insertion in pijul/src/commands/apply.rs at line 79 [4.194289]
[8.1107]
[8.1146]
```
        let mut touched_files = Vec::with_capacity(touched.len());
```

Replacement in pijul/src/commands/apply.rs at line 81 [4.194289]

B:BD[8.1173] → [8.1173:1293]

            let (path, _) =
                libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, i)?;

[8.1173]

[8.1293]

            if let Some((path, _)) =
                libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, i)?
            {
                touched_files.push(path)
            } else {
                touched_files.clear();
                break;
            }
        }
        for path in touched_files.iter() {

Insertion in pijul/src/commands/apply.rs at line 100 [4.194289]

[8.1560]

[4.196314]

        if !touched_files.is_empty() {
            txn.output_repository_no_pending(
                &mut repo.working_copy,
                &repo.changes,
                &mut channel,
                "",
                true,
                None,
            )?;
        }

Replacement in libpijul/src/pristine/mod.rs at line 1879 [4.586748]

B:BD[9.489] → [10.77261:77352]

        let (path, _) = crate::fs::find_path(changes, txn, channel, true, file_).unwrap();

[9.489]

[9.590]

        let (path, _) = crate::fs::find_path(changes, txn, channel, true, file_).unwrap().unwrap();

Replacement in libpijul/src/lib.rs at line 555 [4.717381]

∅:D[2.128217] → [10.98460:98541]

B:BD[4.731981] → [10.98460:98541]

    ) -> Result<(String, bool), output::FileError<C::Error, Self::GraphError>> {

[2.128217]

[4.732030]

    ) -> Result<Option<(String, bool)>, output::FileError<C::Error, Self::GraphError>> {

Replacement in libpijul/src/lib.rs at line 568 [4.717381]

B:BD[4.732453] → [10.98631:98712]

    ) -> Result<(String, bool), output::FileError<C::Error, Self::GraphError>> {

[4.732453]

[4.732502]

    ) -> Result<Option<(String, bool)>, output::FileError<C::Error, Self::GraphError>> {

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

B:BD[4.761102] → [10.113877:113958]

) -> Result<(String, bool), crate::output::FileError<C::Error, T::GraphError>> {

[4.761102]

[4.761147]

) -> Result<Option<(String, bool)>, crate::output::FileError<C::Error, T::GraphError>> {

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

B:BD[4.761463] → [11.6158:6237]

        let inode_vertex = txn.find_block_end(txn.graph(channel), v).unwrap();

[4.761463]

[2.133097]

        let inode_vertex = match txn.find_block_end(txn.graph(channel), v) {
            Ok(block) => block,
            Err(BlockError::Block { block, .. }) => {
                debug!("block not found {:?}", block);
                assert!(path.is_empty());
                return Ok(None)
            },
            Err(BlockError::Txn(t)) => return Err(crate::output::FileError::Txn(t)),
        };

Replacement in libpijul/src/fs.rs at line 910 [4.737429]
B:BD[4.763251] → [4.763251:763287]
```
    Ok((path.join("/"), all_alive))
```
[4.763251]
[12.628]
```
    Ok(Some((path.join("/"), all_alive)))
```