Mercurial > hg

changeset 1269:5e9816decbb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with myself.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 17 Sep 2005 00:23:58 -0700
parents c631f26346ca (diff) b0633406c07a (current diff)
children fc3b41570082
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py	Fri Sep 16 14:50:06 2005 -0700
+++ b/mercurial/dirstate.py	Sat Sep 17 00:23:58 2005 -0700
@@ -333,7 +333,8 @@
                     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