Mercurial > hg
changeset 48257:f45d35950db6
dirstate: rename a `very_likely_equal` method to `likely_equal`
No need to oversell it.
Differential Revision: https://phab.mercurial-scm.org/D11691
| author | Simon Sapin <simon.sapin@octobus.net> |
|---|---|
| date | Mon, 18 Oct 2021 19:02:40 +0200 |
| parents | 56d037d07395 |
| children | c591944f42c1 |
| files | rust/hg-core/src/dirstate/entry.rs rust/hg-core/src/dirstate_tree/status.rs |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/rust/hg-core/src/dirstate/entry.rs Tue Oct 19 19:03:39 2021 +0200 +++ b/rust/hg-core/src/dirstate/entry.rs Mon Oct 18 19:02:40 2021 +0200 @@ -114,16 +114,16 @@ /// If someone is manipulating the modification times of some files to /// intentionally make `hg status` return incorrect results, not truncating /// 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.nanoseconds == other.nanoseconds } - pub fn very_likely_equal_to_mtime_of( + pub fn likely_equal_to_mtime_of( self, metadata: &fs::Metadata, ) -> io::Result<bool> { - Ok(self.very_likely_equal(Self::for_mtime_of(metadata)?)) + Ok(self.likely_equal(Self::for_mtime_of(metadata)?)) } }
--- a/rust/hg-core/src/dirstate_tree/status.rs Tue Oct 19 19:03:39 2021 +0200 +++ b/rust/hg-core/src/dirstate_tree/status.rs Mon Oct 18 19:02:40 2021 +0200 @@ -200,7 +200,7 @@ // directory eligible for `read_dir` caching. if let Some(meta) = directory_metadata { if cached_mtime - .very_likely_equal_to_mtime_of(meta) + .likely_equal_to_mtime_of(meta) .unwrap_or(false) { // The mtime of that directory has not changed @@ -471,7 +471,7 @@ let is_up_to_date = if let Some(cached) = dirstate_node.cached_directory_mtime()? { - cached.very_likely_equal(truncated) + cached.likely_equal(truncated) } else { false };