Remove redundant command definitions

This tries to reduce the number of duplicate command definitions in
plugin.xml which were done historically in order to achieve
different behavior in different environments, e.g. "Commit" in
the team menu would behave differently from "Commit" in the
Repositories View context menu.

Instead of having two commands for "Commit", we should have one
command and two different handlers with mutually exclusive
"activeWhen" conditions that handle this command.

The advantage is that we have only one key binding and command name
and that the plugin.xml becomes easier to maintain.

Change-Id: I1082ad095b20e2e05536fc10f6b521a151344e2e
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

1 files changed, 625 insertions, 345 deletions

diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index f2c8dee4f5..71c792d1d7 100644
--- a/org.eclipse.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -61,7 +61,7 @@
                menubarPath="team.main/group5"/>
          <action
                class="org.eclipse.egit.ui.internal.actions.MergeAction"
-               definitionId="org.eclipse.egit.ui.RepositoriesViewMerge"
+               definitionId="org.eclipse.egit.ui.team.Merge"
                icon="$nl$/icons/obj16/merge.gif"
                id="org.eclipse.egit.ui.internal.actions.MergeAction"
                label="%MergeAction_label"
@@ -621,6 +621,449 @@
             id="org.eclipse.egit.ui.FetchGerritChange"
             name="%FetchFromGerritCommand.name">
       </command>
