| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/dirstate/status.rs (108 lines) | |||
| M | tests/test-status.t (1 line) |
| /// Add the files in the dirstate to the results. | /// Add the files in the dirstate to the results. | ||||
| /// | /// | ||||
| /// This takes a mutable reference to the results to account for the | /// This takes a mutable reference to the results to account for the | ||||
| /// `extend` in timings | /// `extend` in timings | ||||
| #[cfg(not(feature = "dirstate-tree"))] | #[cfg(not(feature = "dirstate-tree"))] | ||||
| #[timed] | #[timed] | ||||
| pub fn extend_from_dmap(&self, results: &mut Vec<DispatchedPath<'a>>) { | pub fn extend_from_dmap(&self, results: &mut Vec<DispatchedPath<'a>>) { | ||||
| results.par_extend(self.dmap.par_iter().map( | results.par_extend( | ||||
| move |(filename, entry)| { | self.dmap | ||||
| .par_iter() | |||||
| .filter(|(path, _)| self.matcher.matches(path)) | |||||
| .map(move |(filename, entry)| { | |||||
| let filename: &HgPath = filename; | let filename: &HgPath = filename; | ||||
| let filename_as_path = match hg_path_to_path_buf(filename) { | let filename_as_path = match hg_path_to_path_buf(filename) | ||||
| { | |||||
| Ok(f) => f, | Ok(f) => f, | ||||
| Err(_) => { | Err(_) => { | ||||
| return ( | return ( | ||||
| Cow::Borrowed(filename), | Cow::Borrowed(filename), | ||||
| INVALID_PATH_DISPATCH, | INVALID_PATH_DISPATCH, | ||||
| ) | ) | ||||
| } | } | ||||
| }; | }; | ||||
| let meta = | let meta = self | ||||
| self.root_dir.join(filename_as_path).symlink_metadata(); | .root_dir | ||||
| .join(filename_as_path) | |||||
| .symlink_metadata(); | |||||
| match meta { | match meta { | ||||
| Ok(m) | Ok(m) | ||||
| if !(m.file_type().is_file() | if !(m.file_type().is_file() | ||||
| || m.file_type().is_symlink()) => | || m.file_type().is_symlink()) => | ||||
| { | { | ||||
| ( | ( | ||||
| Cow::Borrowed(filename), | Cow::Borrowed(filename), | ||||
| dispatch_missing(entry.state), | dispatch_missing(entry.state), | ||||
| ) | ) | ||||
| } | } | ||||
| Ok(m) => ( | Ok(m) => ( | ||||
| Cow::Borrowed(filename), | Cow::Borrowed(filename), | ||||
| dispatch_found( | dispatch_found( | ||||
| filename, | filename, | ||||
| *entry, | *entry, | ||||
| HgMetadata::from_metadata(m), | HgMetadata::from_metadata(m), | ||||
| &self.dmap.copy_map, | &self.dmap.copy_map, | ||||
| self.options, | self.options, | ||||
| ), | ), | ||||
| ), | ), | ||||
| Err(e) | Err(e) | ||||
| if e.kind() == ErrorKind::NotFound | if e.kind() == ErrorKind::NotFound | ||||
| || e.raw_os_error() == Some(20) => | || e.raw_os_error() == Some(20) => | ||||
| { | { | ||||
| // Rust does not yet have an `ErrorKind` for | // Rust does not yet have an `ErrorKind` for | ||||
| // `NotADirectory` (errno 20) | // `NotADirectory` (errno 20) | ||||
| // It happens if the dirstate contains `foo/bar` | // It happens if the dirstate contains `foo/bar` | ||||
| // and foo is not a | // and foo is not a | ||||
| // directory | // directory | ||||
| ( | ( | ||||
| Cow::Borrowed(filename), | Cow::Borrowed(filename), | ||||
| dispatch_missing(entry.state), | dispatch_missing(entry.state), | ||||
| ) | ) | ||||
| } | } | ||||
| Err(e) => (Cow::Borrowed(filename), dispatch_os_error(&e)), | Err(e) => { | ||||
| (Cow::Borrowed(filename), dispatch_os_error(&e)) | |||||
| } | } | ||||
| }, | } | ||||
| )); | }), | ||||
| ); | |||||
| } | } | ||||
| /// Checks all files that are in the dirstate but were not found during the | /// Checks all files that are in the dirstate but were not found during the | ||||
| /// working directory traversal. This means that the rest must | /// working directory traversal. This means that the rest must | ||||
| /// be either ignored, under a symlink or under a new nested repo. | /// be either ignored, under a symlink or under a new nested repo. | ||||
| /// | /// | ||||
| /// This takes a mutable reference to the results to account for the | /// This takes a mutable reference to the results to account for the | ||||
| /// `extend` in timings | /// `extend` in timings | ||||