Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/dirstate.py @ 4621:d97fd22a0ea9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -52,7 +52,10 @@ class dirstate(object):
                 self._incpath(f)
             return self._dirs
         elif name == '_ignore':
-            files = [self.wjoin('.hgignore')] + self._ui.hgignorefiles()
+            files = [self.wjoin('.hgignore')]
+            for name, path in self._ui.configitems("ui"):
+                if name == 'ignore' or name.startswith('ignore.'):
+                    files.append(os.path.expanduser(path))
             self._ignore = ignore.ignore(self._root, files, self._ui.warn)
             return self._ignore
         elif name == '_slash':