Show More
@@ -269,7 +269,8 b' static inline int dirstate_item_c_v1_mti' | |||
|
269 | 269 | } else if (!(self->flags & dirstate_flag_has_mtime) || |
|
270 | 270 | !(self->flags & dirstate_flag_p1_tracked) || |
|
271 | 271 | !(self->flags & dirstate_flag_wc_tracked) || |
|
272 |
(self->flags & dirstate_flag_p2_info) |
|
|
272 | (self->flags & dirstate_flag_p2_info) || | |
|
273 | (self->flags & dirstate_flag_mtime_second_ambiguous)) { | |
|
273 | 274 | return ambiguous_time; |
|
274 | 275 | } else { |
|
275 | 276 | return self->mtime_s; |
@@ -551,6 +551,8 b' class DirstateItem(object):' | |||
|
551 | 551 | return AMBIGUOUS_TIME |
|
552 | 552 | elif not self._p1_tracked: |
|
553 | 553 | return AMBIGUOUS_TIME |
|
554 | elif self._mtime_second_ambiguous: | |
|
555 | return AMBIGUOUS_TIME | |
|
554 | 556 | else: |
|
555 | 557 | return self._mtime_s |
|
556 | 558 |
@@ -454,7 +454,11 b' impl DirstateEntry {' | |||
|
454 | 454 | } else if !self.flags.contains(Flags::P1_TRACKED) { |
|
455 | 455 | MTIME_UNSET |
|
456 | 456 | } else if let Some(mtime) = self.mtime { |
|
457 | i32::try_from(mtime.truncated_seconds()).unwrap() | |
|
457 | if mtime.second_ambiguous { | |
|
458 | MTIME_UNSET | |
|
459 | } else { | |
|
460 | i32::try_from(mtime.truncated_seconds()).unwrap() | |
|
461 | } | |
|
458 | 462 | } else { |
|
459 | 463 | MTIME_UNSET |
|
460 | 464 | } |
General Comments 0
You need to be logged in to leave comments.
Login now