From 35c758f4214179b23916ba17b3bf8a8b8ab2eb2e Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <kirill.likhodedov@jetbrains.com>
Date: Wed, 30 Jun 2010 18:31:40 +0400
Subject: [PATCH] [Mercurial] Menu: put all mercurial actions in a single
 group, commented out "MQ rebase" until MQ is fully supported

---
 .../org/zmlx/hg4idea/HgVcsMessages.properties  |  1 -
 plugins/hg4idea/src/META-INF/plugin.xml        | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties b/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
index 79a20656d098..6b893c39e4f5 100644
--- a/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
+++ b/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
@@ -1,5 +1,4 @@
 group.hg4idea.global.menu.text=Mercurial
-group.hg4idea.global.submenu.text=Mercurial Actions
 group.hg4idea.file.menu.text=Mercurial
 action.hg4idea.tag.text=Tag Repository
 action.hg4idea.tag.description=Create a tag for current revision
diff --git a/plugins/hg4idea/src/META-INF/plugin.xml b/plugins/hg4idea/src/META-INF/plugin.xml
index 22def9baecd4..6fd8e7d43392 100644
--- a/plugins/hg4idea/src/META-INF/plugin.xml
+++ b/plugins/hg4idea/src/META-INF/plugin.xml
@@ -45,31 +45,33 @@
     </group>
     
     <group id="hg4idea.file.menu" popup="true" icon="/images/mercurial.png" class="org.zmlx.hg4idea.action.HgMercurialMenu">
-      <action id="hg4idea.resolve.mark" class="org.zmlx.hg4idea.action.HgMarkResolved"/>
-      <separator/>
       <reference ref="CheckinFiles"/>
-      <reference ref="ChangesView.Rollback"/>
       <reference ref="ChangesView.AddUnversioned"/>
+      <reference ref="ChangesView.Rollback"/>
       <separator/>
+
       <reference ref="Compare.SameVersion"/>
       <reference ref="Compare.Selected"/>
       <reference ref="Vcs.ShowTabbedFileHistory"/>
       <reference ref="Vcs.ShowHistoryForBlock"/>
       <reference ref="Annotate"/>
-      <add-to-group group-id="VcsGroup" anchor="last"/>
-    </group>
+      <separator/>
 
-    <group id="hg4idea.global.submenu" popup="true" icon="/images/mercurial.png" class="org.zmlx.hg4idea.action.HgMercurialMenu">
       <action id="hg4idea.pull" class="org.zmlx.hg4idea.action.HgPullAction" icon="/actions/checkOut.png"/>
       <action id="hg4idea.push" class="org.zmlx.hg4idea.action.HgPushAction" icon="/actions/commit.png"/>
       <separator/>
       <action id="hg4idea.run.conflict.resolver" class="org.zmlx.hg4idea.action.HgRunConflictResolverAction"/>
-      <action id="hg4idea.mq.rebase" class="org.zmlx.hg4idea.action.HgMqRebaseAction"/>
+      <!--<action id="hg4idea.mq.rebase" class="org.zmlx.hg4idea.action.HgMqRebaseAction"/>-->
       <separator/>
+
       <action id="hg4idea.tag" class="org.zmlx.hg4idea.action.HgCreateTagAction"/>
       <action id="hg4idea.switch" class="org.zmlx.hg4idea.action.HgSwitchWorkingDirectoryAction"/>
-      <add-to-group group-id="VcsGlobalGroup" anchor="last"/>
+      <action id="hg4idea.resolve.mark" class="org.zmlx.hg4idea.action.HgMarkResolved"/>
+
+      <add-to-group group-id="VcsGroup" anchor="last"/>
+      <add-to-group group-id="VcsGroups" anchor="last"/>
     </group>
+
   </actions>
 
   <resource-bundle>org.zmlx.hg4idea.HgVcsMessages</resource-bundle>