This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11846

dirstate-item: make sure we load `mtime-second-ambiguous` from disk
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbe2317167a9b: dirstate-item: make sure we load `mtime-second-ambiguous` from disk
Summary

Now that we support the associated logic, we can safely load it from it. It is
no longer necessary to ignore the stored mtime when the flag is encountered.

Diff Detail

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

Revision Contents
Changeset List

Diff 31275

mercurial/cext/parsers.c

&t->mtime_ns)) { &t->mtime_ns)) {
return NULL; return NULL;
} }
if (t->flags & dirstate_flag_expected_state_is_modified) { if (t->flags & dirstate_flag_expected_state_is_modified) {
t->flags &= ~(dirstate_flag_expected_state_is_modified | t->flags &= ~(dirstate_flag_expected_state_is_modified |
dirstate_flag_has_meaningful_data | dirstate_flag_has_meaningful_data |
dirstate_flag_has_mtime); dirstate_flag_has_mtime);
} }
if (t->flags & dirstate_flag_mtime_second_ambiguous) {
/* The current code is not able to do the more subtle comparison
* that the MTIME_SECOND_AMBIGUOUS requires. So we ignore the
* mtime */
t->flags &= ~(dirstate_flag_mtime_second_ambiguous |
dirstate_flag_has_meaningful_data |
dirstate_flag_has_mtime);
}
t->mode = 0; t->mode = 0;
if (t->flags & dirstate_flag_has_meaningful_data) { if (t->flags & dirstate_flag_has_meaningful_data) {
if (t->flags & dirstate_flag_mode_exec_perm) { if (t->flags & dirstate_flag_mode_exec_perm) {
t->mode = 0755; t->mode = 0755;
} else { } else {
t->mode = 0644; t->mode = 0644;
} }
if (t->flags & dirstate_flag_mode_is_symlink) { if (t->flags & dirstate_flag_mode_is_symlink) {

mercurial/pure/parsers.py

self._mtime_second_ambiguous, self._mtime_second_ambiguous,
) = parentfiledata[2] ) = parentfiledata[2]
@classmethod @classmethod
def from_v2_data(cls, flags, size, mtime_s, mtime_ns): def from_v2_data(cls, flags, size, mtime_s, mtime_ns):
"""Build a new DirstateItem object from V2 data""" """Build a new DirstateItem object from V2 data"""
has_mode_size = bool(flags & DIRSTATE_V2_HAS_MODE_AND_SIZE) has_mode_size = bool(flags & DIRSTATE_V2_HAS_MODE_AND_SIZE)
has_meaningful_mtime = bool(flags & DIRSTATE_V2_HAS_MTIME) has_meaningful_mtime = bool(flags & DIRSTATE_V2_HAS_MTIME)
if flags & DIRSTATE_V2_MTIME_SECOND_AMBIGUOUS:
# The current code is not able to do the more subtle comparison that the
# MTIME_SECOND_AMBIGUOUS requires. So we ignore the mtime
has_meaningful_mtime = False
mode = None mode = None
if flags & +DIRSTATE_V2_EXPECTED_STATE_IS_MODIFIED: if flags & +DIRSTATE_V2_EXPECTED_STATE_IS_MODIFIED:
# we do not have support for this flag in the code yet, # we do not have support for this flag in the code yet,
# force a lookup for this file. # force a lookup for this file.
has_mode_size = False has_mode_size = False
has_meaningful_mtime = False has_meaningful_mtime = False
if flags & DIRSTATE_V2_MODE_EXEC_PERM: if flags & DIRSTATE_V2_MODE_EXEC_PERM:
mode = 0o755 mode = 0o755
else: else:
mode = 0o644 mode = 0o644
if flags & DIRSTATE_V2_MODE_IS_SYMLINK: if flags & DIRSTATE_V2_MODE_IS_SYMLINK:
mode |= stat.S_IFLNK mode |= stat.S_IFLNK
else: else:
mode |= stat.S_IFREG mode |= stat.S_IFREG
second_ambiguous = flags & DIRSTATE_V2_MTIME_SECOND_AMBIGUOUS
return cls( return cls(
wc_tracked=bool(flags & DIRSTATE_V2_WDIR_TRACKED), wc_tracked=bool(flags & DIRSTATE_V2_WDIR_TRACKED),
p1_tracked=bool(flags & DIRSTATE_V2_P1_TRACKED), p1_tracked=bool(flags & DIRSTATE_V2_P1_TRACKED),
p2_info=bool(flags & DIRSTATE_V2_P2_INFO), p2_info=bool(flags & DIRSTATE_V2_P2_INFO),
has_meaningful_data=has_mode_size, has_meaningful_data=has_mode_size,
has_meaningful_mtime=has_meaningful_mtime, has_meaningful_mtime=has_meaningful_mtime,
parentfiledata=(mode, size, (mtime_s, mtime_ns, False)), parentfiledata=(mode, size, (mtime_s, mtime_ns, second_ambiguous)),
fallback_exec=fallback_exec, fallback_exec=fallback_exec,
fallback_symlink=fallback_symlink, fallback_symlink=fallback_symlink,
) )
@classmethod @classmethod
def from_v1_data(cls, state, mode, size, mtime): def from_v1_data(cls, state, mode, size, mtime):
"""Build a new DirstateItem object from V1 data """Build a new DirstateItem object from V1 data

rust/hg-core/src/dirstate_tree/on_disk.rs

{ {
Some((self.synthesize_unix_mode(), self.size.into())) Some((self.synthesize_unix_mode(), self.size.into()))
} else { } else {
None None
}; };
let mtime = if self.flags().contains(Flags::HAS_MTIME) let mtime = if self.flags().contains(Flags::HAS_MTIME)
&& !self.flags().contains(Flags::DIRECTORY) && !self.flags().contains(Flags::DIRECTORY)
&& !self.flags().contains(Flags::EXPECTED_STATE_IS_MODIFIED) && !self.flags().contains(Flags::EXPECTED_STATE_IS_MODIFIED)
// The current code is not able to do the more subtle comparison that the
// MTIME_SECOND_AMBIGUOUS requires. So we ignore the mtime
&& !self.flags().contains(Flags::MTIME_SECOND_AMBIGUOUS)
{ {
Some(self.mtime.try_into()?) let mut m: TruncatedTimestamp = self.mtime.try_into()?;
if self.flags().contains(Flags::MTIME_SECOND_AMBIGUOUS) {
m.second_ambiguous = true;
}
Some(m)
} else { } else {
None None
}; };
let fallback_exec = if self.flags().contains(Flags::HAS_FALLBACK_EXEC) let fallback_exec = if self.flags().contains(Flags::HAS_FALLBACK_EXEC)
{ {
Some(self.flags().contains(Flags::FALLBACK_EXEC)) Some(self.flags().contains(Flags::FALLBACK_EXEC))
} else { } else {
None None