diff options
| author | Michael Keppler | 2018-09-09 06:55:53 +0000 |
|---|---|---|
| committer | Michael Keppler | 2018-09-23 05:47:15 +0000 |
| commit | 3eaca11b9b74cd3cf0279197d7fd6609ff6d7bca (patch) | |
| tree | e38c0c3ea1cb9c494060cd907d3ae290351c172b /org.eclipse.egit.ui/plugin.xml | |
| parent | e11187de19c43059763aa35c5798e795b4fe4a18 (diff) | |
| download | egit-3eaca11b9b74cd3cf0279197d7fd6609ff6d7bca.tar.gz egit-3eaca11b9b74cd3cf0279197d7fd6609ff6d7bca.tar.xz egit-3eaca11b9b74cd3cf0279197d7fd6609ff6d7bca.zip | |
Unify order of branch context menu items
The order of the menu items Merge, Rebase, Reset, Synchronize in the
repository view context menu is different, depending on whether the menu
is opened on the currently checked out branch or a not checked out
branch.
This change modifies the context menu for not checked out branches to be
more similar to the one for the checked out branch.
Bug: 538844
Change-Id: I19687bd5ca08b4eb1fcb5ba5f943bdc2113baf36
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
Diffstat (limited to 'org.eclipse.egit.ui/plugin.xml')
| -rw-r--r-- | org.eclipse.egit.ui/plugin.xml | 128 |
1 files changed, 64 insertions, 64 deletions
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index f6c259699f..06939640bd 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -3704,40 +3704,6 @@ visible="true"> </separator> <command - commandId="org.eclipse.egit.ui.team.Merge" - icon="icons/obj16/merge.png" - label="%RepoViewMergeSimple.label" - style="push"> - <visibleWhen - checkEnabled="false"> - <and> - <count - value="1"> - </count> - <iterate> - <and> - <or> - <instanceof - value="org.eclipse.egit.ui.internal.repository.tree.TagNode"> - </instanceof> - <instanceof - value="org.eclipse.egit.ui.internal.repository.tree.RefNode"> - </instanceof> - </or> - <test - property="GitRepository.canMerge"> - </test> - <not> - <test - property="GitRepository.isRefCheckedOut"> - </test> - </not> - </and> - </iterate> - </and> - </visibleWhen> - </command> - <command commandId="org.eclipse.ui.edit.delete" label="%DeleteTagCommand.name" style="push"> @@ -3756,36 +3722,6 @@ </visibleWhen> </command> <command - commandId="org.eclipse.egit.ui.team.Rebase" - label="%RebaseCommand.label" - style="push"> - <visibleWhen - checkEnabled="false"> - <and> - <count - value="1"> - </count> - <iterate> - <and> - <test - property="GitRepository.canMerge"> - </test> - <and> - <instanceof - value="org.eclipse.egit.ui.internal.repository.tree.RefNode"> - </instanceof> - <not> - <test - property="GitRepository.isRefCheckedOut"> - </test> - </not> - </and> - </and> - </iterate> - </and> - </visibleWhen> - </command> - <command commandId="org.eclipse.egit.ui.team.Synchronize" icon="icons/obj16/synchronize.png" label="%RepoViewSynchronize.label" @@ -4452,6 +4388,40 @@ <command commandId="org.eclipse.egit.ui.team.Merge" icon="icons/obj16/merge.png" + label="%RepoViewMergeSimple.label" + style="push"> + <visibleWhen + checkEnabled="false"> + <and> + <count + value="1"> + </count> + <iterate> + <and> + <or> + <instanceof + value="org.eclipse.egit.ui.internal.repository.tree.TagNode"> + </instanceof> + <instanceof + value="org.eclipse.egit.ui.internal.repository.tree.RefNode"> + </instanceof> + </or> + <test + property="GitRepository.canMerge"> + </test> + <not> + <test + property="GitRepository.isRefCheckedOut"> + </test> + </not> + </and> + </iterate> + </and> + </visibleWhen> + </command> + <command + commandId="org.eclipse.egit.ui.team.Merge" + icon="icons/obj16/merge.png" label="%RepoViewMerge.label" style="push"> <visibleWhen @@ -4485,6 +4455,36 @@ </command> <command commandId="org.eclipse.egit.ui.team.Rebase" + label="%RebaseCommand.label" + style="push"> + <visibleWhen + checkEnabled="false"> + <and> + <count + value="1"> + </count> + <iterate> + <and> + <test + property="GitRepository.canMerge"> + </test> + <and> + <instanceof + value="org.eclipse.egit.ui.internal.repository.tree.RefNode"> + </instanceof> + <not> + <test + property="GitRepository.isRefCheckedOut"> + </test> + </not> + </and> + </and> + </iterate> + </and> + </visibleWhen> + </command> + <command + commandId="org.eclipse.egit.ui.team.Rebase" label="%RebaseCommand.label2" style="push"> <visibleWhen |