This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 124325
Collapse All | Expand All

(-)versioncontrol/mercurial/src/org/netbeans/modules/mercurial/FileStatusCache.java (-3 / +9 lines)
Lines 368-373 Link Here
368
    }
368
    }
369
    
369
    
370
    private FileInformation createFileInformation(File file) {        
370
    private FileInformation createFileInformation(File file) {        
371
        return createFileInformation(file, true);
372
    }
373
374
    private FileInformation createFileInformation(File file, Boolean callStatus) {        
371
        Mercurial.LOG.log(Level.FINE, "createFileInformation(): {0}", file); // NOI18N
375
        Mercurial.LOG.log(Level.FINE, "createFileInformation(): {0}", file); // NOI18N
372
        if (file == null)
376
        if (file == null)
373
            return FILE_INFORMATION_UNKNOWN;
377
            return FILE_INFORMATION_UNKNOWN;
Lines 381-386 Link Here
381
        if (file.isDirectory())
385
        if (file.isDirectory())
382
            return FILE_INFORMATION_UPTODATE_DIRECTORY; // Managed dir
386
            return FILE_INFORMATION_UPTODATE_DIRECTORY; // Managed dir
383
        
387
        
388
        if (callStatus == false) {
389
            return null;
390
        }
391
384
        FileInformation fi;
392
        FileInformation fi;
385
        try {
393
        try {
386
            fi = HgCommand.getSingleStatus(rootManagedFolder, file.getParent(), file.getName());
394
            fi = HgCommand.getSingleStatus(rootManagedFolder, file.getParent(), file.getName());
Lines 740-747 Link Here
740
        }
748
        }
741
        */
749
        */
742
        
750
        
743
        if (interestingFiles == null || interestingFiles.isEmpty()) return folderFiles;
744
745
        for (File file : files) {
751
        for (File file : files) {
746
            if (HgUtils.isPartOfMercurialMetadata(file)) continue;
752
            if (HgUtils.isPartOfMercurialMetadata(file)) continue;
747
            
753
            
Lines 756-762 Link Here
756
                if (fi == null) {
762
                if (fi == null) {
757
                    // We have removed -i from HgCommand.getInterestingFiles
763
                    // We have removed -i from HgCommand.getInterestingFiles
758
                    // so we might have a file we should be ignoring
764
                    // so we might have a file we should be ignoring
759
                    fi = createFileInformation(file);
765
                    fi = createFileInformation(file, false);
760
                }
766
                }
761
                if (fi != null && fi.getStatus() != FileInformation.STATUS_VERSIONED_UPTODATE)
767
                if (fi != null && fi.getStatus() != FileInformation.STATUS_VERSIONED_UPTODATE)
762
                    folderFiles.put(file, fi);
768
                    folderFiles.put(file, fi);

Return to bug 124325