Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2019-08-13 04:59:00 -0400
committerMichael Keppler2019-08-20 10:20:25 -0400
commita3cbbff0ea6af88f8b2db463633cdd0fe9c9b026 (patch)
tree3b23cb2f54442455a75469217365b35acd569de8 /org.eclipse.egit.ui
parent2353ea858e20fb5df2b950659049dae43bdd76f3 (diff)
downloadegit-a3cbbff0ea6af88f8b2db463633cdd0fe9c9b026.tar.gz
egit-a3cbbff0ea6af88f8b2db463633cdd0fe9c9b026.tar.xz
egit-a3cbbff0ea6af88f8b2db463633cdd0fe9c9b026.zip
Remove duplicate configure fetch/push commands
The commands "configure fetch" and "configure upstream fetch" use the same handler and the same label, therefore one of them is superfluous. Remove the one without ".team" in the command id, since ".team" is a convention in the list of command ids in the egit API. Redirect menus and command images to the remaining command id. Bug: 549997 Change-Id: I5f8129670566e2f41051f0f533dcf36947d4dd68
Diffstat (limited to 'org.eclipse.egit.ui')
-rw-r--r--org.eclipse.egit.ui/plugin.xml18
1 files changed, 4 insertions, 14 deletions
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index a8705ab8a..fe646c095 100644
--- a/org.eclipse.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -5120,12 +5120,12 @@
visible="true">
</separator>
<command
- commandId="org.eclipse.egit.ui.ConfigureUpstreamPush"
+ commandId="org.eclipse.egit.ui.team.ConfigurePush"
label="%ConfigurePushToUpstreamCommand.label"
style="push">
</command>
<command
- commandId="org.eclipse.egit.ui.ConfigureUpstreamFetch"
+ commandId="org.eclipse.egit.ui.team.ConfigureFetch"
label="%ConfigureFetchFromUpstreamCommand.label"
style="push">
</command>
@@ -6134,11 +6134,11 @@
icon="icons/obj16/fetch.png">
</image>
<image
- commandId="org.eclipse.egit.ui.ConfigureUpstreamFetch"
+ commandId="org.eclipse.egit.ui.team.ConfigureFetch"
icon="icons/obj16/fetch.png">
</image>
<image
- commandId="org.eclipse.egit.ui.ConfigureUpstreamPush"
+ commandId="org.eclipse.egit.ui.team.ConfigurePush"
icon="icons/obj16/push.png">
</image>
<image
@@ -6615,16 +6615,6 @@
name="%MergeToolCommand.name">
</command>
<command
- defaultHandler="org.eclipse.egit.ui.internal.actions.ConfigureFetchActionHandler"
- id="org.eclipse.egit.ui.ConfigureUpstreamFetch"
- name="%ConfigureUpstreamFetchCommand.name">
- </command>
- <command
- defaultHandler="org.eclipse.egit.ui.internal.actions.ConfigurePushActionHandler"
- id="org.eclipse.egit.ui.ConfigureUpstreamPush"
- name="%ConfigureUpstreamPushCommand.name">
- </command>
- <command
categoryId="org.eclipse.egit.ui.commandCategory"
defaultHandler="org.eclipse.egit.ui.internal.actions.ConfigureFetchActionHandler"
id="org.eclipse.egit.ui.team.ConfigureFetch"

Back to the top