+      <command
+            categoryId="org.eclipse.egit.ui.commandCategory"
+            id="org.eclipse.egit.ui.team.Commit"
+            name="%CommitCommand.name">
+      </command>
+      <command
+            categoryId="org.eclipse.egit.ui.commandCategory"
+            id="org.eclipse.egit.ui.team.SimpleFetch"
+            name="%FetchUpstreamCommand.name">
+      </command>
+      <command
+            categoryId="org.eclipse.egit.ui.commandCategory"
+            id="org.eclipse.egit.ui.team.SimplePush"
+            name="%PushUpstreamCommand.name">
+      </command>
+      <command
+            categoryId="org.eclipse.egit.ui.commandCategory"
+            id="org.eclipse.egit.ui.team.Pull"
+            name="%TeamPullCommand.name">
+      </command>
+      <command
+            categoryId="org.eclipse.egit.ui.commandCategory"
+            id="org.eclipse.egit.ui.team.Fetch"
+            name="%FetchCommand.name">
+      </command>
+      <command
+            categoryId="org.eclipse.egit.ui.commandCategory"
+            id="org.eclipse.egit.ui.team.Push"
+            name="%PushCommand.name">
+      </command>
+      <command
+            categoryId="org.eclipse.egit.ui.commandCategory"
+            id="org.eclipse.egit.ui.team.Merge"
+            name="%MergeCommand.name">
+      </command>
+      <command
+            categoryId="org.eclipse.egit.ui.commandCategory"
+            id="org.eclipse.egit.ui.team.Synchronize"
+            name="%SynchronizeCommand.name">
+      </command>
+      <command
+            categoryId="org.eclipse.egit.ui.commandCategory"
+            id="org.eclipse.egit.ui.team.ShowHistory"
+            name="%ShowInHistoryCommand.name">
+      </command>
+      <command
+            categoryId="org.eclipse.egit.ui.commandCategory"
+            id="org.eclipse.egit.ui.team.Reset"
+            name="%ResetCommand.name">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            commandId="org.eclipse.egit.ui.team.Commit">
+         <class
+               class="org.eclipse.egit.ui.internal.repository.tree.command.CommitCommand">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <and>
+                  <iterate>
+                     <instanceof
+                           value="org.eclipse.egit.ui.internal.repository.tree.RepositoryNode">
+                     </instanceof>
+                  </iterate>
+               </and>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Commit">
+         <class
+               class="org.eclipse.egit.ui.internal.actions.CommitActionHandler">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="+">
+               </count>
+               <iterate>
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.SimpleFetch">
+         <class
+               class="org.eclipse.egit.ui.internal.repository.tree.command.FetchConfiguredRemoteCommand">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <and>
+                  <iterate>
+                     <or>
+                        <instanceof
+                              value="org.eclipse.egit.ui.internal.repository.tree.RepositoryNode">
+                        </instanceof>
+                        <instanceof
+                              value="org.eclipse.egit.ui.internal.repository.tree.FetchNode">
+                        </instanceof>
+                     </or>
+                  </iterate>
+               </and>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.SimpleFetch">
+         <class
+               class="org.eclipse.egit.ui.internal.actions.SimpleFetchActionHandler">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <iterate>
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.SimplePush">
+         <class
+               class="org.eclipse.egit.ui.internal.repository.tree.command.PushConfiguredRemoteCommand">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <and>
+                  <iterate>
+                     <or>
+                        <instanceof
+                              value="org.eclipse.egit.ui.internal.repository.tree.RepositoryNode">
+                        </instanceof>
+                        <instanceof
+                              value="org.eclipse.egit.ui.internal.repository.tree.PushNode">
+                        </instanceof>
+                     </or>
+                  </iterate>
+               </and>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.SimplePush">
+         <class
+               class="org.eclipse.egit.ui.internal.actions.SimplePushActionHandler">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <iterate>
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Pull">
+         <class
+               class="org.eclipse.egit.ui.internal.repository.tree.command.PullCommand">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <and>
+                  <iterate>
+                     <instanceof
+                           value="org.eclipse.egit.ui.internal.repository.tree.RepositoryNode">
+                     </instanceof>
+                  </iterate>
+               </and>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Pull">
+         <class
+               class="org.eclipse.egit.ui.internal.actions.PullFromUpstreamActionHandler">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <iterate>
+                  <adapt
+                        type="org.eclipse.core.resources.IProject">
+                  </adapt>
+               </iterate>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Fetch">
+         <class
+               class="org.eclipse.egit.ui.internal.repository.tree.command.FetchCommand">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <and>
+                  <iterate>
+                     <instanceof
+                           value="org.eclipse.egit.ui.internal.repository.tree.RepositoryNode">
+                     </instanceof>
+                  </iterate>
+               </and>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Fetch">
+         <class
+               class="org.eclipse.egit.ui.internal.actions.FetchActionHandler">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <iterate>
+                  <adapt
+                        type="org.eclipse.core.resources.IProject">
+                  </adapt>
+               </iterate>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Push">
+         <class
+               class="org.eclipse.egit.ui.internal.repository.tree.command.PushCommand">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <and>
+                  <iterate>
+                     <instanceof
+                           value="org.eclipse.egit.ui.internal.repository.tree.RepositoryNode">
+                     </instanceof>
+                  </iterate>
+               </and>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Push">
+         <class
+               class="org.eclipse.egit.ui.internal.actions.PushActionHandler">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <iterate>
+                  <adapt
+                        type="org.eclipse.core.resources.IProject">
+                  </adapt>
+               </iterate>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Merge">
+         <class
+               class="org.eclipse.egit.ui.internal.repository.tree.command.MergeCommand">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <and>
+                  <iterate>
+                     <instanceof
+                           value="org.eclipse.egit.ui.internal.repository.tree.RepositoryNode">
+                     </instanceof>
+                  </iterate>
+               </and>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Merge">
+         <class
+               class="org.eclipse.egit.ui.internal.actions.MergeActionHandler">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <iterate>
+                  <adapt
+                        type="org.eclipse.core.resources.IProject">
+                  </adapt>
+               </iterate>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Synchronize">
+         <class
+               class="org.eclipse.egit.ui.internal.repository.tree.command.SynchronizeCommand">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <and>
+                  <iterate>
+                     <instanceof
+                           value="org.eclipse.egit.ui.internal.repository.tree.RepositoryTreeNode">
+                     </instanceof>
+                  </iterate>
+               </and>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Synchronize">
+         <class
+               class="org.eclipse.egit.ui.internal.actions.SynchronizeWithActionHandler">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <iterate>
+                  <adapt
+                        type="org.eclipse.core.resources.IProject">
+                  </adapt>
+               </iterate>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.ShowHistory">
+         <class
+               class="org.eclipse.egit.ui.internal.repository.tree.command.ShowInHistoryCommand">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <and>
+                  <iterate>
+                     <instanceof
+                           value="org.eclipse.egit.ui.internal.repository.tree.RepositoryTreeNode">
+                     </instanceof>
+                  </iterate>
+               </and>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.ShowHistory">
+         <class
+               class="org.eclipse.egit.ui.internal.actions.ShowHistoryActionHandler">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <iterate>
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </iterate>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Reset">
+         <class
+               class="org.eclipse.egit.ui.internal.repository.tree.command.ResetCommand">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <and>
+                  <iterate>
+                     <instanceof
+                           value="org.eclipse.egit.ui.internal.repository.tree.RepositoryTreeNode">
+                     </instanceof>
+                  </iterate>
+               </and>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Reset">
+         <class
+               class="org.eclipse.egit.ui.internal.actions.ResetActionHandler">
+         </class>
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <iterate>
+                  <adapt
+                        type="org.eclipse.core.resources.IProject">
+                  </adapt>
+               </iterate>
+            </and>
+         </activeWhen>
+      </handler>
    </extension>
    <extension
          point="org.eclipse.ui.views">
