| hg-reviewers |
Converting from Timestamp back to SystemTime was only used for equality
comparison, but this can also be done on Timestamp values.
| 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_tree/on_disk.rs (14 lines) | |||
| M | rust/hg-core/src/dirstate_tree/status.rs (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Abandoned | SimonSapin | ||
| Closed | marmoute | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin |
| use crate::DirstateError; | use crate::DirstateError; | ||||
| use crate::DirstateParents; | use crate::DirstateParents; | ||||
| use bitflags::bitflags; | use bitflags::bitflags; | ||||
| use bytes_cast::unaligned::{I32Be, I64Be, U16Be, U32Be}; | use bytes_cast::unaligned::{I32Be, I64Be, U16Be, U32Be}; | ||||
| use bytes_cast::BytesCast; | use bytes_cast::BytesCast; | ||||
| use format_bytes::format_bytes; | use format_bytes::format_bytes; | ||||
| use std::borrow::Cow; | use std::borrow::Cow; | ||||
| use std::convert::{TryFrom, TryInto}; | use std::convert::{TryFrom, TryInto}; | ||||
| use std::time::{Duration, SystemTime, UNIX_EPOCH}; | use std::time::{SystemTime, UNIX_EPOCH}; | ||||
| /// Added at the start of `.hg/dirstate` when the "v2" format is used. | /// Added at the start of `.hg/dirstate` when the "v2" format is used. | ||||
| /// This a redundant sanity check more than an actual "magic number" since | /// This a redundant sanity check more than an actual "magic number" since | ||||
| /// `.hg/requires` already governs which format should be used. | /// `.hg/requires` already governs which format should be used. | ||||
| pub const V2_FORMAT_MARKER: &[u8; 12] = b"dirstate-v2\n"; | pub const V2_FORMAT_MARKER: &[u8; 12] = b"dirstate-v2\n"; | ||||
| /// Keep space for 256-bit hashes | /// Keep space for 256-bit hashes | ||||
| const STORED_NODE_ID_BYTES: usize = 32; | const STORED_NODE_ID_BYTES: usize = 32; | ||||
| }; | }; | ||||
| Timestamp { | Timestamp { | ||||
| seconds: secs.into(), | seconds: secs.into(), | ||||
| nanoseconds: nanos.into(), | nanoseconds: nanos.into(), | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| impl From<&'_ Timestamp> for SystemTime { | |||||
| fn from(timestamp: &'_ Timestamp) -> Self { | |||||
| let secs = timestamp.seconds.get(); | |||||
| let nanos = timestamp.nanoseconds.get(); | |||||
| if secs >= 0 { | |||||
| UNIX_EPOCH + Duration::new(secs as u64, nanos) | |||||
| } else { | |||||
| UNIX_EPOCH - Duration::new((-secs) as u64, nanos) | |||||
| } | |||||
| } | |||||
| } | |||||
| fn read_hg_path( | fn read_hg_path( | ||||
| on_disk: &[u8], | on_disk: &[u8], | ||||
| slice: PathSlice, | slice: PathSlice, | ||||
| ) -> Result<&HgPath, DirstateV2ParseError> { | ) -> Result<&HgPath, DirstateV2ParseError> { | ||||
| read_slice(on_disk, slice.start, slice.len.get()).map(HgPath::new) | read_slice(on_disk, slice.start, slice.len.get()).map(HgPath::new) | ||||
| } | } | ||||
| fn read_nodes( | fn read_nodes( | ||||
| && 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 let Ok(current_mtime) = meta.modified() { | if let Ok(current_mtime) = meta.modified() { | ||||
| if current_mtime == cached_mtime.into() { | let current_mtime = Timestamp::from(current_mtime); | ||||
| if current_mtime == *cached_mtime { | |||||
| // 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; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||