comparison mercurial/simplemerge.py @ 25362:20ad936ac5d2

treemanifest: visit directory 'foo' when given e.g. '-X foo/ba?' For globs like 'foo/ba?', match._roots() will return 'foo'. Since visitdir(), excludes directories in the excluded roots, it would skip the entire foo directory. This is incorrect, since 'foo/ba?' doesn't mean that everything in foo/ should be exluded. Note that visitdir() is called only from the treemanifest class, so this only affects tree manifests. Fix by adding roots to the set of excluded roots only if there are no excluded patterns. Since 'glob' is the default pattern type for globs, we also need to update some -X patterns in the tests to be of 'path' type to take advantage of the visitdir tricks. For consistency, also update the -I patterns. It seems a little unfortunate that 'foo' in 'hg files -X foo' is considered a pattern because of the implied 'glob' type, but improving that is left for another day.
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 27 May 2015 10:44:04 -0700
parents 83df50a8d61c
children 241a1324a180
comparison
equal deleted inserted replaced
25361:1635579f9baf 25362:20ad936ac5d2