# HG changeset patch
# User padraigob@netbeans.org
# Date 1210683766 -3600
# Node ID 65e8d01f2cfdcc15479316e5d7f470db24703eee
# Parent  74d8b357ec7e7dc46e7c716ff33a3c9a6299274c
134902: Remove redundant code from HgUtils.isIgnored; Do not call HgUtils.isIgnored in FileStatusCache.getCachedStatus

diff -r 74d8b357ec7e -r 65e8d01f2cfd mercurial/src/org/netbeans/modules/mercurial/FileStatusCache.java
--- a/mercurial/src/org/netbeans/modules/mercurial/FileStatusCache.java	Thu May 01 15:31:45 2008 +0100
+++ b/mercurial/src/org/netbeans/modules/mercurial/FileStatusCache.java	Tue May 13 14:02:46 2008 +0100
@@ -326,11 +326,7 @@
         if( fi != null) return fi;
 
         if (file.isDirectory()) {
-            if (hg.isAdministrative(file) || HgUtils.isIgnored(file, bCheckSharability)) {
-                return FileStatusCache.FILE_INFORMATION_EXCLUDED_DIRECTORY;
-            } else {
-                return FileStatusCache.FILE_INFORMATION_UPTODATE_DIRECTORY;
-            }
+            return FileStatusCache.FILE_INFORMATION_UPTODATE_DIRECTORY;
         }
 
         return fi;
diff -r 74d8b357ec7e -r 65e8d01f2cfd mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java
--- a/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java	Thu May 01 15:31:45 2008 +0100
+++ b/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java	Tue May 13 14:02:46 2008 +0100
@@ -376,15 +376,6 @@
             return false;
         }
         
-        // We assume that the Project should not be ignored.
-        if(file.isDirectory()){
-            ProjectManager projectManager = ProjectManager.getDefault();
-            FileObject fileObj =  FileUtil.toFileObject(file);
-            if (fileObj != null && projectManager.isProject(fileObj)) {
-                return false;
-            }
-        }
-
         Set<Pattern> patterns = getIgnorePatterns(topFile);
         path = path.substring(topFile.getAbsolutePath().length() + 1);