##// END OF EJS Templates
dirstate: make sure that status does not overlook the fallback flags...
marmoute -
r49112:50026041 default
parent child Browse files
Show More
@@ -1359,6 +1359,7 b' class dirstate(object):'
1359 mexact = match.exact
1359 mexact = match.exact
1360 dirignore = self._dirignore
1360 dirignore = self._dirignore
1361 checkexec = self._checkexec
1361 checkexec = self._checkexec
1362 checklink = self._checklink
1362 copymap = self._map.copymap
1363 copymap = self._map.copymap
1363 lastnormaltime = self._lastnormaltime
1364 lastnormaltime = self._lastnormaltime
1364
1365
@@ -1391,7 +1392,17 b' class dirstate(object):'
1391 elif t.removed:
1392 elif t.removed:
1392 radd(fn)
1393 radd(fn)
1393 elif t.tracked:
1394 elif t.tracked:
1394 if (
1395 if not checklink and t.has_fallback_symlink:
1396 # If the file system does not support symlink, the mode
1397 # might not be correctly stored in the dirstate, so do not
1398 # trust it.
1399 ladd(fn)
1400 elif not checkexec and t.has_fallback_exec:
1401 # If the file system does not support exec bits, the mode
1402 # might not be correctly stored in the dirstate, so do not
1403 # trust it.
1404 ladd(fn)
1405 elif (
1395 size >= 0
1406 size >= 0
1396 and (
1407 and (
1397 (size != st.st_size and size != st.st_size & _rangemask)
1408 (size != st.st_size and size != st.st_size & _rangemask)
@@ -523,12 +523,18 b' by enabling it to skip `readdir` in more'
523 this indicates whether the file’s own is expected
523 this indicates whether the file’s own is expected
524 to have execute permission.
524 to have execute permission.
525
525
526 Beware that on system without fs support for this information, the value
527 stored in the dirstate might be wrong and should not be relied on.
528
526 `MODE_IS_SYMLINK`
529 `MODE_IS_SYMLINK`
527 Must be unset if `HAS_MODE_AND_SIZE` is unset.
530 Must be unset if `HAS_MODE_AND_SIZE` is unset.
528 If `HAS_MODE_AND_SIZE` is set,
531 If `HAS_MODE_AND_SIZE` is set,
529 this indicates whether the file is expected to be a symlink
532 this indicates whether the file is expected to be a symlink
530 as opposed to a normal file.
533 as opposed to a normal file.
531
534
535 Beware that on system without fs support for this information, the value
536 stored in the dirstate might be wrong and should not be relied on.
537
532 `EXPECTED_STATE_IS_MODIFIED`
538 `EXPECTED_STATE_IS_MODIFIED`
533 Must be unset for untracked nodes.
539 Must be unset for untracked nodes.
534 For:
540 For:
General Comments 0
You need to be logged in to leave comments. Login now