[git-index] merge stage-plugin.xml to plugin.xml

GitOrigin-RevId: 71f7512c0cce8f30d5e0ce37f25eb45f62a67bd9
This commit is contained in:
Julia Beliaeva
2020-05-27 05:34:57 +03:00
committed by intellij-monorepo-bot
parent 384f894915
commit 5c6072acfd
2 changed files with 39 additions and 47 deletions
+39 -3
View File
@@ -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>
@@ -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>