# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1129621527 25200
# Node ID 8c3e2a2542579c2d44c8044fe671bb6ecbefb861
# Parent  c2eb204917f88fcb2bdcd3ae4be085387685b47f
check if a file is ignored before complaining if it is an unsupported type



diff -r c2eb204917f8 -r 8c3e2a254257 mercurial/dirstate.py
--- a/mercurial/dirstate.py	Tue Oct 18 00:43:33 2005 -0700
+++ b/mercurial/dirstate.py	Tue Oct 18 00:45:27 2005 -0700
@@ -308,9 +308,8 @@
                         ds = os.path.join(nd, f +'/')
                         if statmatch(ds, st):
                             work.append(p)
-                    elif supported_type(np, st):
-                        if statmatch(np, st):
-                            yield util.pconvert(np)
+                    elif statmatch(np, st) and supported_type(np, st):
+                        yield util.pconvert(np)
 
 
         known = {'.hg': 1}
@@ -340,7 +339,7 @@
                     continue
                 found = False
                 self.blockignore = True
-                if supported_type(ff, st) and statmatch(ff, st):
+                if statmatch(ff, st) and supported_type(ff, st):
                     found = True
                 self.blockignore = False
                 if found: