Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/dirstate.py @ 4195:b5d1eaade333
Merge a bunch of matcher and locate fixes.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 10 Mar 2007 23:21:33 -0300 |
parents | ba51a8225a60 dd0d9bd91e0a |
children | dbc3846c09a1 |
line wrap: on
line diff
--- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -386,7 +386,10 @@ class dirstate(object): 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) @@ -421,8 +424,7 @@ class dirstate(object): # 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 directories: yield 'd', np, st