diff options
| author | Thomas Wolf | 2019-03-14 17:48:27 +0000 |
|---|---|---|
| committer | Thomas Wolf | 2019-03-21 18:13:41 +0000 |
| commit | df1a467b47432ab761dcf0c4f0f48869e23a70c2 (patch) | |
| tree | 916a4dbb351792d4448cd683cfc5773134841653 /org.eclipse.egit.ui/plugin.xml | |
| parent | 82d18c1621aac781fe987ab21fda542ae7af904a (diff) | |
| download | egit-df1a467b47432ab761dcf0c4f0f48869e23a70c2.tar.gz egit-df1a467b47432ab761dcf0c4f0f48869e23a70c2.tar.xz egit-df1a467b47432ab761dcf0c4f0f48869e23a70c2.zip | |
Unify "Show in History" commands
Use the same command id for both the "Team" sub-menu and for the
commit editor. Remove the extra command for the commit editor from
plugin.xml, but leave the two different handlers.
Bug: 545031
Change-Id: If9f530c032b6a7cfe11f90cdc19f1bc00f988b83
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui/plugin.xml')
| -rw-r--r-- | org.eclipse.egit.ui/plugin.xml | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index 1b5da6533c..958b4a96a2 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -2572,12 +2572,24 @@ </activeWhen> </handler> <handler - commandId="org.eclipse.egit.ui.commit.ShowInHistory"> + commandId="org.eclipse.egit.ui.team.ShowHistory"> <class class="org.eclipse.egit.ui.internal.commit.command.ShowInHistoryHandler"> </class> <activeWhen> - <reference definitionId="org.eclipse.egit.ui.singleRepositoryCommit" /> + <and> + <with variable="activePart"> + <instanceof value="org.eclipse.egit.ui.internal.commit.CommitEditor" /> + </with> + <count value="1" /> + <iterate> + <adapt type="org.eclipse.egit.core.internal.IRepositoryCommit"> + <not> + <test property="Git.isStash" /> + </not> + </adapt> + </iterate> + </and> </activeWhen> </handler> <handler @@ -5601,12 +5613,7 @@ commandId="org.eclipse.egit.ui.team.ShowHistory" label="%ShowResourceInHistoryAction_label" style="push"> - <visibleWhen - checkEnabled="false"> - <reference - definitionId="org.eclipse.egit.ui.resourcesSingleRepository"> - </reference> - </visibleWhen> + <visibleWhen checkEnabled="true" /> </command> <command commandId="org.eclipse.egit.ui.team.ShowRepositoriesView" @@ -6383,10 +6390,6 @@ icon="icons/obj16/revert.png"> </image> <image - commandId="org.eclipse.egit.ui.commit.ShowInHistory" - icon="icons/obj16/history.png"> - </image> - <image commandId="org.eclipse.egit.ui.team.clean" icon="icons/obj16/clean_obj.png"> </image> @@ -6914,10 +6917,6 @@ name="%RevertCommand.name"> </command> <command - id="org.eclipse.egit.ui.commit.ShowInHistory" - name="%ShowInHistoryCommand.name"> - </command> - <command id="org.eclipse.egit.ui.history.Merge" name="%MergeCommand.name"> </command> |