diff: do not use "CompareDirs" as reference shortcut
[idea/community.git] / platform / platform-resources / src / idea / VcsActions.xml
1 <component>
2   <actions>
3     <action id="Vcs.ShowTabbedFileHistory" class="com.intellij.openapi.vcs.actions.TabbedShowHistoryAction"
4       icon="AllIcons.Vcs.History"/>
5
6     <action id="CheckinProject" class="com.intellij.openapi.vcs.actions.CommonCheckinProjectAction" icon="AllIcons.Actions.Commit">
7       <keyboard-shortcut first-keystroke="control K" keymap="$default"/>
8     </action>
9     <action id="CheckinFiles" class="com.intellij.openapi.vcs.actions.CommonCheckinFilesAction"/>
10     <action id="UpdateFiles" class="com.intellij.openapi.vcs.update.CommonUpdateFileOrDirectoryAction"/>
11     <action id="CheckStatusForFiles" class="com.intellij.openapi.vcs.update.CommonStatusFileOrDirectoryAction"/>
12     <action id="IntegrateFiles" class="com.intellij.openapi.vcs.update.CommonIntegrateFileOrDirectoryAction"/>
13     <action id="Annotate" class="com.intellij.openapi.vcs.actions.AnnotateToggleAction"/>
14     <action id="Show.Current.Revision" class="com.intellij.openapi.vcs.actions.ShowBaseRevisionAction" text="Show Current Revision"/>
15     <action id="Compare.SameVersion" class="com.intellij.openapi.vcs.actions.CompareWithTheSameVersionAction" icon="AllIcons.Actions.Diff"/>
16     <action id="Compare.LastVersion" class="com.intellij.openapi.vcs.actions.CompareWithLastVersion"/>
17     <action id="Compare.Selected" class="com.intellij.openapi.vcs.actions.CompareWithSelectedRevisionAction" popup="true"/>
18     <action id="Compare.Specified" class="com.intellij.openapi.vcs.actions.SelectAndCompareWithSelectedRevisionAction"
19             text="Com_pare with Specified Revision..." popup="true"/>
20     <action id="Vcs.ShowHistoryForBlock" class="com.intellij.openapi.vcs.actions.SelectedBlockHistoryAction"/>
21
22     <group class="com.intellij.openapi.vcs.actions.VcsActionGroup" id="VcsGroup"/>
23
24     <group class="com.intellij.openapi.vcs.actions.VcsGroupsWrapper" id="VcsFileGroupPopup" popup="true"/>
25
26     <group id="VersionControlsGroup">
27       <reference ref="VcsFileGroupPopup"/>
28     </group>
29
30     <group id="GoToChangeMarkerGroup">
31       <separator/>
32       <action id="VcsShowNextChangeMarker" class="com.intellij.openapi.vcs.actions.ShowNextChangeMarkerAction"
33               icon="AllIcons.Actions.NextOccurence"/>
34       <action id="VcsShowPrevChangeMarker" class="com.intellij.openapi.vcs.actions.ShowPrevChangeMarkerAction"
35               icon="AllIcons.Actions.PreviousOccurence"/>
36
37       <add-to-group group-id="GoToMenu" anchor="last"/>
38     </group>
39     <action id="VcsShowCurrentChangeMarker" class="com.intellij.openapi.vcs.actions.ShowCurrentChangeMarkerAction"/>
40
41     <!-- Main menu | Version Control -->
42     <group id="VcsGroups" popup="true">
43       <action id="Start.Use.Vcs" class="com.intellij.ide.actions.StartUseVcsAction"/>
44       <separator/>
45       <group class="com.intellij.openapi.vcs.actions.VcsActionGroup" id="VcsGlobalGroup">
46
47         <action id="Vcs.QuickListPopupAction"
48                 class = "com.intellij.openapi.vcs.actions.VcsQuickListPopupAction"
49                 text = "VCS Operations Popup..." description="Context aware popup with list of commonly used VCS actions"/>
50         <action id="Vcs.ChangesView" class="com.intellij.openapi.vcs.changes.ShowChangesViewAction"/>
51         <reference ref="CheckinProject"/>
52         <action id="Vcs.UpdateProject" class="com.intellij.openapi.vcs.update.CommonUpdateProjectAction" icon="AllIcons.Actions.CheckOut">
53           <keyboard-shortcut first-keystroke="control T" keymap="$default"/>
54         </action>
55         <action id="Vcs.IntegrateProject" class="com.intellij.openapi.vcs.update.CommonIntegrateProjectAction"/>
56         <action id="Vcs.RefreshStatuses" class="com.intellij.openapi.vcs.actions.RefreshStatuses"/>
57         <separator/>
58         <group id="Vcs.Specific" class="com.intellij.ide.actions.NonEmptyActionGroup"/>
59         <separator/>
60         <action id="ChangesView.CreatePatch" class="com.intellij.openapi.vcs.changes.actions.CreatePatchAction"/>
61         <action id="ChangesView.ApplyPatch" class="com.intellij.openapi.vcs.changes.patch.ApplyPatchAction"/>
62         <action id="ChangesView.Shelve" class="com.intellij.openapi.vcs.changes.shelf.ShelveChangesAction"/>
63       </group>
64
65       <separator/>
66       <group id="Vcs.Checkout" class="com.intellij.openapi.vcs.checkout.CheckoutActionGroup" popup="true"/>
67       <group id="Vcs.Import" class="com.intellij.ide.actions.NonEmptyActionGroup" popup="true"/>
68       <group id="Vcs.Browse" class="com.intellij.ide.actions.NonEmptyActionGroup" popup="true"/>
69
70       <add-to-group group-id="MainMenu" anchor="after" relative-to-action="ToolsMenu"/>
71     </group>
72
73     <action id="ChangesView.Revert" class="com.intellij.openapi.vcs.changes.actions.RollbackAction"
74             icon="AllIcons.Actions.Rollback"/>
75
76     <group id="ChangesViewToolbar">
77       <action id="ChangesView.Refresh" class="com.intellij.openapi.vcs.changes.actions.RefreshAction"
78               icon="AllIcons.Actions.Refresh"/>
79       <action id="ChangesView.Commit" class="com.intellij.openapi.vcs.actions.CommonCheckinProjectAction"
80               icon="AllIcons.Actions.Commit"/>
81       <reference ref="ChangesView.Revert"/>
82       <action id="ChangesView.NewChangeList" class="com.intellij.openapi.vcs.changes.actions.AddChangeListAction"
83               icon="AllIcons.General.Add"/>
84       <action id="ChangesView.RemoveChangeList" class="com.intellij.openapi.vcs.changes.actions.RemoveChangeListAction"
85               icon="AllIcons.General.Remove"/>
86       <action id="ChangesView.SetDefault" class="com.intellij.openapi.vcs.changes.actions.SetDefaultChangeListAction"
87               icon="AllIcons.Actions.Submit1"/>
88       <action id="ChangesView.Move" class="com.intellij.openapi.vcs.changes.actions.MoveChangesToAnotherListAction"
89               icon="AllIcons.Actions.MoveToAnotherChangelist"/>
90       <action id="ChangesView.Diff" class="com.intellij.openapi.vcs.changes.actions.diff.ShowDiffAction"
91               icon="AllIcons.Actions.Diff"/>
92     </group>
93
94     <group id="AlienCommitChangesDialog.AdditionalActions"/>
95
96     <group id="ChangesViewPopupMenu">
97       <reference ref="ChangesView.Commit"/>
98       <reference ref="ChangesView.Revert"/>
99       <reference ref="ChangesView.Move"/>
100       <reference ref="ChangesView.Diff"/>
101       <reference ref="EditSource"/>
102       <separator/>
103       <action id="ChangesView.DeleteUnversioned" class="com.intellij.openapi.vcs.changes.actions.DeleteUnversionedFilesAction"
104               icon="AllIcons.Actions.Cancel"/>
105       <action id="ChangesView.AddUnversioned" class="com.intellij.openapi.vcs.changes.actions.ScheduleForAdditionAction">
106         <keyboard-shortcut first-keystroke="control alt A" keymap="$default"/>
107       </action>
108       <action id="ChangesView.Ignore" class="com.intellij.openapi.vcs.changes.actions.IgnoreUnversionedAction"/>
109       <action id="ChangesView.RemoveDeleted" class="com.intellij.openapi.vcs.changes.actions.ScheduleForRemovalAction"
110               icon="AllIcons.Actions.Exclude"/>
111       <action id="ChangesView.Edit" class="com.intellij.openapi.vcs.changes.actions.EditAction"/>
112       <separator/>
113       <reference ref="ChangesView.NewChangeList"/>
114       <reference ref="ChangesView.RemoveChangeList"/>
115       <reference ref="ChangesView.SetDefault"/>
116       <action id="ChangesView.Rename" class="com.intellij.openapi.vcs.changes.actions.RenameChangeListAction"/>
117       <reference ref="ChangesView.CreatePatch"/>
118       <reference ref="ChangesView.Shelve"/>
119       <separator/>
120       <reference ref="ChangesView.Refresh"/>
121       <separator/>
122       <reference ref="VersionControlsGroup"/>
123     </group>
124
125     <!-- There are alternative action presentations for the UnversionedViewDialog. Icon is the difference.  -->
126     <group id="Unversioned.Files.Dialog">
127       <action id="ChangesView.AddUnversioned.From.Dialog" class="com.intellij.openapi.vcs.changes.actions.ScheduleForAdditionAction"
128               icon="AllIcons.General.Add" use-shortcut-of="ChangesView.AddUnversioned" />
129       <reference ref="ChangesView.Move"/>
130       <action id="ChangesView.DeleteUnversioned.From.Dialog" class="com.intellij.openapi.vcs.changes.actions.DeleteUnversionedFilesAction"/>
131       <reference ref="ChangesView.Ignore"/>
132     </group>
133
134     <group id="ShelvedChangesPopupMenu">
135       <action id="ShelvedChanges.Unshelve" class="com.intellij.openapi.vcs.changes.shelf.UnshelveChangesAction"/>
136       <action id="ShelveChanges.UnshelveWithDialog" class="com.intellij.openapi.vcs.changes.shelf.UnshelveWithDialogAction"
137               text="Unshelve..." description="Correct paths where to apply patches and unshelve"/>
138       <action id="ShelvedChanges.Restore" class="com.intellij.openapi.vcs.changes.shelf.RestoreShelvedChange"/>
139       <action id="ShelvedChanges.Diff" class="com.intellij.openapi.vcs.changes.shelf.DiffShelvedChangesAction"
140           icon="AllIcons.Actions.Diff"/>
141       <action id="ChangesView.CreatePatchFromChanges" class="com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction"
142               icon="AllIcons.Actions.CreatePatch"/>
143       <action id="ShelvedChanges.ImportPatches" class="com.intellij.openapi.vcs.changes.shelf.ImportIntoShelfAction"/>
144       <separator/>
145       <action id="ShelvedChanges.Rename" class="com.intellij.openapi.vcs.changes.shelf.RenameShelvedChangeListAction"
146               use-shortcut-of="RenameElement"/>
147       <reference ref="$Delete"/>
148       <separator/>
149       <action id="ShelvedChanges.ShowHideDeleted" class="com.intellij.openapi.vcs.changes.shelf.ShowHideRecycledAction" />
150       <action id="ShelvedChanges.DeleteDeleted" class="com.intellij.openapi.vcs.changes.shelf.DeleteAlreadyUnshelvedAction"/>
151     </group>
152
153     <group id="ShelvedChangesToolbar">
154       <reference ref="ShelvedChanges.Diff"/>
155       <reference ref="ChangesView.CreatePatchFromChanges"/>
156     </group>
157
158     <group id="ShelvedChangesToolbarGear" popup="true" icon="AllIcons.General.SecondaryGroup">
159       <reference ref="ShelvedChanges.Unshelve"/>
160       <reference ref="ShelveChanges.UnshelveWithDialog"/>
161       <reference ref="ShelvedChanges.Restore"/>
162       <reference ref="ShelvedChanges.ImportPatches"/>
163       <separator/>
164       <reference ref="ShelvedChanges.Rename" />
165       <reference ref="$Delete" />
166       <separator/>
167       <reference ref="ShelvedChanges.ShowHideDeleted" />
168       <reference ref="ShelvedChanges.DeleteDeleted" />
169     </group>
170
171     <group id="VcsHistoryActionsGroup"/>
172
173     <group id="CommittedChangesToolbar">
174       <action id="CommittedChanges.Refresh" class="com.intellij.openapi.vcs.changes.committed.RefreshCommittedAction"
175               icon="AllIcons.Actions.Refresh"/>
176       <action id="CommittedChanges.Filter" class="com.intellij.openapi.vcs.changes.committed.FilterCommittedAction"
177               icon="AllIcons.General.Filter"/>
178       <action id="CommittedChanges.Details" class="com.intellij.openapi.vcs.changes.committed.ChangeListDetailsAction"
179               icon="AllIcons.Actions.ShowChangesOnly"/>
180       <reference ref="ChangesView.CreatePatchFromChanges"/>
181       <action id="CommittedChanges.Revert" class="com.intellij.openapi.vcs.changes.actions.RevertChangeListAction"
182               icon="AllIcons.Actions.Rollback"/>
183       <action id="CommittedChanges.Clear" class="com.intellij.openapi.vcs.changes.committed.ClearCommittedAction"
184               icon="AllIcons.Vcs.Remove"/>
185     </group>
186
187     <group id="RepositoryChangesBrowserToolbar">
188     </group>
189
190     <group id="IncomingChangesToolbar">
191       <action id="IncomingChanges.Refresh" class="com.intellij.openapi.vcs.changes.committed.RefreshIncomingChangesAction"
192               icon="AllIcons.Actions.Refresh"/>
193       <reference ref="CommittedChanges.Details"/>
194       <!--
195       <action id="IncomingChanges.Get" class="com.intellij.openapi.vcs.changes.committed.GetCommittedChangelistAction"
196               icon="/actions/get.png"/>
197       -->
198       <reference ref="Vcs.UpdateProject"/>
199     </group>
200
201     <group id="Vcs.History">
202       <action id="VcsHistory.ShowAllAffected" class="com.intellij.openapi.vcs.annotate.ShowAllAffectedGenericAction"
203               icon="AllIcons.Vcs.AllRevisions" />
204     </group>
205
206     <action id="ChangesView.Browse" class="com.intellij.openapi.vcs.changes.actions.BrowseChangesAction"/>
207
208     <action id="Diff.PrevChange" class="com.intellij.openapi.vcs.changes.actions.ShowPrevChangeAction"
209       icon="AllIcons.Actions.Prevfile" use-shortcut-of="PreviousTab"/>
210     <action id="Diff.NextChange" class="com.intellij.openapi.vcs.changes.actions.ShowNextChangeAction"
211       icon="AllIcons.Actions.Nextfile" use-shortcut-of="NextTab"/>
212     <action id="Diff.SelectedChange" class="com.intellij.openapi.vcs.changes.actions.ShowSelectedChangeAction"
213       icon="AllIcons.Actions.ShowAsTree" use-shortcut-of="GotoChangedFile"/>
214
215     <group id="EditorGutterVcsPopupMenu">
216       <separator/>
217       <reference ref="Annotate"/>
218       <add-to-group group-id="EditorGutterPopupMenu" anchor="last"/>
219     </group>
220
221     <group id="Vcs.CheckinProjectPopup">
222       <separator/>
223     </group>
224
225     <group id="Vcs.CheckinProjectToolbar">
226     </group>
227
228     <group id="UpdateActionGroup">
229       <reference ref="EditSource"/>
230       <reference ref="$Delete"/>
231       <action id="Diff.UpdatedFiles" class="com.intellij.openapi.vcs.update.ShowUpdatedDiffAction"
232               use-shortcut-of="CompareTwoFiles" icon="AllIcons.Actions.Diff"/>
233     </group>
234
235     <group id="Vcs.MessageActionGroup">
236       <action id="Vcs.CheckCommitMessageSpelling"
237               class="com.intellij.openapi.vcs.actions.CheckCommitMessageSpellingAction"
238               icon="AllIcons.Vcs.CheckSpelling"/>
239       <action id="Vcs.ShowMessageHistory"
240               class="com.intellij.openapi.vcs.actions.ShowMessageHistoryAction"
241               icon="AllIcons.General.MessageHistory"/>
242     </group>
243
244     <group id="VcsToobarActions">
245       <reference ref="Vcs.UpdateProject"/>
246       <reference ref="CheckinProject"/>
247       <reference ref="Compare.SameVersion"/>
248       <reference ref="Vcs.ShowTabbedFileHistory"/>
249       <reference ref="ChangesView.Revert"/>
250       <separator/>
251       <add-to-group group-id="MainToolBarSettings" relative-to-action="ShowSettings" anchor="before"/>
252     </group>
253
254     <group id="VcsNavBarToobarActions">
255       <reference ref="Vcs.UpdateProject"/>
256       <reference ref="CheckinProject"/>
257       <reference ref="Vcs.ShowTabbedFileHistory"/>
258       <reference ref="ChangesView.Revert"/>
259       <separator/>
260       <add-to-group group-id="NavBarVcsGroup" anchor="first"/>
261     </group>
262
263     <action id="Vcs.ShowDiffWithLocal" class="com.intellij.openapi.vcs.history.ShowDiffWithLocalAction"
264             text="Compare with Local" description="Compare version from selected revision with current version"
265             icon="AllIcons.Actions.DiffWithCurrent"/>
266
267     <!-- Window -->
268     <action id="CloseAllUnmodifiedEditors" class="com.intellij.ide.actions.CloseAllUnmodifiedEditorsAction">
269       <add-to-group group-id="CloseEditorsGroup" anchor="before" relative-to-action="CloseAllUnpinnedEditors"/>
270     </action>
271
272     <action id="Vcs.RollbackChangedLines" class="com.intellij.openapi.vcs.ex.RollbackLineStatusAction" icon="AllIcons.Actions.Reset">
273     </action>
274
275     <action id="WelcomeScreen.GetFromVcs" class="com.intellij.openapi.wm.impl.welcomeScreen.GetFromVcsAction"
276       icon="AllIcons.General.GetProjectfromVCS">
277       <add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>
278     </action>
279
280     <action id="Vcs.CopyRevisionNumberAction" class="com.intellij.openapi.vcs.history.CopyRevisionNumberAction"
281             text="Copy Revision Number" description="Copy short revision numbers of selected commits to the clipboard"
282             icon="AllIcons.Actions.Copy" />
283   </actions>
284 </component>