# This patch file was generated by NetBeans IDE # This patch can be applied using context Tools: Apply Diff Patch action on respective folder. # It uses platform neutral UTF-8 encoding. # Above lines and this line are ignored by the patching process. Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/FileStatusCache.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/FileStatusCache.java Base (1.21) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/FileStatusCache.java Locally Modified (Based On 1.21) @@ -368,6 +368,10 @@ } private FileInformation createFileInformation(File file) { + return createFileInformation(file, true); + } + + private FileInformation createFileInformation(File file, Boolean callStatus) { Mercurial.LOG.log(Level.FINE, "createFileInformation(): {0}", file); // NOI18N if (file == null) return FILE_INFORMATION_UNKNOWN; @@ -381,6 +385,10 @@ if (file.isDirectory()) return FILE_INFORMATION_UPTODATE_DIRECTORY; // Managed dir + if (callStatus == false) { + return null; + } + FileInformation fi; try { fi = HgCommand.getSingleStatus(rootManagedFolder, file.getParent(), file.getName()); @@ -740,8 +748,6 @@ } */ - if (interestingFiles == null || interestingFiles.isEmpty()) return folderFiles; - for (File file : files) { if (HgUtils.isPartOfMercurialMetadata(file)) continue; @@ -756,7 +762,7 @@ if (fi == null) { // We have removed -i from HgCommand.getInterestingFiles // so we might have a file we should be ignoring - fi = createFileInformation(file); + fi = createFileInformation(file, false); } if (fi != null && fi.getStatus() != FileInformation.STATUS_VERSIONED_UPTODATE) folderFiles.put(file, fi);