equal
deleted
inserted
replaced
374 && !self.flags().contains(Flags::EXPECTED_STATE_IS_MODIFIED) |
374 && !self.flags().contains(Flags::EXPECTED_STATE_IS_MODIFIED) |
375 // The current code is not able to do the more subtle comparison that the |
375 // The current code is not able to do the more subtle comparison that the |
376 // MTIME_SECOND_AMBIGUOUS requires. So we ignore the mtime |
376 // MTIME_SECOND_AMBIGUOUS requires. So we ignore the mtime |
377 && !self.flags().contains(Flags::MTIME_SECOND_AMBIGUOUS) |
377 && !self.flags().contains(Flags::MTIME_SECOND_AMBIGUOUS) |
378 { |
378 { |
379 // TODO: replace this by `self.mtime.try_into()?` to use |
379 Some(self.mtime.try_into()?) |
380 // sub-second precision from the file. |
|
381 // We don’t do this yet because other parts of the code |
|
382 // always set it to zero. |
|
383 let mtime = TruncatedTimestamp::from_already_truncated( |
|
384 self.mtime.truncated_seconds.get(), |
|
385 0, |
|
386 )?; |
|
387 Some(mtime) |
|
388 } else { |
380 } else { |
389 None |
381 None |
390 }; |
382 }; |
391 Ok(DirstateEntry::from_v2_data( |
383 Ok(DirstateEntry::from_v2_data( |
392 wdir_tracked, |
384 wdir_tracked, |