From d759d9067e83243b01e992c1f2c5b93213fb4878 Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Thu, 26 Nov 2015 13:53:26 +0300
Subject: [PATCH] svn: Removed unnecessary "Merge from..." action
 ("MergeFromAction" class) - "Show Working Copies" action could be used
 instead (to navigate to "Subversion Working Copies Information" panel)

---
 plugins/svn4idea/src/META-INF/plugin.xml      |  5 +-
 .../idea/svn/dialogs/MergeFromAction.java     | 59 -------------------
 2 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/MergeFromAction.java

diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml
index ed321ffd4efb..7dce4c30b993 100644
--- a/plugins/svn4idea/src/META-INF/plugin.xml
+++ b/plugins/svn4idea/src/META-INF/plugin.xml
@@ -105,11 +105,8 @@
       <add-to-group group-id="SubversionGroup" relative-to-action="ChangesView.AddUnversioned" anchor="after"/>
     </group>
 
-    <action class="org.jetbrains.idea.svn.dialogs.MergeFromAction" id="Subversion.MergeFrom">
-      <add-to-group relative-to-action="Vcs.IntegrateProject" anchor="after" group-id="VcsGlobalGroup"/>
-    </action>
     <action class="org.jetbrains.idea.svn.actions.CleanupProjectAction" id="Subversion.CleanupProject">
-      <add-to-group group-id="VcsGlobalGroup" anchor="after" relative-to-action="Subversion.MergeFrom"/>
+      <add-to-group group-id="VcsGlobalGroup" anchor="after" relative-to-action="Vcs.IntegrateProject"/>
     </action>
 
     <action id="Svn.Show.Working.Copies" class="org.jetbrains.idea.svn.actions.ShowSvnMapAction" text="Show Working Copies"
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/MergeFromAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/MergeFromAction.java
deleted file mode 100644
index 318073818453..000000000000
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/MergeFromAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2000-2010 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.idea.svn.dialogs;
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.project.DumbAwareAction;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vcs.ProjectLevelVcsManager;
-import com.intellij.openapi.vfs.VirtualFile;
-import org.jetbrains.idea.svn.SvnVcs;
-import org.jetbrains.idea.svn.WorkingCopiesContent;
-
-public class MergeFromAction extends DumbAwareAction {
-  public MergeFromAction() {
-    super("Merge from...", "One-click merge for feature branches", null);
-  }
-
-  @Override
-  public void actionPerformed(AnActionEvent e) {
-    if (! isEnabled(e)) return;
-    final DataContext dc = e.getDataContext();
-    final Project project = CommonDataKeys.PROJECT.getData(dc);
-    if (project == null) return;
-
-    WorkingCopiesContent.show(project);
-  }
-
-  @Override
-  public void update(AnActionEvent e) {
-    final DataContext dc = e.getDataContext();
-    final Project project = CommonDataKeys.PROJECT.getData(dc);
-    if (project == null || project.isDefault()) return;
-    e.getPresentation().setVisible(isEnabled(e));
-  }
-
-  private boolean isEnabled(AnActionEvent e) {
-    final DataContext dc = e.getDataContext();
-    final Project project = CommonDataKeys.PROJECT.getData(dc);
-    if (project == null || project.isDefault()) return false;
-    final VirtualFile[] files = ProjectLevelVcsManager.getInstance(project).getRootsUnderVcs(SvnVcs.getInstance(project));
-    return files != null && files.length > 0;
-  }
-}