Mercurial > hg-stable
changeset 4193:dd0d9bd91e0a
dirstate.statwalk: explicitly test for ignored directories
This removes a hack where we appended '/' to a dirname so that:
- it would not appear on the "dc" dict
- it would always be matched by the match function
This was a contorted way of checking if the directory was matched by
some hgignore pattern, and it would still fail with some uses of
--include/--exclude patterns.
Things would still work fine if we removed the check altogether and
just appended things to "work" directly, but then we would end up
walking ignored directories too, which could be quite a bit of work.
This allows further simplification of the match function returned by
util._matcher, and fixes walking the working directory with a
--include pattern that matches only the end of a name.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sat, 10 Mar 2007 23:00:54 -0300 |
| parents | 9814d600011e |
| children | 8e947b0e53cc |
| files | mercurial/dirstate.py mercurial/util.py tests/test-walk.out |
| diffstat | 3 files changed, 14 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dirstate.py Sat Mar 10 23:00:53 2007 -0300 +++ b/mercurial/dirstate.py Sat Mar 10 23:00:54 2007 -0300 @@ -387,7 +387,10 @@ return False return match(file_) - if ignored: imatch = match + ignore = self.ignore + if ignored: + imatch = match + ignore = util.never # self.root may end with a path separator when self.root == '/' common_prefix_len = len(self.root) @@ -420,8 +423,7 @@ # don't trip over symlinks st = os.lstat(p) if stat.S_ISDIR(st.st_mode): - ds = util.pconvert(os.path.join(nd, f +'/')) - if imatch(ds): + if not ignore(p): work.append(p) if imatch(np) and np in dc: yield 'm', np, st
--- a/mercurial/util.py Sat Mar 10 23:00:53 2007 -0300 +++ b/mercurial/util.py Sat Mar 10 23:00:54 2007 -0300 @@ -509,8 +509,7 @@ excmatch = matchfn(exckinds, '(?:/|$)') return (roots, - lambda fn: (incmatch(fn) and not excmatch(fn) and - (fn.endswith('/') or patmatch(fn))), + lambda fn: (incmatch(fn) and not excmatch(fn) and patmatch(fn)), (inc or exc or anypats) and True) def system(cmd, environ={}, cwd=None, onerr=None, errprefix=None):
--- a/tests/test-walk.out Sat Mar 10 23:00:53 2007 -0300 +++ b/tests/test-walk.out Sat Mar 10 23:00:54 2007 -0300 @@ -73,28 +73,28 @@ f mammals/skunk skunk hg debugwalk -I *k -m mammals/skunk skunk +f mammals/skunk skunk hg debugwalk -I glob:*k -m mammals/skunk skunk +f mammals/skunk skunk hg debugwalk -I relglob:*k +f beans/black ../beans/black f fenugreek ../fenugreek -m beans/black ../beans/black -m mammals/skunk skunk +f mammals/skunk skunk hg debugwalk -I relglob:*k . f mammals/skunk skunk hg debugwalk -I re:.*k$ +f beans/black ../beans/black f fenugreek ../fenugreek -m beans/black ../beans/black -m mammals/skunk skunk +f mammals/skunk skunk hg debugwalk -I relre:.*k$ +f beans/black ../beans/black f fenugreek ../fenugreek -m beans/black ../beans/black -m mammals/skunk skunk +f mammals/skunk skunk hg debugwalk -I path:beans f beans/black ../beans/black