pijul/pijul - Change GJZWSXHQ6SYUDTVDOUBTJYU3SG567M2AXWURWKRNVP2MISZ444DQC

Do not remove files not tracked in the new channel when outputting

Created by pmeunier on July 21, 2021

GJZWSXHQ6SYUDTVDOUBTJYU3SG567M2AXWURWKRNVP2MISZ444DQC

Dependencies

In channels

main

In discussions

#348 [Bug] Untracked files can be lost by going back and forth channels.

Change contents

Replacement in libpijul/src/output/output.rs at line 167 [3.671807]

B:BD[2.102191] → [2.102191:102257]

            kill_dead_files::<T, R, P>(&mut *txn, &repo, &dead)?;

[2.102191]

[4.76962]

            kill_dead_files::<T, R, P>(&mut *txn, &channel, &repo, &dead)?;

Replacement in libpijul/src/output/output.rs at line 287 [3.671807]

B:BD[2.102636] → [2.102636:102714]

                        kill_dead_files::<T, R, P>(&mut *txn, &repo, &dead)?;

[2.102636]

[4.78609]

                        kill_dead_files::<T, R, P>(&mut *txn, &channel, &repo, &dead)?;

Replacement in libpijul/src/output/output.rs at line 545 [3.671807]

B:BD[5.22808] → [2.103387:103463]

fn kill_dead_files<T: TreeMutTxnT, W: WorkingCopy + Clone, C: ChangeStore>(

[5.22808]

[3.685451]

fn kill_dead_files<T: ChannelTxnT<GraphError = T::TreeError> + TreeMutTxnT, W: WorkingCopy + Clone, C: ChangeStore>(

Insertion in libpijul/src/output/output.rs at line 547 [3.671807]
[3.685468]
[2.103464]
```
    channel: &ChannelRef<T>,
```

Replacement in libpijul/src/output/output.rs at line 550 [3.671807]

B:BD[3.685544] → [6.85042:85107]

) -> Result<(), OutputError<C::Error, T::TreeError, W::Error>> {

[3.685544]

[3.685577]

) -> Result<(), OutputError<C::Error, T::TreeError, W::Error>>
{
    let channel = channel.read();

Deletion in libpijul/src/output/output.rs at line 557 [3.671807]

B:BD[7.121803] → [7.121803:121900]

        for i in txn.iter_inodes().unwrap() {
            debug!("inodes = {:?}", i);
        }

Replacement in libpijul/src/output/output.rs at line 560 [3.671807]

∅:D[7.122018] → [8.0:114]

B:BD[6.85288] → [8.0:114]

            if let Some(name) = name {
                repo.remove_path(&name).map_err(OutputError::WorkingCopy)?

[7.122018]

[8.114]

            if txn.get_graph(txn.graph(&*channel), &vertex.inode_vertex(), None).map_err(|x| OutputError::Pristine(x.into()))?.is_some() {
                if let Some(name) = name {
                    repo.remove_path(&name).map_err(OutputError::WorkingCopy)?
                }