Attachment #53983 for bug #123616

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




            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;
            

Return to bug 123616

Lines 214-223 Link Here

(-)versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialAnnotator.java (+12 lines)
214	if (info == null) {	214	if (info == null) {
215	File parentFile = file.getParentFile();	215	File parentFile = file.getParentFile();
216	Mercurial.LOG.log(Level.FINE, "null cached status for: {0} {1} {2}", new Object[] {file, folderToScan, parentFile});	216	Mercurial.LOG.log(Level.FINE, "null cached status for: {0} {1} {2}", new Object[] {file, folderToScan, parentFile});
		217	if (file.isDirectory()) {
		218	int status;
		219	if (Mercurial.getInstance().isAdministrative(file) \|\| HgUtils.isIgnored(file)) {
		220	status = FileInformation.STATUS_NOTVERSIONED_EXCLUDED;
		221	} else if (parentFile == null) {
		222	status = FileInformation.STATUS_NOTVERSIONED_NOTMANAGED; //default for filesystem roots
		223	} else {
		224	status = FileInformation.STATUS_VERSIONED_UPTODATE;
		225	}
		226	info = new FileInformation(status, true);
		227	} else {
217	folderToScan = parentFile;	228	folderToScan = parentFile;
218	reScheduleScan(1000);	229	reScheduleScan(1000);
219	continue;	230	continue;
220	}	231	}
		232	}
221	int status = info.getStatus();	233	int status = info.getStatus();
222	if ((status & includeStatus) == 0) continue;	234	if ((status & includeStatus) == 0) continue;
223		235