From 5c6072acfdb50e13af1f7a915b4fce0e96468ce3 Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Tue, 19 May 2020 15:46:03 +0300
Subject: [PATCH] [git-index] merge stage-plugin.xml to plugin.xml

GitOrigin-RevId: 71f7512c0cce8f30d5e0ce37f25eb45f62a67bd9
---
 .../git4idea/resources/META-INF/plugin.xml    | 42 ++++++++++++++++--
 .../resources/META-INF/stage-plugin.xml       | 44 -------------------
 2 files changed, 39 insertions(+), 47 deletions(-)
 delete mode 100644 plugins/git4idea/resources/META-INF/stage-plugin.xml

diff --git a/plugins/git4idea/resources/META-INF/plugin.xml b/plugins/git4idea/resources/META-INF/plugin.xml
index 41b68bb47164..bac0b5b664d3 100644
--- a/plugins/git4idea/resources/META-INF/plugin.xml
+++ b/plugins/git4idea/resources/META-INF/plugin.xml
@@ -19,9 +19,6 @@
 
   <depends>com.intellij.modules.vcs</depends>
   <depends optional="true" config-file="git-terminal.xml">org.jetbrains.plugins.terminal</depends>
-  <xi:include href="/META-INF/stage-plugin.xml" xpointer="xpointer(/idea-plugin/*)">
-    <xi:fallback/>
-  </xi:include>
 
   <actions>
     <action id="Git.Init" class="git4idea.actions.GitInit">
@@ -184,6 +181,26 @@
       <add-to-group group-id="CopyFileReference"/>
       <add-to-group group-id="CopyGroup" relative-to-action="CopySourceRootPath" anchor="after"/>
     </action>
+
+    <action id="Git.Stage.Refresh" class="git4idea.index.actions.GitRefreshStageAction" icon="AllIcons.Actions.Refresh"
+            use-shortcut-of="Refresh"/>
+    <action id="Git.Stage.Add" class="git4idea.index.actions.GitAddAction" use-shortcut-of="ChangesView.AddUnversioned"/>
+    <action id="Git.Stage.Reset" class="git4idea.index.actions.GitResetAction" use-shortcut-of="ChangesView.Revert"/>
+    <action id="Git.Stage.Revert" class="git4idea.index.actions.GitRevertAction" use-shortcut-of="ChangesView.Revert"/>
+
+    <group id="Git.Stage.Toolbar">
+      <reference id="Diff.ShowDiff"/>
+      <reference id="Git.Stage.Refresh"/>
+    </group>
+    <group id="Git.Stage.Tree.Menu">
+      <reference id="Git.Stage.Add"/>
+      <reference id="Git.Stage.Reset"/>
+      <reference id="Git.Stage.Revert"/>
+      <reference id="Diff.ShowDiff"/>
+      <separator/>
+      <reference id="Vcs.ShowTabbedFileHistory"/>
+      <reference id="LocalHistory"/>
+    </group>
   </actions>
 
   <extensions defaultExtensionNs="com.intellij">
@@ -313,6 +330,25 @@
 
     <editorNotificationProvider implementation="git4idea.ui.GitEditorPromo" order="first"/>
 
