Attachment #61332 for bug #134902

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 134902
Collapse All | Expand All

Lines 326-336 Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/FileStatusCache.java (-5 / +1 lines)
326	if( fi != null) return fi;	326	if( fi != null) return fi;
327		327
328	if (file.isDirectory()) {	328	if (file.isDirectory()) {
329	if (hg.isAdministrative(file) \|\| HgUtils.isIgnored(file, bCheckSharability)) {	329	return FileStatusCache.FILE_INFORMATION_UPTODATE_DIRECTORY;
330	return FileStatusCache.FILE_INFORMATION_EXCLUDED_DIRECTORY;
331	} else {
332	return FileStatusCache.FILE_INFORMATION_UPTODATE_DIRECTORY;
333	}
334	}	330	}
335		331
336	return fi;	332	return fi;




            return false;
        }
        
        // We assume that the Project should not be ignored.
        if(file.isDirectory()){
            ProjectManager projectManager = ProjectManager.getDefault();
            FileObject fileObj =  FileUtil.toFileObject(file);
            if (fileObj != null && projectManager.isProject(fileObj)) {
                return false;
            }
        }

        Set<Pattern> patterns = getIgnorePatterns(topFile);
        path = path.substring(topFile.getAbsolutePath().length() + 1);


Return to bug 134902

Lines 376-390 Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java (-9 lines)
376	return false;	376	return false;
377	}	377	}
378		378
379	// We assume that the Project should not be ignored.
380	if(file.isDirectory()){
381	ProjectManager projectManager = ProjectManager.getDefault();
382	FileObject fileObj = FileUtil.toFileObject(file);
383	if (fileObj != null && projectManager.isProject(fileObj)) {
384	return false;
385	}
386	}
387
388	Set<Pattern> patterns = getIgnorePatterns(topFile);	379	Set<Pattern> patterns = getIgnorePatterns(topFile);
389	path = path.substring(topFile.getAbsolutePath().length() + 1);	380	path = path.substring(topFile.getAbsolutePath().length() + 1);
390		381