@@ -878,7 +1321,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewMergeSimple"
+               commandId="org.eclipse.egit.ui.team.Merge"
                icon="icons/obj16/merge.gif"
                label="%RepoViewMergeSimple.label"
                style="push">
@@ -943,7 +1386,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewSynchronize"
+               commandId="org.eclipse.egit.ui.team.Synchronize"
                icon="icons/obj16/remotespec.gif"
                label="%RepoViewSynchronize.label"
                style="push">
@@ -974,7 +1417,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewSynchronizeWithEachOther"
+               commandId="org.eclipse.egit.ui.team.Synchronize"
                icon="icons/obj16/remotespec.gif"
                label="%RepoViewSynchronizeEachOther.label"
                style="push">
@@ -1026,7 +1469,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewPushConfigured"
+               commandId="org.eclipse.egit.ui.team.SimplePush"
                icon="icons/obj16/push.gif"
                label="%RepoViewPushSimpleLabel"
                style="push">
@@ -1047,7 +1490,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewFetchConfigured"
+               commandId="org.eclipse.egit.ui.team.SimpleFetch"
                icon="icons/obj16/fetch.gif"
                label="%RepoViewFetchSimple.label"
                style="push">
@@ -1274,7 +1717,7 @@
                name="##Repo-1">
          </separator>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewCommit"
+               commandId="org.eclipse.egit.ui.team.Commit"
                icon="icons/obj16/commit.gif"
                label="%RepoViewCommit.label"
                style="push">
@@ -1295,7 +1738,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewPushConfigured"
+               commandId="org.eclipse.egit.ui.team.SimplePush"
                icon="icons/obj16/push.gif"
                label="%PushToUpstreamCommand.label"
                style="push">
@@ -1316,7 +1759,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewFetchConfigured"
+               commandId="org.eclipse.egit.ui.team.SimpleFetch"
                icon="icons/obj16/fetch.gif"
                label="%FetchFromUpstreamCommand.label"
                style="push">
@@ -1337,7 +1780,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewPush"
+               commandId="org.eclipse.egit.ui.team.Push"
                icon="icons/obj16/push.gif"
                label="%RepoViewPush.label"
                style="push">
@@ -1358,7 +1801,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewFetch"
+               commandId="org.eclipse.egit.ui.team.Fetch"
                icon="icons/obj16/fetch.gif"
                label="%RepoViewFetch.label"
                style="push">
@@ -1397,7 +1840,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewPull"
+               commandId="org.eclipse.egit.ui.team.Pull"
                icon="icons/obj16/pull.gif"
                label="%RepoViewPullMenu.label"
                style="push">
@@ -1425,7 +1868,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewMerge"
+               commandId="org.eclipse.egit.ui.team.Merge"
                icon="icons/obj16/merge.gif"
                label="%RepoViewMerge.label"
                style="push">
