diff options
| author | Mathias Kinzler | 2011-02-02 10:01:48 +0000 |
|---|---|---|
| committer | Mathias Kinzler | 2011-02-03 14:20:42 +0000 |
| commit | aab8e41bbc9fad8ec4f27577efd8f5850fd8a7c6 (patch) | |
| tree | a0458041e73e914754905d40983f59e14b8813da /org.eclipse.egit.ui/plugin.xml | |
| parent | 3e42b4f3e2172e27cae5f67034cee761772f334d (diff) | |
| download | egit-aab8e41bbc9fad8ec4f27577efd8f5850fd8a7c6.tar.gz egit-aab8e41bbc9fad8ec4f27577efd8f5850fd8a7c6.tar.xz egit-aab8e41bbc9fad8ec4f27577efd8f5850fd8a7c6.zip | |
Simplify Fetch and Push fourth part: update action set
The Git action set should expose the new "Simple" fetch and push
actions instead of the wizards; if the current branch is configured
correctly, users should be able to do Pull-Commit-Push cycles with
these buttons without the need to go through the fetch and push
wizards over and over again.
Change-Id: I42e2eb60c055956a83e16c3cf1e43365141a8c63
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/plugin.xml')
| -rw-r--r-- | org.eclipse.egit.ui/plugin.xml | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index 2afb1acc8a..3b769330fa 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -523,22 +523,22 @@ tooltip="%PullIntoCurrentBranch.tooltip"> </action> <action - class="org.eclipse.egit.ui.internal.actions.FetchAction" - definitionId="org.eclipse.egit.ui.team.Fetch" + class="org.eclipse.egit.ui.internal.actions.SimpleFetchAction" + definitionId="org.eclipse.egit.ui.team.SimpleFetch" icon="icons/obj16/fetch.gif" id="org.eclipse.egit.ui.actionfetch" - label="%FetchAction_label" + label="%FetchFromUpstreamAction.label" menubarPath="org.eclipse.egit.ui.gitmenu/repo" style="push" toolbarPath="org.eclipse.egit.ui" tooltip="%FetchAction_tooltip"> </action> <action - class="org.eclipse.egit.ui.internal.actions.PushAction" - definitionId="org.eclipse.egit.ui.team.Push" + class="org.eclipse.egit.ui.internal.actions.SimplePushAction" + definitionId="org.eclipse.egit.ui.team.SimplePush" icon="icons/obj16/push.gif" id="org.eclipse.egit.ui.actionpush" - label="%PushAction_label" + label="%PushToUpstreamAction.label" menubarPath="org.eclipse.egit.ui.gitmenu/repo" style="push" toolbarPath="org.eclipse.egit.ui" @@ -2494,6 +2494,28 @@ id="org.eclipse.egit.ui.ConfigureUpstreamPush" name="%ConfigureUpstreamPushCommand.name"> </command> + <command + categoryId="org.eclipse.egit.ui.commandCategory" + defaultHandler="org.eclipse.egit.ui.internal.actions.SimplePushActionHandler" + id="org.eclipse.egit.ui.team.SimplePush" + name="%PushUpstreamCommand.name"> + </command> + <command + categoryId="org.eclipse.egit.ui.commandCategory" + defaultHandler="org.eclipse.egit.ui.internal.actions.SimpleFetchActionHandler" + id="org.eclipse.egit.ui.team.SimpleFetch" + name="%FetchUpstreamCommand.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> </extension> <extension point="org.eclipse.ui.bindings"> |