This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11844

dirstate-item: ignore mtime to write v1 when `mtime-second-ambiguous` is set
ClosedPublic

Authored by marmoute on Dec 2 2021, 2:03 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG0b3f3a3ca50a: dirstate-item: ignore mtime to write v1 when `mtime-second-ambiguous` is set
Summary

We cannot preserve that information in the v1 format so that mtime is ambiguous.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

Diff 31284

mercurial/cext/parsers.c

static inline int dirstate_item_c_v1_mtime(dirstateItemObject *self) static inline int dirstate_item_c_v1_mtime(dirstateItemObject *self)
{ {
if (dirstate_item_c_removed(self)) { if (dirstate_item_c_removed(self)) {
return 0; return 0;
} else if (!(self->flags & dirstate_flag_has_mtime) || } else if (!(self->flags & dirstate_flag_has_mtime) ||
!(self->flags & dirstate_flag_p1_tracked) || !(self->flags & dirstate_flag_p1_tracked) ||
!(self->flags & dirstate_flag_wc_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; return ambiguous_time;
} else { } else {
return self->mtime_s; return self->mtime_s;
} }
} }
static PyObject *dirstate_item_v2_data(dirstateItemObject *self) static PyObject *dirstate_item_v2_data(dirstateItemObject *self)
{ {

mercurial/pure/parsers.py

elif self.removed: elif self.removed:
return 0 return 0
elif self._mtime_s is None: elif self._mtime_s is None:
return AMBIGUOUS_TIME return AMBIGUOUS_TIME
elif self._p2_info: elif self._p2_info:
return AMBIGUOUS_TIME return AMBIGUOUS_TIME
elif not self._p1_tracked: elif not self._p1_tracked:
return AMBIGUOUS_TIME return AMBIGUOUS_TIME
elif self._mtime_second_ambiguous:
return AMBIGUOUS_TIME
else: else:
return self._mtime_s return self._mtime_s
def gettype(q): def gettype(q):
return int(q & 0xFFFF) return int(q & 0xFFFF)

rust/hg-core/src/dirstate/entry.rs

} }
if self.removed() { if self.removed() {
0 0
} else if self.flags.contains(Flags::P2_INFO) { } else if self.flags.contains(Flags::P2_INFO) {
MTIME_UNSET MTIME_UNSET
} else if !self.flags.contains(Flags::P1_TRACKED) { } else if !self.flags.contains(Flags::P1_TRACKED) {
MTIME_UNSET MTIME_UNSET
} else if let Some(mtime) = self.mtime { } else if let Some(mtime) = self.mtime {
if mtime.second_ambiguous {
MTIME_UNSET
} else {
i32::try_from(mtime.truncated_seconds()).unwrap() i32::try_from(mtime.truncated_seconds()).unwrap()
}
} else { } else {
MTIME_UNSET MTIME_UNSET
} }
} }
// TODO: return `Option<EntryState>`? None when `!self.any_tracked` // TODO: return `Option<EntryState>`? None when `!self.any_tracked`
pub fn state(&self) -> EntryState { pub fn state(&self) -> EntryState {
self.v1_state() self.v1_state()