This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11696

rust: remove now-unused DirstateEntry::clear_ambiguous_mtime method
ClosedPublic

Authored by SimonSapin on Oct 19 2021, 3:09 PM.

Details

Reviewers
spectral
Alphare
Group Reviewers
hg-reviewers
Commits
rHG84f6b0c41b90: rust: remove now-unused DirstateEntry::clear_ambiguous_mtime method

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

SimonSapin created this revision.Oct 19 2021, 3:09 PM
spectral accepted this revision.Oct 19 2021, 5:02 PM
marmoute added a parent revision: D11699: dirstate: align Rust function name to `need_delay`.Oct 19 2021, 6:02 PM
marmoute retitled this revision from rust: Remove now-unused DirstateEntry::clear_ambiguous_mtime method to rust: remove now-unused DirstateEntry::clear_ambiguous_mtime method.
marmoute added a child revision: D11684: dirstate: store mtimes with nanosecond precision in memory.
marmoute updated this revision to Diff 30916.
Alphare accepted this revision.Oct 20 2021, 4:33 AM
This revision is now accepted and ready to land.Oct 20 2021, 4:33 AM
marmoute updated this revision to Diff 30930.Oct 20 2021, 5:12 AM

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/dirstate/entry.rs (17 lines)

Diff 30941

rust/hg-core/src/dirstate/entry.rs

pub fn debug_tuple(&self) -> (u8, i32, i32, i32) { pub fn debug_tuple(&self) -> (u8, i32, i32, i32) {
(self.state().into(), self.mode(), self.size(), self.mtime()) (self.state().into(), self.mode(), self.size(), self.mtime())
} }
/// True if the stored mtime would be ambiguous with the current time /// True if the stored mtime would be ambiguous with the current time
pub fn need_delay(&self, now: i32) -> bool { pub fn need_delay(&self, now: i32) -> bool {
self.state() == EntryState::Normal && self.mtime() == now self.state() == EntryState::Normal && self.mtime() == now
} }
pub fn clear_ambiguous_mtime(&mut self, now: i32) -> bool {
let ambiguous = self.need_delay(now);
if ambiguous {
// The file was last modified "simultaneously" with the current
// write to dirstate (i.e. within the same second for file-
// systems with a granularity of 1 sec). This commonly happens
// for at least a couple of files on 'update'.
// The user could change the file without changing its size
// within the same second. Invalidate the file's mtime in
// dirstate, forcing future 'status' calls to compare the
// contents of the file if the size is the same. This prevents
// mistakenly treating such files as clean.
self.set_possibly_dirty()
}
ambiguous
}
} }
impl EntryState { impl EntryState {
pub fn is_tracked(self) -> bool { pub fn is_tracked(self) -> bool {
use EntryState::*; use EntryState::*;
match self { match self {
Normal | Added | Merged => true, Normal | Added | Merged => true,
Removed => false, Removed => false,