--- 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