From b12dfe55390fa858dc8f7dad9dcabf8ce6d60888 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Fri, 15 May 2020 14:10:23 +0300 Subject: [PATCH] svn: enable "Compare with Branch" action only for files under SVN GitOrigin-RevId: baf62a107102fc1982b8fbb24e3ba34e166b3cff --- .../idea/svn/diff/CompareWithBranchAction.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/CompareWithBranchAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/CompareWithBranchAction.java index 2abec37596f7..7108a691c08a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/CompareWithBranchAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/CompareWithBranchAction.java @@ -6,10 +6,11 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; -import com.intellij.openapi.vcs.FileStatus; -import com.intellij.openapi.vcs.FileStatusManager; +import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.vcsUtil.VcsUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.idea.svn.SvnVcs; import org.jetbrains.idea.svn.branchConfig.SelectBranchPopup; import static org.jetbrains.idea.svn.SvnBundle.message; @@ -35,10 +36,8 @@ public class CompareWithBranchAction extends DumbAwareAction { Project project = e.getData(CommonDataKeys.PROJECT); VirtualFile file = e.getData(CommonDataKeys.VIRTUAL_FILE); - e.getPresentation().setEnabled(project != null && file != null && isEnabled(FileStatusManager.getInstance(project).getStatus(file))); - } - - private static boolean isEnabled(FileStatus fileStatus) { - return fileStatus != FileStatus.UNKNOWN && fileStatus != FileStatus.ADDED && fileStatus != FileStatus.IGNORED; + e.getPresentation().setEnabled(project != null && file != null && + VcsUtil.isFileForVcs(file, project, SvnVcs.getInstance(project)) && + AbstractVcs.fileInVcsByFileStatus(project, file)); } }