From 3122cc31d778718d314554a5fe840cf60e5f2ee2 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sun, 11 Mar 2012 17:02:08 +0400 Subject: [PATCH] Avoid duplicates in vcs roots The project is often a module, i.e. its root is added as project base dir. => check for duplicates when adding a content root. --- .../intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java b/platform/lang-impl/src/com/intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java index 3601d54c8485..429479debfc5 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java +++ b/platform/lang-impl/src/com/intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java @@ -86,7 +86,7 @@ public class ModuleDefaultVcsRootPolicy extends DefaultVcsRootPolicy { // explicitly (we know it anyway) VcsDirectoryMapping mapping = mappingList.getMappingFor(file, module); final String mappingVcs = mapping != null ? mapping.getVcs() : null; - if (vcsName.equals(mappingVcs)) { + if (vcsName.equals(mappingVcs) && !result.contains(file)) { result.add(file); } }