+    <changesViewContent id="git.stage" tabName="Staging Area" className="git4idea.index.GitStageContentProvider"
+                        predicateClassName="git4idea.index.GitStageContentVisibilityPredicate"
+                        displayNameSupplierClassName="git4idea.index.GitStageDisplayNameSupplier"/>
+
+    <projectService serviceImplementation="git4idea.index.GitStageManager"/>
+    <projectService serviceImplementation="git4idea.index.GitStageTracker"/>
+
+    <backgroundPostStartupActivity implementation="git4idea.index.GitStageStartupActivity"/>
+
+    <projectService serviceImplementation="git4idea.index.vfs.GitIndexVirtualFileCache"/>
+    <projectService serviceImplementation="git4idea.index.vfs.GitIndexFileSystemRefresher"/>
+    <virtualFileSystem implementationClass="git4idea.index.vfs.GitIndexFileSystem" key="gitIndexFs" physical="true"/>
+
+    <vcs.baseContentProvider implementation="git4idea.index.vfs.GitIndexVirtualFileBaseContentProvider"/>
+    <editorNotificationProvider implementation="git4idea.index.vfs.GitIndexVirtualFileEditorNotificationProvider"/>
+    <editorTabTitleProvider implementation="git4idea.index.vfs.GitIndexVirtualFileTabTitleProvider"/>
+
+    <diff.actions.ShowDiffAction.ExtensionProvider implementation="git4idea.index.actions.GitStageDiffAction"/>
+
   </extensions>
 
   <extensionPoints>
diff --git a/plugins/git4idea/resources/META-INF/stage-plugin.xml b/plugins/git4idea/resources/META-INF/stage-plugin.xml
deleted file mode 100644
index 1a1b85c67aa9..000000000000
--- a/plugins/git4idea/resources/META-INF/stage-plugin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="com.intellij">
-    <changesViewContent id="git.stage" tabName="Staging Area" className="git4idea.index.GitStageContentProvider"
-                        predicateClassName="git4idea.index.GitStageContentVisibilityPredicate"
-                        displayNameSupplierClassName="git4idea.index.GitStageDisplayNameSupplier"/>
-
-    <projectService serviceImplementation="git4idea.index.GitStageManager"/>
-    <projectService serviceImplementation="git4idea.index.GitStageTracker"/>
-
-    <backgroundPostStartupActivity implementation="git4idea.index.GitStageStartupActivity"/>
-
-    <projectService serviceImplementation="git4idea.index.vfs.GitIndexVirtualFileCache"/>
-    <projectService serviceImplementation="git4idea.index.vfs.GitIndexFileSystemRefresher"/>
-    <virtualFileSystem implementationClass="git4idea.index.vfs.GitIndexFileSystem" key="gitIndexFs" physical="true"/>
-
-    <vcs.baseContentProvider implementation="git4idea.index.vfs.GitIndexVirtualFileBaseContentProvider"/>
-    <editorNotificationProvider implementation="git4idea.index.vfs.GitIndexVirtualFileEditorNotificationProvider"/>
-    <editorTabTitleProvider implementation="git4idea.index.vfs.GitIndexVirtualFileTabTitleProvider"/>
-
-    <diff.actions.ShowDiffAction.ExtensionProvider implementation="git4idea.index.actions.GitStageDiffAction"/>
-  </extensions>
-
-  <actions>
-    <action id="Git.Stage.Refresh" class="git4idea.index.actions.GitRefreshStageAction" icon="AllIcons.Actions.Refresh"
-            use-shortcut-of="Refresh"/>
-    <action id="Git.Stage.Add" class="git4idea.index.actions.GitAddAction" use-shortcut-of="ChangesView.AddUnversioned"/>
-    <action id="Git.Stage.Reset" class="git4idea.index.actions.GitResetAction" use-shortcut-of="ChangesView.Revert"/>
-    <action id="Git.Stage.Revert" class="git4idea.index.actions.GitRevertAction" use-shortcut-of="ChangesView.Revert"/>
-
-    <group id="Git.Stage.Toolbar">
-      <reference id="Diff.ShowDiff"/>
-      <reference id="Git.Stage.Refresh"/>
-    </group>
-    <group id="Git.Stage.Tree.Menu">
-      <reference id="Git.Stage.Add"/>
-      <reference id="Git.Stage.Reset"/>
-      <reference id="Git.Stage.Revert"/>
-      <reference id="Diff.ShowDiff"/>
-      <separator/>
-      <reference id="Vcs.ShowTabbedFileHistory"/>
-      <reference id="LocalHistory"/>
-    </group>
-  </actions>
-</idea-plugin>
\ No newline at end of file