@@ -1459,7 +1902,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewRebaseWithDialog"
+               commandId="org.eclipse.egit.ui.RepositoriesViewRebase"
                icon="icons/obj16/rebase.gif"
                label="%RebaseCommand.label2"
                style="push">
@@ -1556,7 +1999,7 @@
             </command>
          </menu>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesViewReset"
+               commandId="org.eclipse.egit.ui.team.Reset"
                icon="icons/obj16/reset.gif"
                label="%RepoViewReset.label"
                style="push">
@@ -1589,7 +2032,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.egit.ui.RepositoriesView.ShowInHistoryCommand"
+               commandId="org.eclipse.egit.ui.team.ShowHistory"
                icon="icons/obj16/history.gif"
                label="%ShowInHistoryCommand.label"
                style="push">
@@ -1874,6 +2317,119 @@
                style="toggle">
          </command>
       </menuContribution>
+      <menuContribution
+            locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+         <menu
+               id="team.main"
+               label="%TeamMenu.label">
+            <separator
+                  name="group1"
+                  visible="true">
+            </separator>
+            <separator
+                  name="org.eclipse.egit.ui.remoteSeparator"
+                  visible="true">
+            </separator>
+            <menu
+                  label="%RemoteSubMenu.label">
+               <command
+                     commandId="org.eclipse.egit.ui.team.Fetch"
+                     label="%FetchAction_label"
+                     style="push">
+               </command>
+               <command
+                     commandId="org.eclipse.egit.ui.FetchGerritChange"
+                     label="%FetchFromGerritCommand.label"
+                     style="push">
+               </command>
+               <command
+                     commandId="org.eclipse.egit.ui.team.Push"
+                     label="%PushAction_label"
+                     style="push">
+               </command>
+               <separator
+                     name="org.eclipse.egit.ui.remote.group1"
+                     visible="true">
+               </separator>
+               <command
+                     commandId="org.eclipse.egit.ui.ConfigureUpstreamFetch"
+                     label="%ConfigureFetchFromUpstreamCommand.label"
+                     style="push">
+               </command>
+               <command
+                     commandId="org.eclipse.egit.ui.ConfigureUpstreamPush"
+                     label="%ConfigurePushToUpstreamCommand.label"
+                     style="push">
+               </command>
+               <visibleWhen
+                     checkEnabled="false">
+                  <and>
+                     <count
+                           value="1">
+                     </count>
+                     <iterate>
+                        <and>
+                           <adapt
+                                 type="org.eclipse.core.resources.IProject">
+                              <test
+                                    property="GitResource.isShared">
+                              </test>
+                           </adapt>
+                        </and>
+                     </iterate>
+                  </and>
+               </visibleWhen>
+            </menu>
+            <separator
+                  name="applyPatchGroup"
+                  visible="false">
+            </separator>
+            <separator
+                  name="group2"
+                  visible="true">
+            </separator>
+            <separator
+                  name="group3"
+                  visible="true">
+            </separator>
+            <separator
+                  name="group4"
+                  visible="true">
+            </separator>
+            <separator
+                  name="group5"
+                  visible="true">
+            </separator>
+            <separator
+                  name="group6"
+                  visible="true">
+            </separator>
+            <separator
+                  name="group7"
+                  visible="true">
+            </separator>
+            <separator
+                  name="group8"
+                  visible="true">
+            </separator>
+            <separator
+                  name="group9"
+                  visible="true">
+            </separator>
+            <separator
+                  name="group10"
+                  visible="true">
+            </separator>
+            <separator
+                  name="targetGroup"
+                  visible="true">
+            </separator>
+            <separator
+                  name="projectGroup"
+                  visible="true">
+            </separator>
+         </menu>
+      </menuContribution>
    </extension>
    <extension
          name="%RepositoryCommandsLabel"
@@ -1904,18 +2460,6 @@
       </command>
       <command
             categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.FetchCommand"
