| spectral | |
| Alphare |
| hg-reviewers |
No need to oversell it.
| 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/entry.rs (6 lines) | |||
| M | rust/hg-core/src/dirstate_tree/status.rs (4 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | marmoute | ||
| Closed | SimonSapin |
| /// or given to `new_truncate` were very likely equal. A false positive is | /// or given to `new_truncate` were very likely equal. A false positive is | ||||
| /// possible if they were exactly a multiple of 2**31 seconds apart (around | /// possible if they were exactly a multiple of 2**31 seconds apart (around | ||||
| /// 68 years). This is deemed very unlikely to happen by chance, especially | /// 68 years). This is deemed very unlikely to happen by chance, especially | ||||
| /// on filesystems that support sub-second precision. | /// on filesystems that support sub-second precision. | ||||
| /// | /// | ||||
| /// If someone is manipulating the modification times of some files to | /// If someone is manipulating the modification times of some files to | ||||
| /// intentionally make `hg status` return incorrect results, not truncating | /// intentionally make `hg status` return incorrect results, not truncating | ||||
| /// wouldn’t help much since they can set exactly the expected timestamp. | /// wouldn’t help much since they can set exactly the expected timestamp. | ||||
| pub fn very_likely_equal(self, other: Self) -> bool { | pub fn likely_equal(self, other: Self) -> bool { | ||||
| self.truncated_seconds == other.truncated_seconds | self.truncated_seconds == other.truncated_seconds | ||||
| && self.nanoseconds == other.nanoseconds | && self.nanoseconds == other.nanoseconds | ||||
| } | } | ||||
| pub fn very_likely_equal_to_mtime_of( | pub fn likely_equal_to_mtime_of( | ||||
| self, | self, | ||||
| metadata: &fs::Metadata, | metadata: &fs::Metadata, | ||||
| ) -> io::Result<bool> { | ) -> io::Result<bool> { | ||||
| Ok(self.very_likely_equal(Self::for_mtime_of(metadata)?)) | Ok(self.likely_equal(Self::for_mtime_of(metadata)?)) | ||||
| } | } | ||||
| } | } | ||||
| impl From<SystemTime> for TruncatedTimestamp { | impl From<SystemTime> for TruncatedTimestamp { | ||||
| fn from(system_time: SystemTime) -> Self { | fn from(system_time: SystemTime) -> Self { | ||||
| // On Unix, `SystemTime` is a wrapper for the `timespec` C struct: | // On Unix, `SystemTime` is a wrapper for the `timespec` C struct: | ||||
| // https://www.gnu.org/software/libc/manual/html_node/Time-Types.html#index-struct-timespec | // https://www.gnu.org/software/libc/manual/html_node/Time-Types.html#index-struct-timespec | ||||
| // We want to effectively access its fields, but the Rust standard | // We want to effectively access its fields, but the Rust standard | ||||
| && self.ignore_patterns_have_changed == Some(false) | && self.ignore_patterns_have_changed == Some(false) | ||||
| { | { | ||||
| if let Some(cached_mtime) = cached_directory_mtime { | if let Some(cached_mtime) = cached_directory_mtime { | ||||
| // The dirstate contains a cached mtime for this directory, set | // The dirstate contains a cached mtime for this directory, set | ||||
| // by a previous run of the `status` algorithm which found this | // by a previous run of the `status` algorithm which found this | ||||
| // directory eligible for `read_dir` caching. | // directory eligible for `read_dir` caching. | ||||
| if let Some(meta) = directory_metadata { | if let Some(meta) = directory_metadata { | ||||
| if cached_mtime | if cached_mtime | ||||
| .very_likely_equal_to_mtime_of(meta) | .likely_equal_to_mtime_of(meta) | ||||
| .unwrap_or(false) | .unwrap_or(false) | ||||
| { | { | ||||
| // The mtime of that directory has not changed | // The mtime of that directory has not changed | ||||
| // since then, which means that the results of | // since then, which means that the results of | ||||
| // `read_dir` should also be unchanged. | // `read_dir` should also be unchanged. | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| // the wrong tick. | // the wrong tick. | ||||
| // | // | ||||
| // We deem this scenario (unlike the previous one) to be | // We deem this scenario (unlike the previous one) to be | ||||
| // unlikely enough in practice. | // unlikely enough in practice. | ||||
| let truncated = TruncatedTimestamp::from(directory_mtime); | let truncated = TruncatedTimestamp::from(directory_mtime); | ||||
| let is_up_to_date = if let Some(cached) = | let is_up_to_date = if let Some(cached) = | ||||
| dirstate_node.cached_directory_mtime()? | dirstate_node.cached_directory_mtime()? | ||||
| { | { | ||||
| cached.very_likely_equal(truncated) | cached.likely_equal(truncated) | ||||
| } else { | } else { | ||||
| false | false | ||||
| }; | }; | ||||
| if !is_up_to_date { | if !is_up_to_date { | ||||
| let hg_path = dirstate_node | let hg_path = dirstate_node | ||||
| .full_path_borrowed(self.dmap.on_disk)? | .full_path_borrowed(self.dmap.on_disk)? | ||||
| .detach_from_tree(); | .detach_from_tree(); | ||||
| self.new_cachable_directories | self.new_cachable_directories | ||||