Comments
Patch
@@ -192,7 +192,7 @@
}
def need_delay(&self, now: i32) -> PyResult<bool> {
- Ok(self.entry(py).get().mtime_is_ambiguous(now))
+ Ok(self.entry(py).get().need_delay(now))
}
@classmethod
@@ -947,7 +947,7 @@
node.full_path(map.on_disk)?,
node.copy_source(map.on_disk)?,
);
- if entry.mtime_is_ambiguous(now) {
+ if entry.need_delay(now) {
ambiguous_mtimes.push(
node.full_path_borrowed(map.on_disk)?
.detach_from_tree(),
@@ -991,7 +991,7 @@
for node in map.iter_nodes() {
let node = node?;
if let Some(entry) = node.entry()? {
- if entry.mtime_is_ambiguous(now) {
+ if entry.need_delay(now) {
paths.push(
node.full_path_borrowed(map.on_disk)?
.detach_from_tree(),
@@ -576,12 +576,12 @@
(self.state().into(), self.mode(), self.size(), self.mtime())
}
- pub fn mtime_is_ambiguous(&self, now: i32) -> bool {
+ pub fn need_delay(&self, now: i32) -> bool {
self.state() == EntryState::Normal && self.mtime() == now
}
pub fn clear_ambiguous_mtime(&mut self, now: i32) -> bool {
- let ambiguous = self.mtime_is_ambiguous(now);
+ 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-