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

(-)versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialAnnotator.java (-2 / +3 lines)
Lines 216-222 Link Here
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
                folderToScan = parentFile;
217
                folderToScan = parentFile;
218
                reScheduleScan(1000);
218
                reScheduleScan(1000);
219
                continue;
219
                info = new FileInformation(FileInformation.STATUS_VERSIONED_UPTODATE, false);
220
            }
220
            }
221
            int status = info.getStatus();
221
            int status = info.getStatus();
222
            if ((status & includeStatus) == 0) continue;
222
            if ((status & includeStatus) == 0) continue;
Lines 447-452 Link Here
447
        String binaryString = "";       // NOI18N
447
        String binaryString = "";       // NOI18N
448
448
449
        if (needRevisionForFormat) {
449
        if (needRevisionForFormat) {
450
            if ((status & FileInformation.STATUS_NOTVERSIONED_EXCLUDED) == 0) {
450
            try {
451
            try {
451
                File repository = Mercurial.getInstance().getTopmostManagedParent(file);
452
                File repository = Mercurial.getInstance().getTopmostManagedParent(file);
452
                String revStr = HgCommand.getLastRevision(repository, file);
453
                String revStr = HgCommand.getLastRevision(repository, file);
Lines 458-465 Link Here
458
                DialogDisplayer.getDefault().notifyLater(e);
459
                DialogDisplayer.getDefault().notifyLater(e);
459
            }
460
            }
460
        }
461
        }
462
        }
461
463
462
463
        //String stickyString = SvnUtils.getCopy(file);
464
        //String stickyString = SvnUtils.getCopy(file);
464
        String stickyString = null;
465
        String stickyString = null;
465
        if (stickyString == null) {
466
        if (stickyString == null) {

Return to bug 123734