comparison tests/test-sparse.t @ 36200:deb851914fd7

dirstate: drop explicit files that shouldn't match (BC) (issue4679) Before, wctx.walk() could include files excluded by -X pattern, which disagrees with wctx.matches() and ctx.walk()/matches() behavior. This patch fixes the problem by testing stat results against the matcher if the matcher may contain false paths. I have no idea if the fix should be made before the workaround for case- insensitive filesystems, but that shouldn't matter since match.anypats() means 'not match.isexact()'. This patch also makes narrow and sparse extensions to not exclude explicit paths on walk() because they appear to depend on the buggy behavior. More detailed analysis about this issue by Martin von Zweigbergk: "I think it's just an unintended consequence of how the dirstate walk works, but I'm not sure. The exception for explicit files also bothered me when I was working on the matcher code a year or so ago. I actually added the exception to the matcher code because I thought it was always working like that (not just for dirstate) in a83a7d27911e (match: handle excludes using new differencematcher, 2017-05-16). It was only recently that Yuya realized that it used to be inconsistent and that I probably made it consistently bad because I didn't realize it was inconsistent to start with, see 821d8a5ab4ff (match: do not weirdly include explicit files excluded by -X option, 2018-01-16)." .. bc:: Working-directory commands now respect ``-X PATTERN`` no matter if PATTERN matches explicitly-specified FILEs. For example, ``hg add foo -X foo`` no longer add the file ``foo``.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 26 Jan 2018 19:48:39 +0900
parents 0aafeded7957
children 9db856446298
comparison
equal deleted inserted replaced
36199:2d6e03a28c31 36200:deb851914fd7
126 126
127 $ hg add hide3 127 $ hg add hide3
128 abort: cannot add 'hide3' - it is outside the sparse checkout 128 abort: cannot add 'hide3' - it is outside the sparse checkout
129 (include file with `hg debugsparse --include <pattern>` or use `hg add -s <file>` to include file directory while adding) 129 (include file with `hg debugsparse --include <pattern>` or use `hg add -s <file>` to include file directory while adding)
130 [255] 130 [255]
131
132 But adding a truly excluded file shouldn't count
133
134 $ hg add hide3 -X hide3
131 135
132 Verify deleting sparseness while a file has changes fails 136 Verify deleting sparseness while a file has changes fails
133 137
134 $ hg debugsparse --delete 'show*' 138 $ hg debugsparse --delete 'show*'
135 pending changes to 'hide' 139 pending changes to 'hide'