| Alphare |
| hg-reviewers |
Without this extra checks, file with fallback flags change as the only change
would be overlooked.
In the future we might store proper data in the dirstate and do less lookup.
However, for now this will do to make sure that 6.0 is forward compatible with
later version.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (13 lines) | |||
| M | mercurial/helptext/internals/dirstate-v2.txt (6 lines) |
| uadd = unknown.append if listunknown else noop | uadd = unknown.append if listunknown else noop | ||||
| iadd = ignored.append if listignored else noop | iadd = ignored.append if listignored else noop | ||||
| radd = removed.append | radd = removed.append | ||||
| dadd = deleted.append | dadd = deleted.append | ||||
| cadd = clean.append if listclean else noop | cadd = clean.append if listclean else noop | ||||
| mexact = match.exact | mexact = match.exact | ||||
| dirignore = self._dirignore | dirignore = self._dirignore | ||||
| checkexec = self._checkexec | checkexec = self._checkexec | ||||
| checklink = self._checklink | |||||
| copymap = self._map.copymap | copymap = self._map.copymap | ||||
| lastnormaltime = self._lastnormaltime | lastnormaltime = self._lastnormaltime | ||||
| # We need to do full walks when either | # We need to do full walks when either | ||||
| # - we're listing all clean files, or | # - we're listing all clean files, or | ||||
| # - match.traversedir does something, because match.traversedir should | # - match.traversedir does something, because match.traversedir should | ||||
| # be called for every dir in the working dir | # be called for every dir in the working dir | ||||
| full = listclean or match.traversedir is not None | full = listclean or match.traversedir is not None | ||||
| dadd(fn) | dadd(fn) | ||||
| elif t.p2_info: | elif t.p2_info: | ||||
| madd(fn) | madd(fn) | ||||
| elif t.added: | elif t.added: | ||||
| aadd(fn) | aadd(fn) | ||||
| elif t.removed: | elif t.removed: | ||||
| radd(fn) | radd(fn) | ||||
| elif t.tracked: | elif t.tracked: | ||||
| if ( | if not checklink and t.has_fallback_symlink: | ||||
| # If the file system does not support symlink, the mode | |||||
| # might not be correctly stored in the dirstate, so do not | |||||
| # trust it. | |||||
| ladd(fn) | |||||
| elif not checkexec and t.has_fallback_exec: | |||||
| # If the file system does not support exec bits, the mode | |||||
| # might not be correctly stored in the dirstate, so do not | |||||
| # trust it. | |||||
| ladd(fn) | |||||
| elif ( | |||||
| size >= 0 | size >= 0 | ||||
| and ( | and ( | ||||
| (size != st.st_size and size != st.st_size & _rangemask) | (size != st.st_size and size != st.st_size & _rangemask) | ||||
| or ((mode ^ st.st_mode) & 0o100 and checkexec) | or ((mode ^ st.st_mode) & 0o100 and checkexec) | ||||
| ) | ) | ||||
| or fn in copymap | or fn in copymap | ||||
| ): | ): | ||||
| if stat.S_ISLNK(st.st_mode) and size != st.st_size: | if stat.S_ISLNK(st.st_mode) and size != st.st_size: | ||||
| into account) | into account) | ||||
| `MODE_EXEC_PERM` | `MODE_EXEC_PERM` | ||||
| Must be unset if `HAS_MODE_AND_SIZE` is unset. | Must be unset if `HAS_MODE_AND_SIZE` is unset. | ||||
| If `HAS_MODE_AND_SIZE` is set, | If `HAS_MODE_AND_SIZE` is set, | ||||
| this indicates whether the file’s own is expected | this indicates whether the file’s own is expected | ||||
| to have execute permission. | to have execute permission. | ||||
| Beware that on system without fs support for this information, the value | |||||
| stored in the dirstate might be wrong and should not be relied on. | |||||
| `MODE_IS_SYMLINK` | `MODE_IS_SYMLINK` | ||||
| Must be unset if `HAS_MODE_AND_SIZE` is unset. | Must be unset if `HAS_MODE_AND_SIZE` is unset. | ||||
| If `HAS_MODE_AND_SIZE` is set, | If `HAS_MODE_AND_SIZE` is set, | ||||
| this indicates whether the file is expected to be a symlink | this indicates whether the file is expected to be a symlink | ||||
| as opposed to a normal file. | as opposed to a normal file. | ||||
| Beware that on system without fs support for this information, the value | |||||
| stored in the dirstate might be wrong and should not be relied on. | |||||
| `EXPECTED_STATE_IS_MODIFIED` | `EXPECTED_STATE_IS_MODIFIED` | ||||
| Must be unset for untracked nodes. | Must be unset for untracked nodes. | ||||
| For: | For: | ||||
| - a file tracked anywhere | - a file tracked anywhere | ||||
| - that has expected metadata (`HAS_MODE_AND_SIZE` and `HAS_MTIME`) | - that has expected metadata (`HAS_MODE_AND_SIZE` and `HAS_MTIME`) | ||||
| - if that metadata matches | - if that metadata matches | ||||
| metadata found in the working directory with `stat` | metadata found in the working directory with `stat` | ||||
| This bit indicates the status of the file. | This bit indicates the status of the file. | ||||