# 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.19) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/FileStatusCache.java Locally Modified (Based On 1.19) @@ -452,7 +452,7 @@ FileInformation current = files.get(file); if (FileStatusCache.equivalent(fi, current)) { if (FileStatusCache.equivalent(FILE_INFORMATION_NEWLOCALLY, fi)) { - if (SharabilityQuery.getSharability(file) == SharabilityQuery.NOT_SHARABLE) { + if (HgUtils.isIgnored(file)) { Mercurial.LOG.log(Level.FINE, "refreshFileStatus() file: {0} was LocallyNew but is NotSharable", file.getAbsolutePath()); // NOI18N fi = FILE_INFORMATION_EXCLUDED; } else { @@ -467,7 +467,7 @@ Mercurial.LOG.log(Level.FINE, "refreshFileStatus() file: {0} was LocallyNew but is Excluded", file.getAbsolutePath()); // NOI18N return; } else if (current == null) { - if (SharabilityQuery.getSharability(file) == SharabilityQuery.NOT_SHARABLE) { + if (HgUtils.isIgnored(file)) { Mercurial.LOG.log(Level.FINE, "refreshFileStatus() file: {0} was LocallyNew but current is null and is not NotSharable", file.getAbsolutePath()); // NOI18N fi = FILE_INFORMATION_EXCLUDED; } Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java Base (1.62) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java Locally Modified (Based On 1.62) @@ -1501,7 +1501,7 @@ if(list == null || list.isEmpty()) return new FileInformation(FileInformation.STATUS_UNKNOWN,null, false); - if(SharabilityQuery.getSharability(new File(cwd)) == SharabilityQuery.NOT_SHARABLE){ + 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);