Attachment #58679 for bug #130135

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




    public static boolean isIgnored(File file, boolean checkSharability){
        if (file == null) return false;
        String path = file.getPath();
        String name = file.getName();
        File topFile = Mercurial.getInstance().getTopmostManagedParent(file);
        
        // We assume that the toplevel directory should not be ignored.

                return true;
            }
        }
        // If a parent of the file matches a pattern ignore the file
        File parentFile = file.getParentFile();
        while (!parentFile.equals(topFile)) {
            if (isIgnored(parentFile, false)) return true;
            parentFile = parentFile.getParentFile();
        }

        if (FILENAME_HGIGNORE.equals(file.getName())) return false;
        if (checkSharability) {
            int sharability = SharabilityQuery.getSharability(file);
            if (sharability == SharabilityQuery.NOT_SHARABLE) return true;

Return to bug 130135

Lines 306-312 public class HgUtils { Link Here

(-)a/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java (-2 / +7 lines)
306	public static boolean isIgnored(File file, boolean checkSharability){	306	public static boolean isIgnored(File file, boolean checkSharability){
307	if (file == null) return false;	307	if (file == null) return false;
308	String path = file.getPath();	308	String path = file.getPath();
309	String name = file.getName();
310	File topFile = Mercurial.getInstance().getTopmostManagedParent(file);	309	File topFile = Mercurial.getInstance().getTopmostManagedParent(file);
311		310
312	// We assume that the toplevel directory should not be ignored.	311	// We assume that the toplevel directory should not be ignored.
Lines 332-339 public class HgUtils { Link Here
332	return true;	331	return true;
333	}	332	}
334	}	333	}
		334	// If a parent of the file matches a pattern ignore the file
		335	File parentFile = file.getParentFile();
		336	while (!parentFile.equals(topFile)) {
		337	if (isIgnored(parentFile, false)) return true;
		338	parentFile = parentFile.getParentFile();
		339	}
335		340
336	if (FILENAME_HGIGNORE.equals(name)) return false;	341	if (FILENAME_HGIGNORE.equals(file.getName())) return false;
337	if (checkSharability) {	342	if (checkSharability) {
338	int sharability = SharabilityQuery.getSharability(file);	343	int sharability = SharabilityQuery.getSharability(file);
339	if (sharability == SharabilityQuery.NOT_SHARABLE) return true;	344	if (sharability == SharabilityQuery.NOT_SHARABLE) return true;