Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/dirstate.py @ 1271:9ab14ca22e37
Fix ignore regression.
An empty or non-existent hgignore file must return False (don't
ignore) for everything.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sat, 17 Sep 2005 00:37:14 -0700 |
parents | fc3b41570082 |
children | 25e5b1086624 |
comparison
equal
deleted
inserted
replaced
1270:fc3b41570082 | 1271:9ab14ca22e37 |
---|---|
82 '''default match function used by dirstate and localrepository. | 82 '''default match function used by dirstate and localrepository. |
83 this honours the .hgignore file, and nothing more.''' | 83 this honours the .hgignore file, and nothing more.''' |
84 if self.blockignore: | 84 if self.blockignore: |
85 return False | 85 return False |
86 if not self.ignorefunc: | 86 if not self.ignorefunc: |
87 files, self.ignorefunc, anypats = util.matcher(self.root, | 87 ignore = self.hgignore() |
88 inc=self.hgignore()) | 88 if ignore: |
89 files, self.ignorefunc, anypats = util.matcher(self.root, | |
90 inc=ignore) | |
91 else: | |
92 self.ignorefunc = util.never | |
89 return self.ignorefunc(fn) | 93 return self.ignorefunc(fn) |
90 | 94 |
91 def __del__(self): | 95 def __del__(self): |
92 if self.dirty: | 96 if self.dirty: |
93 self.write() | 97 self.write() |