MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-92137 Ignore files and directories makes Perforce integration report missing files

Browse Source
This commit is contained in:
peter
2012-09-28 16:11:43 +02:00
parent dc9763b18a
commit 8a025b7a81
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
+1
View File
@@ -73,6 +73,7 @@ public abstract class AbstractVcsTestCase {
ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(myProject);
vcsManager.setDirectoryMappings(mappings);
vcsManager.updateActiveVcss();
ChangeListManagerImpl.getInstanceImpl(myProject).waitUntilRefreshed();
}
protected static void refreshVfs() {
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
+3 -1
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.DumbAwareRunnable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.ui.MessageType;
import com.intellij.openapi.util.EmptyRunnable;
import com.intellij.openapi.util.Pair;
@@ -252,7 +253,8 @@ public class NewMappings {
if (mapping.getDirectory().length() == 0) {
return myDefaultVcsRootPolicy.matchesDefaultMapping(file, matchContext);
}
return FileUtil.startsWith(systemIndependPath, mapping.systemIndependentPath());
return FileUtil.startsWith(systemIndependPath, mapping.systemIndependentPath()) &&
!ProjectRootManager.getInstance(myProject).getFileIndex().isIgnored(file);
}
public List<VirtualFile> getMappingsAsFilesUnderVcs(final AbstractVcs vcs) {