Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/dirstate.py @ 4621:d97fd22a0ea9
dirstate: pull ignore smarts out of ui
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 18 Jun 2007 13:24:34 -0500 |
| parents | 70352337934e |
| children | ff7253a0d1da |
comparison
equal
deleted
inserted
replaced
| 4620:5fd7cc897542 | 4621:d97fd22a0ea9 |
|---|---|
| 50 self._dirs = {} | 50 self._dirs = {} |
| 51 for f in self._map: | 51 for f in self._map: |
| 52 self._incpath(f) | 52 self._incpath(f) |
| 53 return self._dirs | 53 return self._dirs |
| 54 elif name == '_ignore': | 54 elif name == '_ignore': |
| 55 files = [self.wjoin('.hgignore')] + self._ui.hgignorefiles() | 55 files = [self.wjoin('.hgignore')] |
| 56 for name, path in self._ui.configitems("ui"): | |
| 57 if name == 'ignore' or name.startswith('ignore.'): | |
| 58 files.append(os.path.expanduser(path)) | |
| 56 self._ignore = ignore.ignore(self._root, files, self._ui.warn) | 59 self._ignore = ignore.ignore(self._root, files, self._ui.warn) |
| 57 return self._ignore | 60 return self._ignore |
| 58 elif name == '_slash': | 61 elif name == '_slash': |
| 59 self._slash = self._ui.configbool('ui', 'slash') and os.sep != '/' | 62 self._slash = self._ui.configbool('ui', 'slash') and os.sep != '/' |
| 60 return self._slash | 63 return self._slash |