| hg-reviewers |
When reading a directory fails such as because of insufficient permissions,
it should be treated as empty by status instead of skipped entirely.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/dirstate_tree/status.rs (5 lines) | |||
| M | tests/test-status.t (17 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 5b0eec296ca8 | 710435a5c469 | Simon Sapin | May 28 2021, 6:16 AM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin |
| let mut fs_entries = if let Ok(entries) = self.read_dir( | let mut fs_entries = if let Ok(entries) = self.read_dir( | ||||
| directory_hg_path, | directory_hg_path, | ||||
| directory_fs_path, | directory_fs_path, | ||||
| is_at_repo_root, | is_at_repo_root, | ||||
| ) { | ) { | ||||
| entries | entries | ||||
| } else { | } else { | ||||
| return Ok(()); | // Treat an unreadable directory (typically because of insufficient | ||||
| // permissions) like an empty directory. `self.read_dir` has | |||||
| // already called `self.io_error` so a warning will be emitted. | |||||
| Vec::new() | |||||
| }; | }; | ||||
| // `merge_join_by` requires both its input iterators to be sorted: | // `merge_join_by` requires both its input iterators to be sorted: | ||||
| let dirstate_nodes = dirstate_nodes.sorted(); | let dirstate_nodes = dirstate_nodes.sorted(); | ||||
| // `sort_unstable_by_key` doesn’t allow keys borrowing from the value: | // `sort_unstable_by_key` doesn’t allow keys borrowing from the value: | ||||
| // https://github.com/rust-lang/rust/issues/34162 | // https://github.com/rust-lang/rust/issues/34162 | ||||
| fs_entries.sort_unstable_by(|e1, e2| e1.base_name.cmp(&e2.base_name)); | fs_entries.sort_unstable_by(|e1, e2| e1.base_name.cmp(&e2.base_name)); | ||||
| C .hgignore | C .hgignore | ||||
| C clean | C clean | ||||
| C subdir/clean | C subdir/clean | ||||
| Note: `hg status some-name` creates a patternmatcher which is not supported | Note: `hg status some-name` creates a patternmatcher which is not supported | ||||
| yet by the Rust implementation of status, but includematcher is supported. | yet by the Rust implementation of status, but includematcher is supported. | ||||
| --include is used below for that reason | --include is used below for that reason | ||||
| #if unix-permissions | |||||
| Not having permission to read a directory that contains tracked files makes | |||||
| status emit a warning then behave as if the directory was empty or removed | |||||
| entirely: | |||||
| $ chmod 0 subdir | |||||
| $ hg status --include subdir | |||||
| subdir: Permission denied | |||||
| R subdir/removed | |||||
| ! subdir/clean | |||||
| ! subdir/deleted | |||||
| ! subdir/modified | |||||
| $ chmod 755 subdir | |||||
| #endif | |||||
| Remove a directory that contains tracked files | Remove a directory that contains tracked files | ||||
| $ rm -r subdir | $ rm -r subdir | ||||
| $ hg status --include subdir | $ hg status --include subdir | ||||
| R subdir/removed | R subdir/removed | ||||
| ! subdir/clean | ! subdir/clean | ||||
| ! subdir/deleted | ! subdir/deleted | ||||
| ! subdir/modified | ! subdir/modified | ||||