diff options
Diffstat (limited to 'platform/vcs-api/src/com/intellij')
4 files changed, 14 insertions, 8 deletions
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java b/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java index 04ce78be1601..c6b0daa0852d 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java @@ -272,6 +272,7 @@ public abstract class ProjectLevelVcsManager { public abstract VcsHistoryCache getVcsHistoryCache(); public abstract ContentRevisionCache getContentRevisionCache(); public abstract boolean isFileInContent(final VirtualFile vf); + public abstract boolean isIgnored(VirtualFile vf); public abstract boolean dvcsUsedInProject(); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java index 006276b42739..9834ef5b0d9e 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java @@ -134,6 +134,7 @@ public abstract class ChangeListManager implements ChangeListModification { public abstract List<CommitExecutor> getRegisteredExecutors(); public abstract void addFilesToIgnore(final IgnoredFileBean... ignoredFiles); + public abstract void addDirectoryToIgnoreImplicitly(@NotNull String path); public abstract void setFilesToIgnore(final IgnoredFileBean... ignoredFiles); public abstract IgnoredFileBean[] getFilesToIgnore(); public abstract boolean isIgnoredFile(@NotNull VirtualFile file); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoredFileBean.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoredFileBean.java index c09ce973634f..1091f908b600 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoredFileBean.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoredFileBean.java @@ -26,7 +26,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.VfsUtil; +import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.newvfs.impl.NullVirtualFile; import com.intellij.util.PatternUtil; @@ -49,7 +49,8 @@ public class IgnoredFileBean { myType = type; if (IgnoreSettingsType.FILE.equals(type)) { myFilenameIfFile = new File(path).getName(); - } else { + } + else { myFilenameIfFile = null; } myProject = project; @@ -115,9 +116,10 @@ public class IgnoredFileBean { if (myType == IgnoreSettingsType.MASK) { myMatcher.reset(file.getName()); return myMatcher.matches(); - } else { + } + else { // quick check for 'file' == exact match pattern - if (IgnoreSettingsType.FILE.equals(myType) && ! myFilenameIfFile.equals(file.getName())) return false; + if (IgnoreSettingsType.FILE.equals(myType) && !myFilenameIfFile.equals(file.getName())) return false; VirtualFile selector = resolve(); if (Comparing.equal(selector, NullVirtualFile.INSTANCE)) return false; @@ -130,7 +132,7 @@ public class IgnoredFileBean { // special case for ignoring the project base dir (IDEADEV-16056) return !file.isDirectory() && Comparing.equal(file.getParent(), selector); } - return VfsUtil.isAncestor(selector, file, false); + return VfsUtilCore.isAncestor(selector, file, false); } } } @@ -146,7 +148,9 @@ public class IgnoredFileBean { @Nullable private VirtualFile doResolve() { - if (myProject == null || myProject.isDisposed()) { return null; } + if (myProject == null || myProject.isDisposed()) { + return null; + } VirtualFile baseDir = myProject.getBaseDir(); String path = FileUtil.toSystemIndependentName(myPath); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeModifier.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeModifier.java index b97305c1a0a3..c8a8eda7a436 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeModifier.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeModifier.java @@ -17,7 +17,7 @@ package com.intellij.openapi.vcs.changes; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.Iterator; @@ -28,7 +28,7 @@ import java.util.Iterator; public interface VcsDirtyScopeModifier { Iterator<FilePath> getDirtyFilesIterator(); Collection<VirtualFile> getAffectedVcsRoots(); - @Nullable + @NotNull Iterator<FilePath> getDirtyDirectoriesIterator(VirtualFile root); void recheckDirtyKeys(); } |