diff: add option to enable align changes in side by side diff
[idea/community.git] / platform / vcs-impl / resources / META-INF / VcsActions.xml
1 <idea-plugin>
2   <actions>
3     <action id="Vcs.ShowTabbedFileHistory" class="com.intellij.openapi.vcs.actions.TabbedShowHistoryAction"
4             icon="AllIcons.Vcs.History"/>
5     <action id="Vcs.ShowHistoryForRevision" class="com.intellij.openapi.vcs.actions.TabbedShowHistoryForRevisionAction"
6             icon="AllIcons.Vcs.History"/>
7
8     <action id="CheckinProject" class="com.intellij.openapi.vcs.actions.CommonCheckinProjectAction" icon="AllIcons.Actions.Commit">
9       <keyboard-shortcut first-keystroke="control K" keymap="$default"/>
10       <add-to-group group-id="SegmentedVcsActionsBarGroup" anchor="first"/>
11     </action>
12     <action id="ChangesView.ToggleCommitUi" class="com.intellij.openapi.vcs.actions.ToggleChangesViewCommitUiAction" use-shortcut-of="CheckinProject">
13       <add-to-group group-id="SegmentedVcsActionsBarGroup" anchor="first"/>
14     </action>
15     <action id="CheckinFiles" class="com.intellij.openapi.vcs.actions.CommonCheckinFilesAction"/>
16     <action id="UpdateFiles" class="com.intellij.openapi.vcs.update.CommonUpdateFileOrDirectoryAction"/>
17     <action id="CheckStatusForFiles" class="com.intellij.openapi.vcs.update.CommonStatusFileOrDirectoryAction"/>
18     <action id="IntegrateFiles" class="com.intellij.openapi.vcs.update.CommonIntegrateFileOrDirectoryAction"/>
19     <action id="Annotate" class="com.intellij.openapi.vcs.actions.AnnotateToggleAction">
20       <synonym key="action.Annotate.synonym1"/>
21       <add-to-group group-id="Diff.EditorPopupMenu"/>
22       <add-to-group group-id="Diff.EditorGutterPopupMenu" anchor="first"/>
23     </action>
24     <action id="Show.Current.Revision" class="com.intellij.openapi.vcs.actions.ShowBaseRevisionAction"/>
25     <action id="Compare.SameVersion" class="com.intellij.openapi.vcs.actions.CompareWithTheSameVersionAction" icon="AllIcons.Actions.Diff"/>
26     <action id="Compare.LastVersion" class="com.intellij.openapi.vcs.actions.CompareWithLastVersion"/>
27     <action id="Compare.Selected" class="com.intellij.openapi.vcs.actions.CompareWithSelectedRevisionAction" popup="true"/>
28     <action id="Compare.Specified" class="com.intellij.openapi.vcs.actions.SelectAndCompareWithSelectedRevisionAction"
29             popup="true"/>
30     <action id="Vcs.ShowHistoryForBlock" class="com.intellij.openapi.vcs.actions.SelectedBlockHistoryAction"/>
31     <action id="Vcs.GetVersion" class="com.intellij.openapi.vcs.history.actions.GetVersionAction"/>
32     <action id="Vcs.RefreshFileHistory" class="com.intellij.openapi.vcs.history.actions.RefreshFileHistoryAction"
33             use-shortcut-of="Refresh"/>
34     <action id="Vcs.ShowDiffWithLocal.Before" class="com.intellij.openapi.vcs.history.actions.ShowDiffBeforeWithLocalAction"/>
35     <action id="Vcs.ShowDiffWithLocal" class="com.intellij.openapi.vcs.history.actions.ShowDiffAfterWithLocalAction"/>
36     <action id="Vcs.VcsClone" class="com.intellij.openapi.wm.impl.welcomeScreen.GetFromVersionControlAction">
37       <synonym key="action.Vcs.VcsClone.text.synonym1"/>
38       <synonym key="action.Vcs.VcsClone.text.synonym2"/>
39     </action>
40     <group class="com.intellij.openapi.vcs.actions.VcsActionGroup" id="VcsGroup"/>
41     <action id="Vcs.UpdateProject" class="com.intellij.openapi.vcs.update.CommonUpdateProjectAction" icon="AllIcons.Actions.CheckOut">
42       <keyboard-shortcut first-keystroke="control T" keymap="$default"/>
43       <add-to-group group-id="SegmentedVcsActionsBarGroup" anchor="first"/>
44     </action>
45     <group class="com.intellij.openapi.vcs.actions.VcsGroupsWrapper" id="VcsFileGroupPopup" popup="true">
46       <add-to-group group-id="VersionControlsGroup" />
47     </group>
48
49     <group id="GoToChangeMarkerGroup">
50       <separator/>
51       <action id="VcsShowNextChangeMarker" class="com.intellij.openapi.vcs.actions.ShowChangeMarkerAction$Next"
52               icon="AllIcons.Actions.NextOccurence"/>
53       <action id="VcsShowPrevChangeMarker" class="com.intellij.openapi.vcs.actions.ShowChangeMarkerAction$Prev"
54               icon="AllIcons.Actions.PreviousOccurence"/>
55
56       <add-to-group group-id="NavigateInFileGroup" anchor="last"/>
57     </group>
58     <action id="VcsShowCurrentChangeMarker" class="com.intellij.openapi.vcs.actions.ShowChangeMarkerAction$Current"/>
59
60     <group id="VcsTouchBarGroup">
61       <reference ref="Vcs.UpdateProject"/>
62       <reference ref="CheckinProject"/>
63       <reference ref="ChangesView.ToggleCommitUi"/>
64       <add-to-group group-id="TouchBarDefaultOptionalGroup" anchor="first" />
65     </group>
66
67     <action id="ChangesView.Refresh" class="com.intellij.openapi.vcs.changes.actions.RefreshAction"
68             icon="AllIcons.Actions.Refresh">
69       <override-text place="MainMenu"/>
70       <override-text place="GoToAction" use-text-of-place="MainMenu"/>
71     </action>
72
73     <!-- Main menu | Version Control -->
74     <group id="VcsGroups" class="com.intellij.openapi.vcs.actions.VcsGroupsActionGroup" popup="true">
75       <group id="Vcs.MainMenu" class="com.intellij.openapi.vcs.actions.VcsMainMenuActionGroup">
76         <action id="Start.Use.Vcs" class="com.intellij.ide.actions.StartUseVcsAction"/>
77         <separator/>
78         <group class="com.intellij.openapi.vcs.actions.VcsActionGroup" id="VcsGlobalGroup">
79
80           <action id="Vcs.QuickListPopupAction"
81                   class="com.intellij.openapi.vcs.actions.VcsQuickListPopupAction"/>
82           <reference ref="CheckinProject"/>
83           <reference ref="ChangesView.ToggleCommitUi"/>
84           <reference ref="Vcs.UpdateProject"/>
85           <action id="Vcs.IntegrateProject" class="com.intellij.openapi.vcs.update.CommonIntegrateProjectAction"/>
86           <reference ref="ChangesView.Refresh"/>
87           <separator/>
88           <group id="Vcs.Specific" class="com.intellij.ide.actions.NonEmptyActionGroup"/>
89           <separator/>
90           <action id="ChangesView.CreatePatch" class="com.intellij.openapi.vcs.changes.actions.CreatePatchAction"
91                   icon="AllIcons.Vcs.Patch"/>
92           <action id="ChangesView.ApplyPatch" class="com.intellij.openapi.vcs.changes.patch.ApplyPatchAction">
93             <add-to-group group-id="ProjectViewPopupMenu" relative-to-action="ProjectViewEditSource" anchor="after"/>
94             <add-to-group group-id="NavbarPopupMenu" relative-to-action="EditSource" anchor="after"/>
95             <add-to-group group-id="FavoritesViewPopupMenu" relative-to-action="EditSource" anchor="after"/>
96           </action>
97           <action id="ChangesView.ApplyPatchFromClipboard" class="com.intellij.openapi.vcs.changes.patch.ApplyPatchFromClipboardAction"/>
98           <action id="ChangesView.Shelve" class="com.intellij.openapi.vcs.changes.shelf.ShelveChangesAction" icon="AllIcons.Vcs.Shelve"/>
99         </group>
100
101         <separator/>
102         <reference id="Vcs.VcsClone"/>
103         <group id="Vcs.Browse" class="com.intellij.ide.actions.NonEmptyActionGroup" popup="true"/>
104         <separator/>
105         <group id="Vcs.Import" class="com.intellij.ide.actions.NonEmptyActionGroup"/>
106       </group>
107
108       <add-to-group group-id="MainMenu" anchor="after" relative-to-action="ToolsMenu"/>
109
110     </group>
111
112     <group id="Patch.MainMenu" popup="true">
113       <reference ref="ChangesView.CreatePatch"/>
114       <reference ref="ChangesView.ApplyPatch"/>
115       <reference ref="ChangesView.ApplyPatchFromClipboard"/>
116     </group>
117
118     <group id="Vcs.UmlDiff">
119     </group>
120
121     <action id="ChangesView.Revert" class="com.intellij.openapi.vcs.changes.actions.RollbackAction"
122             icon="AllIcons.Actions.Rollback"/>
123     <action id="ChangesView.RevertFiles" class="com.intellij.openapi.vcs.changes.actions.RollbackFilesAction"/>
124
125     <group id="ChangesView.ViewOptions"/>
126
127     <group id="ChangesView.GroupBy" icon="AllIcons.Actions.GroupBy" popup="true"
128            class="com.intellij.openapi.vcs.changes.actions.SelectChangesGroupingActionGroup">
129       <separator key="group.ChangesView.GroupBy.text"/>
130       <action id="ChangesView.GroupBy.Directory"
131               class="com.intellij.openapi.vcs.changes.actions.SetDirectoryChangesGroupingAction"/>
132       <add-to-group group-id="Vcs.KeymapGroup"/>
133     </group>
134
135     <group id="ChangesViewToolbar">
136       <reference ref="ChangesView.Refresh"/>
137       <reference ref="CheckinProject"/>
138       <reference ref="ChangesView.ToggleCommitUi"/>
139       <reference ref="ChangesView.Revert"/>
140       <action id="ChangesView.Diff" class="com.intellij.diff.actions.ShowDiffAction" icon="AllIcons.Actions.Diff"
141               use-shortcut-of="Diff.ShowDiff"/>
142       <group icon="AllIcons.Vcs.Changelist" id="ChangesView.Changelists" popup="true">
143         <action id="ChangesView.NewChangeList" class="com.intellij.openapi.vcs.changes.actions.AddChangeListAction"
144                 icon="AllIcons.General.Add"/>
145         <action id="ChangesView.Rename" class="com.intellij.openapi.vcs.changes.actions.RenameChangeListAction"
146                 icon="AllIcons.Actions.Edit"/>
147         <action id="ChangesView.RemoveChangeList" class="com.intellij.openapi.vcs.changes.actions.RemoveChangeListAction"
148                 icon="AllIcons.General.Remove"/>
149         <action id="ChangesView.SetDefault" class="com.intellij.openapi.vcs.changes.actions.SetDefaultChangeListAction"
150                 icon="AllIcons.Actions.Selectall"/>
151         <action id="ChangesView.Move" class="com.intellij.openapi.vcs.changes.actions.MoveChangesToAnotherListAction"/>
152       </group>
153       <action id="ChangesView.ShelveSilently" class="com.intellij.openapi.vcs.changes.actions.ShelveSilentlyAction"
154               icon="AllIcons.Vcs.ShelveSilent">
155         <keyboard-shortcut first-keystroke="shift control H" keymap="$default"/>
156       </action>
157     </group>
158     <action id="ChangesView.SaveToShelve" class="com.intellij.openapi.vcs.changes.actions.SaveToShelveAction"/>
159
160     <action id="Vcs.Diff.ShowCombinedDiff" class="com.intellij.openapi.vcs.changes.actions.diff.ShowCombinedDiffAction"
161             icon="AllIcons.Actions.Diff"/>
162
163     <group id="ChangesViewPopupMenu">
164       <reference ref="CheckinFiles"/>
165       <reference ref="ChangesView.Revert"/>
166       <reference ref="ChangesView.RevertFiles"/>
167       <reference ref="ChangesView.Move"/>
168       <reference ref="Diff.ShowDiff"/>
169       <reference ref="Diff.ShowStandaloneDiff"/>
170       <reference ref="EditSource"/>
171       <separator/>
172       <reference ref="$Delete"/>
173       <action id="ChangesView.AddUnversioned"
174               class="com.intellij.openapi.vcs.changes.actions.ScheduleForAdditionWithIgnoredFilesConfirmationAction">
175         <keyboard-shortcut first-keystroke="control alt A" keymap="$default"/>
176       </action>
177       <action id="ChangesView.RemoveDeleted" class="com.intellij.openapi.vcs.changes.actions.ScheduleForRemovalAction"
178               icon="AllIcons.General.Remove"/>
179       <action id="ChangesView.Edit" class="com.intellij.openapi.vcs.changes.actions.EditAction"/>
180       <separator/>
181       <reference ref="ChangesView.NewChangeList"/>
182       <reference ref="ChangesView.RemoveChangeList"/>
183       <reference ref="ChangesView.SetDefault"/>
184       <reference ref="ChangesView.Rename"/>
185       <reference ref="ChangesView.CreatePatch"/>
186       <action id="ChangesView.CreatePatchToClipboard" class="com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction$Clipboard"/>
187       <reference ref="ChangesView.Shelve"/>
188       <separator/>
189       <reference ref="ChangesView.Refresh"/>
190       <separator/>
191       <reference ref="VersionControlsGroup"/>
192     </group>
193
194     <group id="Unversioned.Files.Dialog">
195       <reference ref="ChangesView.AddUnversioned"/>
196       <reference ref="$Delete"/>
197     </group>
198     <group id="Unversioned.Files.Dialog.Popup">
199       <reference ref="ChangesView.AddUnversioned"/>
200       <reference ref="ChangesView.Move"/>
201       <reference ref="$Delete"/>
202     </group>
203
204     <group id="ShelvedChangesPopupMenu" popup="true">
205       <action id="ShelveChanges.UnshelveWithDialog" class="com.intellij.openapi.vcs.changes.shelf.UnshelveWithDialogAction"
206               icon="AllIcons.Vcs.Unshelve"/>
207       <action id="ShelvedChanges.Restore" class="com.intellij.openapi.vcs.changes.shelf.RestoreShelvedChange"/>
208       <reference id="Diff.ShowDiff"/>
209       <reference ref="Diff.ShowStandaloneDiff"/>
210       <reference id="Vcs.ShowDiffWithLocal"/>
211       <action id="ChangesView.CreatePatchFromChanges" class="com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction$Dialog"
212               icon="AllIcons.Vcs.Patch"/>
213       <reference ref="ChangesView.CreatePatchToClipboard"/>
214       <action id="ShelvedChanges.ImportPatches" class="com.intellij.openapi.vcs.changes.shelf.ImportIntoShelfAction"/>
215       <separator/>
216       <action id="ShelvedChanges.Rename" class="com.intellij.openapi.vcs.changes.shelf.RenameShelvedChangeListAction"/>
217       <reference ref="$Delete"/>
218       <separator/>
219       <action id="ShelvedChanges.ShowHideDeleted" class="com.intellij.openapi.vcs.changes.shelf.ShowHideRecycledAction"/>
220       <action id="ShelvedChanges.ShowRecentlyDeleted" class="com.intellij.openapi.vcs.changes.shelf.ShowRecentlyDeletedShelvesAction"/>
221       <action id="ShelvedChanges.CleanMarkedToDelete" class="com.intellij.openapi.vcs.changes.shelf.CleanUnshelvedAction"
222               icon="AllIcons.Actions.GC"/>
223     </group>
224
225     <group id="ShelvedChangesToolbar">
226       <action id="ChangesView.UnshelveSilently" class="com.intellij.openapi.vcs.changes.actions.UnshelveSilentlyAction"
227               icon="AllIcons.Vcs.UnshelveSilent">
228         <keyboard-shortcut first-keystroke="control alt U" keymap="$default"/>
229       </action>
230       <reference ref="Diff.ShowDiff"/>
231       <reference ref="ShelvedChanges.CleanMarkedToDelete"/>
232       <separator/>
233       <reference ref="ChangesView.GroupBy"/>
234       <reference ref="ShelvedChanges.ShowHideDeleted"/>
235       <reference ref="ExpandAll"/>
236       <reference ref="CollapseAll"/>
237     </group>
238
239     <!--a group for plugins to add their actions-->
240     <group id="VcsHistoryActionsGroup"/>
241     <group id="VcsHistoryActionsGroup.Toolbar"/>
242
243     <action id="FileHistory.AnnotateRevision" class="com.intellij.openapi.vcs.history.actions.AnnotateRevisionAction"/>
244
245     <group id="VcsHistoryInternalGroup.Popup">
246       <reference ref="Diff.ShowDiff"/>
247       <reference ref="Vcs.ShowDiffWithLocal"/>
248       <reference ref="VcsHistoryActionsGroup"/>
249       <reference ref="ChangesView.CreatePatchFromChanges"/>
250       <reference ref="Vcs.GetVersion"/>
251       <reference ref="FileHistory.AnnotateRevision"/>
252     </group>
253
254     <group id="VcsHistoryInternalGroup.Toolbar">
255       <reference ref="Diff.ShowDiff"/>
256       <reference ref="VcsHistoryActionsGroup.Toolbar"/>
257       <reference ref="Vcs.RefreshFileHistory"/>
258     </group>
259
260     <group id="CommittedChangesToolbar">
261       <action id="CommittedChanges.Refresh" class="com.intellij.openapi.vcs.changes.committed.RefreshCommittedAction"
262               icon="AllIcons.Actions.Refresh"/>
263       <action id="CommittedChanges.Filter" class="com.intellij.openapi.vcs.changes.committed.FilterCommittedAction"
264               icon="AllIcons.General.Filter"/>
265       <action id="CommittedChanges.Details" class="com.intellij.openapi.vcs.changes.committed.ChangeListDetailsAction"
266               icon="AllIcons.Actions.Preview"/>
267       <reference ref="ChangesView.CreatePatchFromChanges"/>
268       <action id="CommittedChanges.Revert" class="com.intellij.openapi.vcs.changes.actions.RevertChangeListAction"
269               icon="AllIcons.Actions.Rollback"/>
270       <action id="CommittedChanges.Clear" class="com.intellij.openapi.vcs.changes.committed.ClearCommittedAction"
271               icon="AllIcons.Actions.GC"/>
272     </group>
273
274     <action id="Vcs.EditSource" class="com.intellij.openapi.vcs.changes.committed.EditSourceFromChangesBrowserAction"
275             icon="AllIcons.Actions.EditSource" use-shortcut-of="EditSource"/>
276     <action id="Vcs.OpenRepositoryVersion" class="com.intellij.openapi.vcs.changes.actions.OpenRepositoryVersionAction"/>
277     <action id="Vcs.RevertSelectedChanges" class="com.intellij.openapi.vcs.changes.actions.RevertSelectedChangesAction$Revert"
278             icon="AllIcons.Actions.Rollback"/>
279     <action id="Vcs.ApplySelectedChanges" class="com.intellij.openapi.vcs.changes.actions.RevertSelectedChangesAction$Apply"/>
280
281     <group id="Vcs.RepositoryChangesBrowserToolbar">
282       <reference ref="Vcs.RevertSelectedChanges"/>
283       <reference ref="Vcs.ShowHistoryForRevision"/>
284     </group>
285
286     <group id="ChangesBrowser.FiltererGroup" class="com.intellij.openapi.vcs.changes.ui.browser.ChangesFilterer$FilterGroup"/>
287
288     <group id="Vcs.RepositoryChangesBrowserMenu">
289       <reference ref="Vcs.ShowDiffWithLocal"/>
290       <reference ref="Vcs.ShowDiffWithLocal.Before"/>
291       <reference ref="Vcs.EditSource"/>
292       <reference ref="Vcs.OpenRepositoryVersion"/>
293       <reference ref="Vcs.RevertSelectedChanges"/>
294       <reference ref="Vcs.ApplySelectedChanges"/>
295       <reference ref="Vcs.ShowHistoryForRevision"/>
296     </group>
297
298     <!--deprecated, to be removed after plugins start using Vcs.RepositoryChangesBrowserToolbar-->
299     <group id="RepositoryChangesBrowserToolbar">
300       <reference ref="Vcs.ShowHistoryForRevision"/>
301     </group>
302
303     <group id="IncomingChangesToolbar">
304       <action id="IncomingChanges.Refresh" class="com.intellij.openapi.vcs.changes.committed.RefreshIncomingChangesAction"
305               icon="AllIcons.Actions.Refresh"/>
306       <reference ref="CommittedChanges.Details"/>
307       <reference ref="Vcs.UpdateProject"/>
308     </group>
309
310     <group id="Vcs.History">
311       <action id="VcsHistory.ShowAllAffected" class="com.intellij.openapi.vcs.annotate.ShowAllAffectedGenericAction"
312               icon="AllIcons.Actions.ListChanges" />
313     </group>
314
315     <action id="ChangesView.Browse" class="com.intellij.openapi.vcs.changes.committed.BrowseCommittedChangesAction"/>
316
317     <group id="EditorGutterVcsPopupMenu">
318       <reference ref="Annotate"/>
319       <add-to-group group-id="EditorGutterPopupMenu" anchor="first"/>
320       <separator/>
321     </group>
322
323     <group id="Vcs.CheckinProjectToolbar">
324     </group>
325     <group id="Vcs.CheckinProjectMenu">
326     </group>
327
328     <group id="UpdateActionGroup">
329       <reference ref="EditSource"/>
330       <reference ref="$Delete"/>
331       <reference id="Diff.ShowDiff"/>
332     </group>
333
334     <action id="Vcs.ReformatCommitMessage" class="com.intellij.vcs.commit.message.ReformatCommitMessageAction" use-shortcut-of="ReformatCode"/>
335     <group id="Vcs.MessageActionGroup">
336       <action id="Vcs.ShowMessageHistory"
337               class="com.intellij.openapi.vcs.actions.ShowMessageHistoryAction"
338               icon="AllIcons.Vcs.History"/>
339     </group>
340
341     <group id="Vcs.Commit.PrimaryCommitActions"/>
342     <group id="Vcs.CommitExecutor.Actions"/>
343
344     <group id="ChangesView.CommitToolbar">
345       <action id="Vcs.ToggleAmendCommitMode" class="com.intellij.vcs.commit.ToggleAmendCommitModeAction"/>
346       <action id="ChangesView.ShowCommitOptions" class="com.intellij.openapi.vcs.actions.ShowCommitOptionsAction"/>
347       <reference id="Vcs.MessageActionGroup"/>
348     </group>
349
350     <action id="Vcs.RunCommitChecks" class="com.intellij.vcs.commit.RunCommitChecksAction"/>
351
352     <action class="com.intellij.openapi.vcs.actions.VcsToolbarLabelAction" id="VcsToolbarLabelAction"/>
353
354     <group id="VcsToolbarActions">
355       <reference ref="VcsToolbarLabelAction"/>
356       <reference ref="Vcs.UpdateProject"/>
357       <reference ref="CheckinProject"/>
358       <reference ref="ChangesView.ToggleCommitUi"/>
359       <reference ref="Compare.SameVersion"/>
360       <reference ref="Vcs.ShowTabbedFileHistory"/>
361       <reference ref="ChangesView.Revert"/>
362       <separator/>
363       <add-to-group group-id="MainToolBarSettings"/>
364     </group>
365
366     <group id="VcsNavBarToolbarActions">
367       <reference ref="VcsToolbarLabelAction"/>
368       <reference ref="Vcs.UpdateProject"/>
369       <reference ref="CheckinProject"/>
370       <reference ref="ChangesView.ToggleCommitUi"/>
371       <reference ref="Vcs.ShowTabbedFileHistory"/>
372       <reference ref="ChangesView.Revert"/>
373       <separator/>
374       <add-to-group group-id="NavBarVcsGroup" anchor="first"/>
375     </group>
376
377  <!-- Window -->
378     <action id="CloseAllUnmodifiedEditors" class="com.intellij.ide.actions.CloseAllUnmodifiedEditorsAction">
379       <add-to-group group-id="CloseEditorsGroup" anchor="after" relative-to-action="CloseAllEditors"/>
380     </action>
381
382     <action id="Vcs.RollbackChangedLines" class="com.intellij.openapi.vcs.ex.RollbackLineStatusAction" icon="AllIcons.Actions.Rollback"/>
383     <action id="Vcs.MoveChangedLinesToChangelist" class="com.intellij.openapi.vcs.ex.MoveChangesLineStatusAction"/>
384     <action id="Vcs.Diff.ExcludeChangedLinesFromCommit" class="com.intellij.openapi.actionSystem.EmptyAction">
385       <add-to-group group-id="Diff.KeymapGroup" relative-to-action="Diff.ResolveConflict" anchor="after"/>
386     </action>
387     <action id="Vcs.Diff.IncludeOnlyChangedLinesIntoCommit" class="com.intellij.openapi.actionSystem.EmptyAction">
388       <add-to-group group-id="Diff.KeymapGroup" relative-to-action="Vcs.Diff.ExcludeChangedLinesFromCommit" anchor="after"/>
389     </action>
390     <action id="Vcs.Diff.ShowDiffInEditorTab" class="com.intellij.openapi.vcs.changes.actions.diff.MoveDiffPreviewToEditorAction">
391       <add-to-group group-id="Diff.EditorGutterPopupMenu.EditorSettings" anchor="last"/>
392       <add-to-group group-id="Diff.Binary.Settings" anchor="last"/>
393     </action>
394     <action id="Vcs.Diff.ToggleDiffAligningMode" class="com.intellij.diff.actions.impl.ToggleDiffAligningModeAction">
395       <add-to-group group-id="Diff.EditorGutterPopupMenu.EditorSettings"/>
396       <override-text place="popup@DiffToolbar"/>
397     </action>
398     <group>
399       <action id="Vcs.Diff.ShowDiffInNewWindow"
400               icon="AllIcons.Actions.MoveToWindow"
401               class="com.intellij.openapi.vcs.changes.actions.diff.MoveDiffPreviewToNewWindowAction">
402         <add-to-group group-id="Diff.Binary.Settings"/>
403       </action>
404       <separator/>
405       <add-to-group group-id="EditorTabPopupMenu" anchor="before" relative-to-action="SplitVertically"/>
406       <add-to-group group-id="Diff.EditorGutterPopupMenu.EditorSettings" anchor="last"/>
407     </group>
408
409     <reference ref="Vcs.VcsClone">
410       <add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>
411     </reference>
412
413     <action id="Vcs.CopyRevisionNumberAction" class="com.intellij.openapi.vcs.history.actions.CopyRevisionNumberAction"
414             icon="AllIcons.Actions.Copy" use-shortcut-of="CopyReference"/>
415
416     <group id="VcsSelectionHistoryDialog.Popup">
417       <reference id="Diff.ShowDiff"/>
418       <reference id="Vcs.ShowDiffWithLocal"/>
419       <reference id="VcsHistory.ShowAllAffected"/>
420       <reference id="Vcs.CopyRevisionNumberAction"/>
421     </group>
422
423     <group id="Shelve.KeymapGroup" searchable="false">
424       <reference ref="ChangesView.Shelve"/>
425       <reference ref="ChangesView.ShelveSilently"/>
426       <reference ref="ChangesView.SaveToShelve"/>
427       <reference ref="ShelveChanges.UnshelveWithDialog"/>
428       <reference ref="ChangesView.UnshelveSilently"/>
429       <reference ref="ShelvedChanges.Restore"/>
430       <reference ref="ShelvedChanges.ImportPatches"/>
431       <separator/>
432       <reference ref="ShelvedChanges.Rename"/>
433       <separator/>
434       <reference ref="Diff.ShowDiff"/>
435       <reference ref="ChangesView.CreatePatchFromChanges"/>
436       <separator/>
437       <reference ref="ShelvedChanges.ShowHideDeleted"/>
438       <reference ref="ShelvedChanges.CleanMarkedToDelete"/>
439       <separator/>
440
441       <add-to-group group-id="Vcs.KeymapGroup" anchor="first"/>
442     </group>
443
444     <group id="FileHistory.KeymapGroup" searchable="false">
445       <reference id="Vcs.GetVersion"/>
446       <reference id="FileHistory.AnnotateRevision"/>
447
448       <add-to-group group-id="Vcs.KeymapGroup"/>
449     </group>
450
451     <group>
452       <reference ref="Vcs.ToggleAmendCommitMode"/>
453       <reference ref="CheckinProject"/>
454       <reference ref="CheckinFiles"/>
455       <reference ref="Vcs.RunCommitChecks"/>
456       <reference ref="ChangesView.ShowCommitOptions"/>
457       <reference ref="UpdateFiles"/>
458       <reference ref="CheckStatusForFiles"/>
459       <reference ref="IntegrateFiles"/>
460       <separator/>
461       <reference ref="Show.Current.Revision"/>
462       <reference ref="Vcs.ShowHistoryForBlock"/>
463       <reference ref="Vcs.ShowTabbedFileHistory"/>
464       <reference ref="Vcs.ShowHistoryForRevision"/>
465       <reference ref="VcsHistory.ShowAllAffected"/>
466       <reference ref="Compare.Specified"/>
467       <reference ref="Compare.Selected"/>
468       <reference ref="Annotate"/>
469       <separator/>
470       <reference ref="VcsShowNextChangeMarker"/>
471       <reference ref="VcsShowPrevChangeMarker"/>
472       <reference ref="VcsShowCurrentChangeMarker"/>
473       <reference ref="Vcs.RollbackChangedLines"/>
474       <reference ref="Vcs.MoveChangedLinesToChangelist"/>
475       <separator/>
476       <reference ref="Start.Use.Vcs"/>
477       <reference ref="Vcs.QuickListPopupAction"/>
478       <reference ref="Vcs.UpdateProject"/>
479       <reference ref="Vcs.IntegrateProject"/>
480       <separator/>
481       <reference ref="ChangesView.Browse"/>
482       <reference ref="ChangesView.CreatePatch"/>
483       <reference ref="ChangesView.CreatePatchToClipboard"/>
484       <reference ref="ChangesView.ApplyPatch"/>
485       <reference ref="ChangesView.ApplyPatchFromClipboard"/>
486       <reference ref="ChangesView.Revert"/>
487       <reference ref="ChangesView.RevertFiles"/>
488       <reference ref="ChangesView.Refresh"/>
489       <reference ref="ChangesView.NewChangeList"/>
490       <reference ref="ChangesView.RemoveChangeList"/>
491       <reference ref="ChangesView.SetDefault"/>
492       <reference ref="ChangesView.Move"/>
493       <reference ref="Diff.ShowDiff"/>
494       <reference ref="$Delete"/>
495       <reference ref="ChangesView.AddUnversioned"/>
496       <reference ref="ChangesView.RemoveDeleted"/>
497       <reference ref="ChangesView.Edit"/>
498       <reference ref="ChangesView.Rename"/>
499       <separator/>
500       <reference ref="CommittedChanges.Refresh"/>
501       <reference ref="CommittedChanges.Filter"/>
502       <reference ref="CommittedChanges.Details"/>
503       <reference ref="CommittedChanges.Revert"/>
504       <reference ref="CommittedChanges.Clear"/>
505       <reference ref="IncomingChanges.Refresh"/>
506       <separator/>
507       <reference ref="Vcs.ShowDiffWithLocal"/>
508       <reference ref="Vcs.ShowDiffWithLocal.Before"/>
509       <reference ref="Vcs.EditSource"/>
510       <reference ref="Vcs.OpenRepositoryVersion"/>
511       <reference ref="Vcs.RevertSelectedChanges"/>
512       <reference ref="Vcs.ApplySelectedChanges"/>
513       <separator/>
514       <reference ref="Vcs.ShowMessageHistory"/>
515       <reference ref="CloseAllUnmodifiedEditors"/>
516       <reference ref="Vcs.VcsClone"/>
517       <reference ref="Vcs.CopyRevisionNumberAction"/>
518       <separator/>
519
520       <add-to-group group-id="VcsGeneral.KeymapGroup"/>
521     </group>
522
523     <group>
524       <reference ref="Compare.SameVersion"/>
525       <reference ref="Compare.LastVersion"/>
526       <reference ref="Compare.Specified"/>
527       <reference ref="Vcs.ShowDiffWithLocal.Before"/>
528       <reference ref="Vcs.ShowDiffWithLocal"/>
529       <separator/>
530
531       <add-to-group group-id="Diff.KeymapGroup" anchor="after" relative-to-action="CompareClipboardWithSelection"/>
532     </group>
533
534     <group id="CommitView.GearActions">
535       <action id="CommitView.SwitchToCommitDialog" class="com.intellij.vcs.commit.SwitchToCommitDialogAction"/>
536       <group id="CommitView.ShowOnDoubleClick" popup="true" searchable="false">
537         <action id="CommitView.ShowOnDoubleClick.EditorPreview"
538                 class="com.intellij.openapi.vcs.changes.actions.ShowOnDoubleClickToggleAction$CommitView$EditorPreview">
539           <override-text place="ToolwindowPopup"/>
540         </action>
541         <action id="CommitView.ShowOnDoubleClick.Source"
542                 class="com.intellij.openapi.vcs.changes.actions.ShowOnDoubleClickToggleAction$CommitView$Source">
543           <override-text place="ToolwindowPopup"/>
544         </action>
545       </group>
546
547       <add-to-group group-id="VcsGeneral.KeymapGroup"/>
548     </group>
549
550     <group id="LocalChangesView.GearActions">
551       <group id="LocalChangesView.ShowOnDoubleClick" popup="true" searchable="false" class="com.intellij.ide.actions.NonEmptyActionGroup">
552         <action id="LocalChangesView.ShowOnDoubleClick.EditorPreview"
553                 class="com.intellij.openapi.vcs.changes.actions.ShowOnDoubleClickToggleAction$LocalChangesView$EditorPreview"
554                 use-shortcut-of="CommitView.ShowOnDoubleClick.EditorPreview">
555           <override-text place="ToolwindowPopup"/>
556         </action>
557         <action id="LocalChangesView.ShowOnDoubleClick.Source"
558                 class="com.intellij.openapi.vcs.changes.actions.ShowOnDoubleClickToggleAction$LocalChangesView$Source"
559                 use-shortcut-of="CommitView.ShowOnDoubleClick.Source">
560           <override-text place="ToolwindowPopup"/>
561         </action>
562       </group>
563
564       <add-to-group group-id="VcsGeneral.KeymapGroup"/>
565     </group>
566
567     <group id="Vcs.Show.Toolwindow.Tab">
568       <add-to-group group-id="VcsGeneral.KeymapGroup"/>
569       <action id="Vcs.Show.Local.Changes" class="com.intellij.vcs.VcsShowLocalChangesAction"/>
570       <action id="Vcs.Show.Shelf" class="com.intellij.vcs.VcsShowShelfAction"/>
571     </group>
572
573     <action id="AnnotateStackTraceAction.show.files.modification.info"
574             class="com.intellij.unscramble.AnnotateStackTraceAction" icon="AllIcons.Actions.Annotate">
575       <add-to-group group-id="AnalyzeStacktraceToolbar" anchor="first" />
576     </action>
577
578     <action id="Vcs.Operations.Popup.Annotate" class="com.intellij.openapi.vcs.actions.ShowAnnotateOperationsPopup">
579       <add-to-group group-id="VcsGeneral.KeymapGroup"/>
580     </action>
581
582     <group id="Vcs.Operations.Popup">
583       <group id="Vcs.Operations.Popup.VcsAware" class="com.intellij.openapi.vcs.actions.VcsQuickListPopupAction$VcsAware">
584         <group id="Vcs.Operations.Popup.VcsNameSeparator" class="com.intellij.openapi.vcs.actions.VcsQuickListPopupAction$VcsNameSeparator"/>
585         <reference id="ChangesView.AddUnversioned"/>
586         <reference id="CheckinProject"/>
587         <reference ref="ChangesView.ToggleCommitUi"/>
588         <reference id="CheckinFiles"/>
589         <reference id="ChangesView.Revert"/>
590         <separator/>
591         <reference id="Vcs.ShowTabbedFileHistory"/>
592         <reference id="Annotate"/>
593         <reference id="Compare.SameVersion"/>
594       </group>
595       <separator/>
596       <group id="Vcs.Operations.Popup.Vcs.Providers"
597              class="com.intellij.openapi.vcs.actions.VcsQuickListPopupAction$Providers"/>
598       <group id="Vcs.Operations.Popup.NonVcsAware" class="com.intellij.openapi.vcs.actions.VcsQuickListPopupAction$NonVcsAware">
599         <reference id="Start.Use.Vcs"/>
600       </group>
601       <separator/>
602       <group class="com.intellij.openapi.vcs.actions.ShowAnnotateOperationsPopup$Group" popup="true" id="ShowAnnotateOperationsPopupGroup"/>
603     </group>
604
605   </actions>
606 </idea-plugin>