# 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/MercurialAnnotator.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialAnnotator.java Base (1.17) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialAnnotator.java Locally Modified (Based On 1.17) @@ -214,10 +214,22 @@ if (info == null) { File parentFile = file.getParentFile(); Mercurial.LOG.log(Level.FINE, "null cached status for: {0} {1} {2}", new Object[] {file, folderToScan, parentFile}); + if (file.isDirectory()) { + int status; + if (Mercurial.getInstance().isAdministrative(file) || HgUtils.isIgnored(file)) { + status = FileInformation.STATUS_NOTVERSIONED_EXCLUDED; + } else if (parentFile == null) { + status = FileInformation.STATUS_NOTVERSIONED_NOTMANAGED; //default for filesystem roots + } else { + status = FileInformation.STATUS_VERSIONED_UPTODATE; + } + info = new FileInformation(status, true); + } else { folderToScan = parentFile; reScheduleScan(1000); continue; } + } int status = info.getStatus(); if ((status & includeStatus) == 0) continue;