[Updated] [+ ] D11844: dirstate-item: ignore mtime to write v1 when `mtime-second-ambiguous` is set
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Fri Dec 3 10:00:53 UTC 2021
marmoute updated this revision to Diff 31284.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11844?vs=31273&id=31284
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11844/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11844
AFFECTED FILES
mercurial/cext/parsers.c
mercurial/pure/parsers.py
rust/hg-core/src/dirstate/entry.rs
CHANGE DETAILS
diff --git a/rust/hg-core/src/dirstate/entry.rs b/rust/hg-core/src/dirstate/entry.rs
--- a/rust/hg-core/src/dirstate/entry.rs
+++ b/rust/hg-core/src/dirstate/entry.rs
@@ -454,7 +454,11 @@
} else if !self.flags.contains(Flags::P1_TRACKED) {
MTIME_UNSET
} else if let Some(mtime) = self.mtime {
- i32::try_from(mtime.truncated_seconds()).unwrap()
+ if mtime.second_ambiguous {
+ MTIME_UNSET
+ } else {
+ i32::try_from(mtime.truncated_seconds()).unwrap()
+ }
} else {
MTIME_UNSET
}
diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py
+++ b/mercurial/pure/parsers.py
@@ -551,6 +551,8 @@
return AMBIGUOUS_TIME
elif not self._p1_tracked:
return AMBIGUOUS_TIME
+ elif self._mtime_second_ambiguous:
+ return AMBIGUOUS_TIME
else:
return self._mtime_s
diff --git a/mercurial/cext/parsers.c b/mercurial/cext/parsers.c
--- a/mercurial/cext/parsers.c
+++ b/mercurial/cext/parsers.c
@@ -269,7 +269,8 @@
} else if (!(self->flags & dirstate_flag_has_mtime) ||
!(self->flags & dirstate_flag_p1_tracked) ||
!(self->flags & dirstate_flag_wc_tracked) ||
- (self->flags & dirstate_flag_p2_info)) {
+ (self->flags & dirstate_flag_p2_info) ||
+ (self->flags & dirstate_flag_mtime_second_ambiguous)) {
return ambiguous_time;
} else {
return self->mtime_s;
To: marmoute, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211203/89cfaccb/attachment-0002.html>
More information about the Mercurial-patches
mailing list