ilyagr/pijul - Change 3J6IK4W2BA4RJJQYXZOQFU4AQ3WJIM3TUXUNNBIQ6M6TS2JSHT6QC

Explicitly adding .pijul is now forbidden

Created by pmeunier on January 12, 2021

3J6IK4W2BA4RJJQYXZOQFU4AQ3WJIM3TUXUNNBIQ6M6TS2JSHT6QC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/working_copy/filesystem.rs at line 144 [5.208900]
B:BD[4.1972] → [4.1972:2017]
```
        let meta = std::fs::metadata(&full);
```
[4.1972]
[4.2017]
```
        let meta = std::fs::metadata(&full)?;
```

Replacement in libpijul/src/working_copy/filesystem.rs at line 149 [5.208900]

B:BD[6.1901] → [6.1901:1902]

[6.1901]

[2.19680]

        if !filter_ignore(&repo_path.as_canonical_path(), &full.as_canonical_path(), meta.is_dir()) {
            return Ok(())
        }

Replacement in libpijul/src/working_copy/filesystem.rs at line 153 [5.208900]

∅:D[2.19764] → [7.1063:1195]

B:BD[7.1063] → [7.1063:1195]

B:BD[7.1195] → [3.243:445]

∅:D[3.445] → [7.1291:2061]

∅:D[8.77] → [7.1291:2061]

B:BD[7.1291] → [7.1291:2061]

            if let Ok(meta) = meta {
                if meta.is_dir() {
                    let mut walk = WalkBuilder::new(&full);
                    walk.ignore(true)
                        .git_ignore(true)
                        .filter_entry(|p| p.file_name() != crate::DOT_DIR)
                        .threads(threads - 1);
                    walk.build_parallel().run(|| {
                        Box::new(|entry| {
                            let entry: ignore::DirEntry = if let Ok(entry) = entry {
                                entry
                            } else {
                                return ignore::WalkState::Quit;
                            };
                            let p = entry.path();
                            if let Some(p) = p.file_name() {
                                if let Some(p) = p.to_str() {
                                    if p.ends_with("~") || (p.starts_with("#") && p.ends_with("#"))
                                    {
                                        return ignore::WalkState::Skip;
                                    }

[2.19764]

[7.2061]

            if meta.is_dir() {
                let mut walk = WalkBuilder::new(&full);
                walk.ignore(true)
                    .git_ignore(true)
                    .filter_entry(|p| {
                        debug!("p.file_name = {:?}", p.file_name());
                        p.file_name() != crate::DOT_DIR
                    })
                    .threads(threads - 1);
                walk.build_parallel().run(|| {
                    Box::new(|entry| {
                        let entry: ignore::DirEntry = if let Ok(entry) = entry {
                            entry
                        } else {
                            return ignore::WalkState::Quit;
                        };
                        let p = entry.path();
                        if let Some(p) = p.file_name() {
                            if let Some(p) = p.to_str() {
                                if p.ends_with("~") || (p.starts_with("#") && p.ends_with("#"))
                                {
                                    return ignore::WalkState::Skip;

Replacement in libpijul/src/working_copy/filesystem.rs at line 177 [5.208900]

B:BD[7.2125] → [6.1903:2273]

B:BD[6.2273] → [9.1739:1941]

∅:D[9.1941] → [6.2361:2476]

B:BD[6.2361] → [6.2361:2476]

                            debug!("entry path = {:?} {:?}", entry.path(), repo_path);
                            if let Ok(entry_path) = CanonicalPathBuf::canonicalize(entry.path()) {
                                if let Ok(path) = entry_path.as_path().strip_prefix(&repo_path) {
                                    let is_dir = entry.file_type().unwrap().is_dir();
                                    if sender.send((path.to_path_buf(), is_dir)).is_err() {
                                        return ignore::WalkState::Quit;
                                    }
                                } else {
                                    debug!("entry = {:?}", entry.path());

[7.2125]

[6.2476]

                        }
                        debug!("entry path = {:?} {:?}", entry.path(), repo_path);
                        if let Ok(entry_path) = CanonicalPathBuf::canonicalize(entry.path()) {
                            if let Ok(path) = entry_path.as_path().strip_prefix(&repo_path) {
                                let is_dir = entry.file_type().unwrap().is_dir();
                                if sender.send((path.to_path_buf(), is_dir)).is_err() {
                                    return ignore::WalkState::Quit;

Insertion in libpijul/src/working_copy/filesystem.rs at line 185 [5.208900]

[6.2510]

[4.2677]

                            } else {
                                debug!("entry = {:?}", entry.path());

Replacement in libpijul/src/working_copy/filesystem.rs at line 188 [5.208900]

B:BD[4.2707] → [7.2574:2657]

                            ignore::WalkState::Continue
                        })

[4.2707]

[7.2657]

                        }
                        ignore::WalkState::Continue

Replacement in libpijul/src/working_copy/filesystem.rs at line 191 [5.208900]

B:BD[7.2680] → [6.2511:2604]

∅:D[6.2604] → [7.2754:2825]

B:BD[7.2754] → [7.2754:2825]

∅:D[7.2825] → [4.3413:3431]

B:BD[4.3413] → [4.3413:3431]

                } else if let Ok(path) = full.as_path().strip_prefix(&repo_path.as_path()) {
                    sender.send((path.to_path_buf(), false)).unwrap();
                }

[7.2680]

[4.3721]

                })
            } else {
                debug!("filter_ignore ok");
                let path = full.as_path().strip_prefix(&repo_path.as_path()).unwrap();
                sender.send((path.to_path_buf(), false)).unwrap();