rust/hg-core/src/dirstate_tree/on_disk.rs
changeset 48450 be2317167a9b
parent 48449 995aaacb12d7
child 48462 c1b633db67fc
equal deleted inserted replaced
48449:995aaacb12d7 48450:be2317167a9b
   369             None
   369             None
   370         };
   370         };
   371         let mtime = if self.flags().contains(Flags::HAS_MTIME)
   371         let mtime = if self.flags().contains(Flags::HAS_MTIME)
   372             && !self.flags().contains(Flags::DIRECTORY)
   372             && !self.flags().contains(Flags::DIRECTORY)
   373             && !self.flags().contains(Flags::EXPECTED_STATE_IS_MODIFIED)
   373             && !self.flags().contains(Flags::EXPECTED_STATE_IS_MODIFIED)
   374             // The current code is not able to do the more subtle comparison that the
       
   375             // MTIME_SECOND_AMBIGUOUS requires. So we ignore the mtime
       
   376             && !self.flags().contains(Flags::MTIME_SECOND_AMBIGUOUS)
       
   377         {
   374         {
   378             Some(self.mtime.try_into()?)
   375             let mut m: TruncatedTimestamp = self.mtime.try_into()?;
       
   376             if self.flags().contains(Flags::MTIME_SECOND_AMBIGUOUS) {
       
   377                 m.second_ambiguous = true;
       
   378             }
       
   379             Some(m)
   379         } else {
   380         } else {
   380             None
   381             None
   381         };
   382         };
   382         let fallback_exec = if self.flags().contains(Flags::HAS_FALLBACK_EXEC)
   383         let fallback_exec = if self.flags().contains(Flags::HAS_FALLBACK_EXEC)
   383         {
   384         {