From 70bef3e68787eb597916a3eb7115cb71cab9bdde Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Mon, 28 Sep 2020 18:22:06 +0300
Subject: [PATCH] git-index: move three-side diff viewer to separate action

GitOrigin-RevId: dfb31b02561436848d43b9cd7adf1f3ffc54ac75
---
 plugins/git4idea/resources/META-INF/plugin.xml     |  2 ++
 .../resources/messages/GitBundle.properties        |  1 +
 .../git4idea/index/actions/GitStageDiffAction.kt   | 14 ++++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/plugins/git4idea/resources/META-INF/plugin.xml b/plugins/git4idea/resources/META-INF/plugin.xml
index e61e01a1a3ad..3f0ca732f67b 100644
--- a/plugins/git4idea/resources/META-INF/plugin.xml
+++ b/plugins/git4idea/resources/META-INF/plugin.xml
@@ -262,6 +262,7 @@
     <action id="Git.Stage.AcceptTheirs" class="git4idea.index.actions.GitAcceptTheirsAction"/>
     <action id="Git.Stage.AcceptYours" class="git4idea.index.actions.GitAcceptYoursAction"/>
     <action id="Git.Stage.Merge" class="git4idea.index.actions.GitMergeConflictAction"/>
+    <action id="Git.Stage.ThreeSideDiff" class="git4idea.index.actions.GitStageThreeSideDiffAction" icon="AllIcons.Actions.Stub"/>
 
     <action id="Git.Stash.Silently" class="git4idea.index.actions.GitStashSilentlyAction" icon="AllIcons.Vcs.ShelveSilent"/>
 
@@ -275,6 +276,7 @@
       <reference id="Git.Stage.AcceptTheirs"/>
       <reference id="Git.Stage.AcceptYours"/>
       <reference id="Git.Stage.Add"/>
+      <reference id="Git.Stage.ThreeSideDiff"/>
       <reference id="Git.Stage.Reset"/>
       <reference id="Git.Stage.Revert"/>
       <reference id="$Delete"/>
diff --git a/plugins/git4idea/resources/messages/GitBundle.properties b/plugins/git4idea/resources/messages/GitBundle.properties
index e43636936f8e..9988515c503c 100644
--- a/plugins/git4idea/resources/messages/GitBundle.properties
+++ b/plugins/git4idea/resources/messages/GitBundle.properties
@@ -614,6 +614,7 @@ action.NotificationAction.GithubNotifications.text.configure=Configure...
 action.NotificationAction.GitMergeAction.text.view.commits=View Commits
 action.NotificationAction.GitRewordOperation.text.undo=Undo
 action.NotificationAction.GitUpdateSession.text.view.commits=View Commits
+action.Git.Stage.ThreeSideDiff.text=Add Interactively...
 
 settings.git.option.group=Git
 settings.commit.automatically.on.cherry.pick=Commit automatically on cherry-pick
diff --git a/plugins/git4idea/src/git4idea/index/actions/GitStageDiffAction.kt b/plugins/git4idea/src/git4idea/index/actions/GitStageDiffAction.kt
index c2494adf483d..5024c14b16cb 100644
--- a/plugins/git4idea/src/git4idea/index/actions/GitStageDiffAction.kt
+++ b/plugins/git4idea/src/git4idea/index/actions/GitStageDiffAction.kt
@@ -5,9 +5,11 @@ import com.intellij.diff.DiffDialogHints
 import com.intellij.diff.DiffManager
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.AnActionExtensionProvider
+import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.vcs.changes.ui.ChangeDiffRequestChain
 import com.intellij.util.containers.isEmpty
 import git4idea.index.createThreeSidesDiffRequestProducer
+import git4idea.index.createTwoSidesDiffRequestProducer
 import git4idea.index.ui.GIT_FILE_STATUS_NODES_STREAM
 import git4idea.index.ui.GIT_STAGE_TRACKER
 import kotlin.streams.toList
@@ -20,6 +22,18 @@ class GitStageDiffAction : AnActionExtensionProvider {
     e.presentation.isVisible = e.presentation.isEnabled || e.isFromActionToolbar
   }
 
+  override fun actionPerformed(e: AnActionEvent) {
+    val producers = e.getRequiredData(GIT_FILE_STATUS_NODES_STREAM).map { createTwoSidesDiffRequestProducer(e.project!!, it) }.toList()
+    DiffManager.getInstance().showDiff(e.project, ChangeDiffRequestChain(producers, 0), DiffDialogHints.DEFAULT)
+  }
+}
+
+class GitStageThreeSideDiffAction : DumbAwareAction() {
+  override fun update(e: AnActionEvent) {
+    e.presentation.isEnabled = e.project != null && !e.getData(GIT_FILE_STATUS_NODES_STREAM).isEmpty()
+    e.presentation.isVisible = e.presentation.isEnabled || e.isFromActionToolbar
+  }
+
   override fun actionPerformed(e: AnActionEvent) {
     val producers = e.getRequiredData(GIT_FILE_STATUS_NODES_STREAM).map { createThreeSidesDiffRequestProducer(e.project!!, it) }.toList()
     DiffManager.getInstance().showDiff(e.project, ChangeDiffRequestChain(producers, 0), DiffDialogHints.DEFAULT)