Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/dirstate.py @ 1268:c631f26346ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix performance of dirstate.changes with ignored directories.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 17 Sep 2005 00:23:19 -0700
parents d0a960b437a8
children fc3b41570082
line wrap: on
line diff
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -333,7 +333,8 @@ class dirstate:
                     l.append(fn)
 
             if not s or stat.S_ISDIR(s.st_mode):
-                return self.ignore(fn) and False or match(fn)
+                if self.ignore(fn): return False
+                return match(fn)
 
             if not stat.S_ISREG(s.st_mode):
                 return False