pijul/pijul - Change EAAJNZ3J57QH5P5UWJD5CRN62HZKCRW5BKLUCIHSFFKXLUVEFH2AC

Make recursive directory removal optional

Created by pmeunier on July 21, 2021

EAAJNZ3J57QH5P5UWJD5CRN62HZKCRW5BKLUCIHSFFKXLUVEFH2AC

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/working_copy/mod.rs at line 20 [6.198172]

B:BD[3.1728] → [4.24701:24767]

    fn remove_path(&self, name: &str) -> Result<(), Self::Error>;

[3.1728]

[4.24767]

    fn remove_path(&self, name: &str, rec: bool) -> Result<(), Self::Error>;

Replacement in libpijul/src/working_copy/memory.rs at line 266 [6.199222]

B:BD[6.207007] → [4.26328:26395]

    fn remove_path(&self, path: &str) -> Result<(), Self::Error> {

[6.207007]

[7.424]

    fn remove_path(&self, path: &str, _rec: bool) -> Result<(), Self::Error> {

Replacement in libpijul/src/working_copy/filesystem.rs at line 337 [6.208900]

B:BD[6.214848] → [4.28859:28926]

    fn remove_path(&self, path: &str) -> Result<(), Self::Error> {

[6.214848]

[4.28926]

    fn remove_path(&self, path: &str, rec: bool) -> Result<(), Self::Error> {

Replacement in libpijul/src/working_copy/filesystem.rs at line 342 [6.208900]

B:BD[6.215062] → [6.215062:215109]

                std::fs::remove_dir_all(&path)

[6.215062]

[6.215109]

                if rec {
                    std::fs::remove_dir_all(&path)
                } else {
                    std::fs::remove_dir(&path)
                }

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

B:BD[3.22808] → [2.166:283]

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

[3.22808]

[6.685451]

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

Replacement in libpijul/src/output/output.rs at line 554 [6.671807]

B:BD[6.685544] → [2.314:379]

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

[6.685544]

[2.379]

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

Replacement in libpijul/src/output/output.rs at line 563 [6.671807]

B:BD[8.122018] → [2.414:553]

            if txn.get_graph(txn.graph(&*channel), &vertex.inode_vertex(), None).map_err(|x| OutputError::Pristine(x.into()))?.is_some() {

[8.122018]

[2.553]

            if txn
                .get_graph(txn.graph(&*channel), &vertex.inode_vertex(), None)
                .map_err(|x| OutputError::Pristine(x.into()))?
                .is_some()
            {

Replacement in libpijul/src/output/output.rs at line 569 [6.671807]

B:BD[2.596] → [2.596:675]

                    repo.remove_path(&name).map_err(OutputError::WorkingCopy)?

[2.596]

[2.675]

                    repo.remove_path(&name, false)
                        .map_err(OutputError::WorkingCopy)?