# 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/util/HgCommand.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java Base (1.63) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java Locally Modified (Based On 1.63) @@ -1495,18 +1495,15 @@ * @throws org.netbeans.modules.mercurial.HgException */ public static FileInformation getSingleStatus(File repository, String cwd, String filename) throws HgException{ + if(HgUtils.isIgnored(new File(cwd))){ + return new FileInformation(FileInformation.STATUS_NOTVERSIONED_EXCLUDED,null, false); + } FileInformation info = null; List list = doSingleStatusCmd(repository, cwd, filename); if(list == null || list.isEmpty()) return new FileInformation(FileInformation.STATUS_UNKNOWN,null, false); - if(HgUtils.isIgnored(new File(cwd))){ - Mercurial.LOG.log(Level.FINE, "getSingleStatus(): Excluded File - StatusLine: {0} Status: EXCLUDED RepoPath:{2} cwd:{3}", // NOI18N - new Object[] {list.get(0), filename, repository.getAbsolutePath(), cwd} ); - return new FileInformation(FileInformation.STATUS_NOTVERSIONED_EXCLUDED,null, false); - } - info = getFileInformationFromStatusLine(list.get(0)); // Handles Copy status // Could save copy source in FileStatus but for now we don't need it.