-            id="org.eclipse.egit.ui.RepositoriesViewFetch"
-            name="%FetchCommand">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.CommitCommand"
-            id="org.eclipse.egit.ui.RepositoriesViewCommit"
-            name="%CommitCommand">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.RenameBranchCommand"
             id="org.eclipse.egit.ui.RepositoriesViewRenameBranch"
             name="%RenameBranchCommand">
@@ -1934,12 +2478,6 @@
       </command>
       <command
             categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.PushCommand"
-            id="org.eclipse.egit.ui.RepositoriesViewPush"
-            name="%PushCommand">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.RefreshCommand"
             id="org.eclipse.egit.ui.RepositoriesViewRefresh"
             name="%RefreshCommand">
@@ -1988,12 +2526,6 @@
       </command>
       <command
             categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.PushConfiguredRemoteCommand"
-            id="org.eclipse.egit.ui.RepositoriesViewPushConfigured"
-            name="%SimplePushCommand">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.ChangeCredentialsCommand"
             id="org.eclipse.egit.ui.RepositoriesViewChangeCredentials"
             name="%ChangeCredentialsCommand">
@@ -2006,12 +2538,6 @@
       </command>
       <command
             categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.FetchConfiguredRemoteCommand"
-            id="org.eclipse.egit.ui.RepositoriesViewFetchConfigured"
-            name="%SimpleFetchCommand">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.DeletePushCommand"
             id="org.eclipse.egit.ui.RepositoriesViewDeletePush"
             name="%RemovePushCommand">
@@ -2042,41 +2568,12 @@
       </command>
       <command
             categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.SynchronizeCommand"
-            id="org.eclipse.egit.ui.RepositoriesViewSynchronize"
-            name="%SynchronizeCommand">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.SynchronizeCommand"
-            id="org.eclipse.egit.ui.RepositoriesViewSynchronizeWithEachOther"
-            name="%SynchronizeCommand">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.CreateTagCommand"
             id="org.eclipse.egit.ui.RepositoriesViewCreateTag"
             name="%CreateTagCommand">
       </command>
       <command
             categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.MergeCommand"
-            id="org.eclipse.egit.ui.RepositoriesViewMergeSimple"
-            name="%MergeCommand">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
-            id="org.eclipse.egit.ui.RepositoriesViewMerge"
-            name="%MergeWithDialogCommand">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.ResetCommand"
-            id="org.eclipse.egit.ui.RepositoriesViewReset"
-            name="%ResetCommand">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.CheckoutCommand"
             id="org.eclipse.egit.ui.CheckoutCommand"
             name="%CheckoutCommand">
@@ -2105,30 +2602,12 @@
       </command>
       <command
             categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.ShowInHistoryCommand"
-            id="org.eclipse.egit.ui.RepositoriesView.ShowInHistoryCommand"
-            name="%ShowInHistoryCommand.name2">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.PullCommand"
-            id="org.eclipse.egit.ui.RepositoriesViewPull"
-            name="%RepoViewPullCommand.name">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.RebaseCurrentRefCommand"
             id="org.eclipse.egit.ui.RepositoriesViewRebase"
             name="%RebaseCommand.name">
       </command>
       <command
             categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.RebaseCurrentRefCommand"
-            id="org.eclipse.egit.ui.RepositoriesViewRebaseWithDialog"
-            name="%RebaseWithDialogCommand.name">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.repository.tree.command.AbortRebaseCommand"
             id="org.eclipse.egit.ui.RepositoriesViewAbortRebase"
             name="%AbortRebaseCommand.name">
@@ -2153,14 +2632,6 @@
             icon="icons/etool16/newlocation_wiz.gif">
       </image>
       <image
-            commandId="org.eclipse.egit.ui.RepositoriesViewFetch"
-            icon="icons/obj16/fetch.gif">
-      </image>
-      <image
-            commandId="org.eclipse.egit.ui.RepositoriesViewCommit"
-            icon="icons/obj16/commit.gif">
-      </image>
-      <image
             commandId="org.eclipse.egit.ui.RepositoriesViewClone"
             icon="icons/obj16/cloneGit.gif">
       </image>
@@ -2169,10 +2640,6 @@
             icon="icons/obj16/refresh.gif">
       </image>
       <image
