Mercurial > public > mercurial-scm > hg
diff mercurial/pure/parsers.py @ 48264:bb240915f69f
dirstate-v2: adjust the meaning of directory flags
Tracking directory "explicitly" give use the opportunity to distinct between
entry that are untracked because they are part of the directory structure and
entry that are ignored/unknown files on the files system.
The help is adjusted to the new semantic and the code now comply to it for both
read and write.
Differential Revision: https://phab.mercurial-scm.org/D11694
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 19 Oct 2021 18:18:05 +0200 |
| parents | 68bb472aee9c |
| children | 749946b6a641 |
line wrap: on
line diff
--- a/mercurial/pure/parsers.py Wed Oct 13 15:58:14 2021 +0200 +++ b/mercurial/pure/parsers.py Tue Oct 19 18:18:05 2021 +0200 @@ -49,8 +49,8 @@ DIRSTATE_V2_P1_TRACKED = 1 << 1 DIRSTATE_V2_P2_INFO = 1 << 2 DIRSTATE_V2_HAS_MODE_AND_SIZE = 1 << 3 -DIRSTATE_V2_HAS_FILE_MTIME = 1 << 4 -_DIRSTATE_V2_HAS_DIRCTORY_MTIME = 1 << 5 # Unused when Rust is not available +DIRSTATE_V2_HAS_MTIME = 1 << 4 +DIRSTATE_V2_DIRECTORY = 1 << 5 DIRSTATE_V2_MODE_EXEC_PERM = 1 << 6 DIRSTATE_V2_MODE_IS_SYMLINK = 1 << 7 DIRSTATE_V2_EXPECTED_STATE_IS_MODIFIED = 1 << 8 @@ -140,7 +140,7 @@ def from_v2_data(cls, flags, size, mtime_s, mtime_ns): """Build a new DirstateItem object from V2 data""" has_mode_size = bool(flags & DIRSTATE_V2_HAS_MODE_AND_SIZE) - has_meaningful_mtime = bool(flags & DIRSTATE_V2_HAS_FILE_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 @@ -462,7 +462,7 @@ if stat.S_ISLNK(self.mode): flags |= DIRSTATE_V2_MODE_IS_SYMLINK if self._mtime_s is not None: - flags |= DIRSTATE_V2_HAS_FILE_MTIME + flags |= DIRSTATE_V2_HAS_MTIME if self._fallback_exec is not None: flags |= DIRSTATE_V2_HAS_FALLBACK_EXEC