diff options
| author | Thomas Wolf | 2019-03-14 17:29:47 +0000 |
|---|---|---|
| committer | Thomas Wolf | 2019-03-21 18:13:41 +0000 |
| commit | 82d18c1621aac781fe987ab21fda542ae7af904a (patch) | |
| tree | fedd7be3e474e71ad7862d652d6c32ad26a25972 /org.eclipse.egit.ui/plugin.xml | |
| parent | d5bcdd4b06eb5f8d5b2832bc9d12036f9f93c19e (diff) | |
| download | egit-82d18c1621aac781fe987ab21fda542ae7af904a.tar.gz egit-82d18c1621aac781fe987ab21fda542ae7af904a.tar.xz egit-82d18c1621aac781fe987ab21fda542ae7af904a.zip | |
Unify "Cherry-Pick" commands
Remove the one from the history view, give the one from the commit
editor a new command id and a category.
Change-Id: I9600b98ed91bd89c0338263dfa7b166b8763daad
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 | 50 |
1 files changed, 19 insertions, 31 deletions
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index 42a0b3503e..1b5da6533c 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -1134,6 +1134,11 @@ id="org.eclipse.egit.ui.team.Disconnect" name="%DisconnectCommand.name"> </command> + <command + categoryId="org.eclipse.egit.ui.commandCategory" + id="org.eclipse.egit.ui.team.CherryPick" + name="%CherryPickCommand.name"> + </command> </extension> <extension point="org.eclipse.ui.handlers"> @@ -2576,12 +2581,22 @@ </activeWhen> </handler> <handler - commandId="org.eclipse.egit.ui.commit.CherryPick"> + commandId="org.eclipse.egit.ui.team.CherryPick"> <class class="org.eclipse.egit.ui.internal.commit.command.CherryPickHandler"> </class> <activeWhen> - <reference definitionId="org.eclipse.egit.ui.singleRepositoryCommit" /> + <and> + <count value="1" /> + <iterate> + <adapt type="org.eclipse.egit.core.internal.IRepositoryCommit"> + <not> + <test property="Git.isStash" /> + </not> + <test property="Git.isSafe" /> + </adapt> + </iterate> + </and> </activeWhen> </handler> <handler @@ -2896,21 +2911,6 @@ </activeWhen> </handler> <handler - commandId="org.eclipse.egit.ui.history.CherryPick"> - <class - class="org.eclipse.egit.ui.internal.history.command.CherryPickHandler"> - </class> - <activeWhen> - <and> - <count value="1" /> - <iterate> - <instanceof value="org.eclipse.egit.ui.internal.history.SWTCommit" /> - <test property="Git.isSafe" /> - </iterate> - </and> - </activeWhen> - </handler> - <handler commandId="org.eclipse.egit.ui.history.Merge"> <class class="org.eclipse.egit.ui.internal.history.command.MergeHandler"> @@ -3511,7 +3511,7 @@ <visibleWhen checkEnabled="true" /> </command> <command - commandId="org.eclipse.egit.ui.history.CherryPick" + commandId="org.eclipse.egit.ui.team.CherryPick" label="%HistoryCherryPick.label" style="push"> <visibleWhen checkEnabled="true" /> @@ -6139,11 +6139,7 @@ icon="icons/obj16/history.png"> </image> <image - commandId="org.eclipse.egit.ui.history.CherryPick" - icon="icons/obj16/cherry-pick.png"> - </image> - <image - commandId="org.eclipse.egit.ui.commit.CherryPick" + commandId="org.eclipse.egit.ui.team.CherryPick" icon="icons/obj16/cherry-pick.png"> </image> <image @@ -6883,14 +6879,6 @@ name="%OpenInTextEditorCommand.name"> </command> <command - id="org.eclipse.egit.ui.history.CherryPick" - name="%CherryPickCommand.name"> - </command> - <command - id="org.eclipse.egit.ui.commit.CherryPick" - name="%CherryPickCommand.name"> - </command> - <command id="org.eclipse.egit.ui.history.Squash" name="%SquashCommitsCommand.name"> </command> |