-            commandId="org.eclipse.egit.ui.RepositoriesViewPush"
-            icon="icons/obj16/push.gif">
-      </image>
-      <image
             commandId="org.eclipse.egit.ui.RepositoriesLinkWithSelection"
             icon="icons/elcl16/synced.gif">
       </image>
@@ -2181,18 +2648,6 @@
             icon="icons/obj16/version_rep.gif">
       </image>
       <image
-            commandId="org.eclipse.egit.ui.RepositoriesViewMerge"
-            icon="icons/obj16/merge.gif">
-      </image>
-      <image
-            commandId="org.eclipse.egit.ui.RepositoriesViewMergeSimple"
-            icon="icons/obj16/merge.gif">
-      </image>
-      <image
-            commandId="org.eclipse.egit.ui.RepositoriesViewReset"
-            icon="icons/obj16/reset.gif">
-      </image>
-      <image
             commandId="org.eclipse.egit.ui.team.ShowRepositoriesView"
             icon="icons/eview16/repo_rep.gif">
       </image>
@@ -2225,18 +2680,10 @@
             icon="icons/obj16/checkout.gif">
       </image>
       <image
-            commandId="org.eclipse.egit.ui.RepositoriesViewSynchronize"
-            icon="$nl$/icons/obj16/remotespec.gif">
-      </image>
-      <image
             commandId="org.eclipse.egit.ui.RepositoriesViewImportProjects"
             icon="icons/obj16/import_prj.gif">
       </image>
       <image
-            commandId="org.eclipse.egit.ui.RepositoriesViewFetchConfigured"
-            icon="icons/obj16/fetch.gif">
-      </image>
-      <image
             commandId="org.eclipse.egit.ui.RepositoriesViewDeleteBranch"
             icon="icons/obj16/delete_obj.gif">
       </image>
@@ -2253,10 +2700,6 @@
             icon="icons/obj16/delete_obj.gif">
       </image>
       <image
-            commandId="org.eclipse.egit.ui.RepositoriesViewPushConfigured"
-            icon="icons/obj16/push.gif">
-      </image>
-      <image
             commandId="org.eclipse.egit.ui.RepositoriesViewOpenProperties"
             icon="icons/obj16/properties.gif">
       </image>
@@ -2277,14 +2720,6 @@
             icon="icons/obj16/clear.gif">
       </image>
       <image
-            commandId="org.eclipse.egit.ui.RepositoriesView.ShowInHistoryCommand"
-            icon="icons/obj16/history.gif">
-      </image>
-      <image
-            commandId="org.eclipse.egit.ui.RepositoriesViewPull"
-            icon="icons/obj16/pull.gif">
-      </image>
-      <image
             commandId="org.eclipse.egit.ui.RepositoriesViewAbortRebase"
             icon="icons/elcl16/progress_stop.gif">
       </image>
@@ -2324,6 +2759,58 @@
             commandId="org.eclipse.egit.ui.FetchGerritChange"
             icon="icons/obj16/gerrit_obj.gif">
       </image>
+      <image
+            commandId="org.eclipse.egit.ui.team.AddToIndex"
+            icon="icons/obj16/add.gif">
+      </image>
+      <image
+            commandId="org.eclipse.egit.ui.team.Branch"
+            icon="icons/obj16/branch_obj.gif">
+      </image>
+      <image
+            commandId="org.eclipse.egit.ui.team.Commit"
+            icon="icons/obj16/commit.gif">
+      </image>
+      <image
+            commandId="org.eclipse.egit.ui.team.SimpleFetch"
+            icon="icons/obj16/fetch.gif">
+      </image>
+      <image
+            commandId="org.eclipse.egit.ui.team.SimplePush"
+            icon="icons/obj16/push.gif">
+      </image>
+      <image
+            commandId="org.eclipse.egit.ui.team.Ignore"
+            icon="icons/obj16/ignore.gif">
+      </image>
+      <image
+            commandId="org.eclipse.egit.ui.team.Merge"
+            icon="icons/obj16/merge.gif">
+      </image>
+      <image
+            commandId="org.eclipse.egit.ui.team.MergeTool"
+            icon="icons/obj16/mergetool.gif">
+      </image>
+      <image
+            commandId="org.eclipse.egit.ui.team.Pull"
+            icon="icons/obj16/pull.gif">
+      </image>
+      <image
+            commandId="org.eclipse.egit.ui.RepositoriesViewRebase"
+            icon="icons/obj16/rebase.gif">
+      </image>
+      <image
+            commandId="org.eclipse.egit.ui.team.Reset"
+            icon="icons/obj16/reset.gif">
+      </image>
+      <image
+            commandId="org.eclipse.egit.ui.team.Synchronize"
+            icon="icons/obj16/remotespec.gif">
+      </image>
+      <image
+            commandId="org.eclipse.egit.ui.team.Tag"
+            icon="icons/obj16/tags.gif">
+      </image>
    </extension>
    <extension
          point="org.eclipse.core.expressions.propertyTesters">
