| marmoute |
| hg-reviewers |
'.hg' would show up in hg status if were a symlink.
| No Linters Available |
| No Unit Test Coverage |
In D8461#126482, @marmoute wrote:Actually, please fold the next patch in this one.
Done.
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/dirstate/status.rs (9 lines) | |||
| M | tests/test-status.t (8 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 5a9431ed2fc7 | 83bd8b18adb0 | Raphaël Gomès | Apr 23 2020, 3:59 AM |
| dir_ignore_fn: &'a IgnoreFnType, | dir_ignore_fn: &'a IgnoreFnType, | ||||
| options: StatusOptions, | options: StatusOptions, | ||||
| filename: HgPathBuf, | filename: HgPathBuf, | ||||
| dir_entry: DirEntry, | dir_entry: DirEntry, | ||||
| ) -> IoResult<()> { | ) -> IoResult<()> { | ||||
| let file_type = dir_entry.file_type()?; | let file_type = dir_entry.file_type()?; | ||||
| let entry_option = dmap.get(&filename); | let entry_option = dmap.get(&filename); | ||||
| if filename.as_bytes() == b".hg" { | |||||
| // Could be a directory or a symlink | |||||
| return Ok(()); | |||||
| } | |||||
| if file_type.is_dir() { | if file_type.is_dir() { | ||||
| handle_traversed_dir( | handle_traversed_dir( | ||||
| scope, | scope, | ||||
| files_sender, | files_sender, | ||||
| matcher, | matcher, | ||||
| root_dir, | root_dir, | ||||
| dmap, | dmap, | ||||
| old_results, | old_results, | ||||
| dmap: &'a DirstateMap, | dmap: &'a DirstateMap, | ||||
| directory: impl AsRef<HgPath>, | directory: impl AsRef<HgPath>, | ||||
| old_results: &FastHashMap<Cow<'a, HgPath>, Dispatch>, | old_results: &FastHashMap<Cow<'a, HgPath>, Dispatch>, | ||||
| ignore_fn: &IgnoreFnType, | ignore_fn: &IgnoreFnType, | ||||
| dir_ignore_fn: &IgnoreFnType, | dir_ignore_fn: &IgnoreFnType, | ||||
| options: StatusOptions, | options: StatusOptions, | ||||
| ) -> IoResult<()> { | ) -> IoResult<()> { | ||||
| let directory = directory.as_ref(); | let directory = directory.as_ref(); | ||||
| if directory.as_bytes() == b".hg" { | |||||
| return Ok(()); | |||||
| } | |||||
| let visit_entries = match matcher.visit_children_set(directory) { | let visit_entries = match matcher.visit_children_set(directory) { | ||||
| VisitChildrenSet::Empty => return Ok(()), | VisitChildrenSet::Empty => return Ok(()), | ||||
| VisitChildrenSet::This | VisitChildrenSet::Recursive => None, | VisitChildrenSet::This | VisitChildrenSet::Recursive => None, | ||||
| VisitChildrenSet::Set(set) => Some(set), | VisitChildrenSet::Set(set) => Some(set), | ||||
| }; | }; | ||||
| let buf = hg_path_to_path_buf(directory)?; | let buf = hg_path_to_path_buf(directory)?; | ||||
| let dir_path = root_dir.as_ref().join(buf); | let dir_path = root_dir.as_ref().join(buf); | ||||