@@ -2456,12 +2943,6 @@
       </command>
       <command
             categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.actions.CommitActionHandler"
-            id="org.eclipse.egit.ui.team.Commit"
-            name="%CommitCommand.name">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.actions.CompareWithHeadActionHandler"
             id="org.eclipse.egit.ui.team.CompareWithHead"
             name="%CompareWithHeadCommand.name">
@@ -2483,12 +2964,6 @@
             id="org.eclipse.egit.ui.team.Discard"
             name="%ReplaceWithIndexCommand.name">
       </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.actions.FetchActionHandler"
-            id="org.eclipse.egit.ui.team.Fetch"
-            name="%FetchCommand.name">
-      </command>
             <command
             categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.actions.IgnoreActionHandler"
@@ -2497,42 +2972,12 @@
       </command>
       <command
             categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.actions.MergeActionHandler"
-            id="org.eclipse.egit.ui.team.Merge"
-            name="%MergeCommand.name">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.actions.PushActionHandler"
-            id="org.eclipse.egit.ui.team.Push"
-            name="%PushCommand.name">
-      </command>
-            <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.actions.ResetActionHandler"
-            id="org.eclipse.egit.ui.team.Reset"
-            name="%ResetCommand.name2">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.actions.SynchronizeWithActionHandler"
-            id="org.eclipse.egit.ui.team.SyncWith"
-            name="%SynchronizeCommand.name">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.actions.TagActionHandler"
             id="org.eclipse.egit.ui.team.Tag"
             name="%TagCommand.name">
       </command>
       <command
             categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.actions.ShowHistoryActionHandler"
-            id="org.eclipse.egit.ui.team.ShowHistory"
-            name="%ShowInHistoryCommand.name">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.actions.ShowRepositoriesViewActionHandler"
             id="org.eclipse.egit.ui.team.ShowRepositoriesView"
             name="%ShowRepoViewCommand.name">
@@ -2545,29 +2990,11 @@
       </command>
       <command
             categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.actions.PullFromUpstreamActionHandler"
-            id="org.eclipse.egit.ui.team.Pull"
-            name="%TeamPullCommand.name">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.actions.MergeToolActionHandler"
             id="org.eclipse.egit.ui.team.MergeTool"
             name="%MergeToolCommand.name">
       </command>
       <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.actions.SimplePushActionHandler"
-            id="org.eclipse.egit.ui.team.SimplePush"
-            name="%PushUpstreamCommand.name">
-      </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.actions.SimpleFetchActionHandler"
-            id="org.eclipse.egit.ui.team.SimpleFetch"
-            name="%FetchUpstreamCommand.name">
-      </command>
-      <command
             defaultHandler="org.eclipse.egit.ui.internal.actions.ConfigureFetchActionHandler"
             id="org.eclipse.egit.ui.ConfigureUpstreamFetch"
             name="%ConfigureUpstreamFetchCommand.name">
@@ -2604,7 +3031,7 @@
             sequence="M1+M3+I">
       </key>
       <key
-            commandId="org.eclipse.egit.ui.RepositoriesViewMerge"
+            commandId="org.eclipse.egit.ui.team.Merge"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M1+M3+M">
       </key>
@@ -2723,151 +3150,4 @@
             name="%Git">
       </category>
    </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="org.eclipse.egit.ui.internal.repository.tree.command.MergeCommand"
-            commandId="org.eclipse.egit.ui.RepositoriesViewMerge">
-         <activeWhen>
-            <iterate
-                  ifEmpty="false">
-               <or>
-                  <instanceof
-                        value="org.eclipse.egit.ui.internal.repository.tree.RepositoryNode">
-                  </instanceof>
-                  <instanceof
-                        value="org.eclipse.egit.ui.internal.repository.tree.RefNode">
-                  </instanceof>
-               </or>
-            </iterate></activeWhen>
-      </handler>
-      <handler
-            class="org.eclipse.egit.ui.internal.actions.MergeAction"
-            commandId="org.eclipse.egit.ui.RepositoriesViewMerge">
-         <activeWhen>
-            <iterate
-                  ifEmpty="false">
-               <instanceof
-                     value="org.eclipse.core.resources.IProject">
-               </instanceof>
-            </iterate>
-         </activeWhen>
-      </handler>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="popup:org.eclipse.ui.popup.any?after=additions">
-         <menu
-               id="team.main"
-               label="%TeamMenu.label">
-            <separator
-                  name="group1"
-                  visible="true">
-            </separator>
-            <separator
-                  name="org.eclipse.egit.ui.remoteSeparator"
-                  visible="true">
-            </separator>
-            <menu
-                  label="%RemoteSubMenu.label">
-               <command
-                     commandId="org.eclipse.egit.ui.team.Fetch"
-                     label="%FetchAction_label"
-                     style="push">
-               </command>
-               <command
-                     commandId="org.eclipse.egit.ui.FetchGerritChange"
-                     label="%FetchFromGerritCommand.label"
-                     style="push">
-               </command>
-               <command
-                     commandId="org.eclipse.egit.ui.team.Push"
-                     label="%PushAction_label"
-                     style="push">
-               </command>
-               <separator
-                     name="org.eclipse.egit.ui.remote.group1"
-                     visible="true">
-               </separator>
-               <command
-                     commandId="org.eclipse.egit.ui.ConfigureUpstreamFetch"
-                     label="%ConfigureFetchFromUpstreamCommand.label"
-                     style="push">
-               </command>
-               <command
-                     commandId="org.eclipse.egit.ui.ConfigureUpstreamPush"
-                     label="%ConfigurePushToUpstreamCommand.label"
-                     style="push">
-               </command>
-               <visibleWhen
-                     checkEnabled="false">
-                  <and>
-                     <count
-                           value="1">
-                     </count>
-                     <iterate>
-                        <and>
-                           <adapt
-                                 type="org.eclipse.core.resources.IProject">
-								<test
-									property="GitResource.isShared">
-								</test>
-                           </adapt>
-                        </and>
-                     </iterate>
-                  </and>
-               </visibleWhen>
-            </menu>
-            <separator
-                  name="applyPatchGroup"
-                  visible="false">
-            </separator>
-            <separator
-                  name="group2"
-                  visible="true">
-            </separator>
-            <separator
-                  name="group3"
-                  visible="true">
-            </separator>
-            <separator
-                  name="group4"
-                  visible="true">
-            </separator>
-            <separator
-                  name="group5"
-                  visible="true">
-            </separator>
-            <separator
-                  name="group6"
-                  visible="true">
-            </separator>
-            <separator
-                  name="group7"
-                  visible="true">
-            </separator>
-            <separator
-                  name="group8"
-                  visible="true">
-            </separator>
-            <separator
-                  name="group9"
-                  visible="true">
-            </separator>
-            <separator
-                  name="group10"
-                  visible="true">
-            </separator>
-            <separator
-                  name="targetGroup"
-                  visible="true">
-            </separator>
-            <separator
-                  name="projectGroup"
-                  visible="true">
-            </separator>
-         </menu>
-      </menuContribution>
-   </extension>
 </plugin>