Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Aniszczyk2011-02-03 10:13:36 -0500
committerCode Review2011-02-03 10:13:36 -0500
commitf0d22181d49a67bc7f81415475c7344823e29594 (patch)
tree251ceaa0bcd22786abbaf2a649de1b1a9ca1d544
parent33ce57496aeffcac6f1f636025583e00b836d0b4 (diff)
parentaab8e41bbc9fad8ec4f27577efd8f5850fd8a7c6 (diff)
downloadegit-f0d22181d49a67bc7f81415475c7344823e29594.tar.gz
egit-f0d22181d49a67bc7f81415475c7344823e29594.tar.xz
egit-f0d22181d49a67bc7f81415475c7344823e29594.zip
Merge "Simplify Fetch and Push fourth part: update action set"
-rw-r--r--org.eclipse.egit.ui/plugin.properties8
-rw-r--r--org.eclipse.egit.ui/plugin.xml34
2 files changed, 32 insertions, 10 deletions
diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties
index 6a3e0ee09..5abe019ba 100644
--- a/org.eclipse.egit.ui/plugin.properties
+++ b/org.eclipse.egit.ui/plugin.properties
@@ -30,9 +30,9 @@ BranchAction_label=&Branch...
BranchAction_tooltip=Checkout branch
DiscardChangesAction_label=&File in Git Index
FetchAction_label=&Fetch From...
-FetchAction_tooltip=Fetch changes
+FetchAction_tooltip=Fetch changes from upstream
PushAction_label=&Push...
-PushAction_tooltip=Push changes
+PushAction_tooltip=Push changes to upstream
ResetAction_label=&Reset...
ResetAction_tooltip=Reset index, working tree or branch head
SynchronizeWith_label=&Synchronize...
@@ -212,7 +212,7 @@ RebaseCurrentCommand.name = Rebase
RepoViewPullMenu.label = P&ull
RepoViewPullCommand.name = Pull
TeamPullCommand.name = Pull
-PullIntoCurrentBranch.tooltip = Pull into current branch
+PullIntoCurrentBranch.tooltip = Pull changes from upstream into current branch
RemoteSubMenu.label = R&emote
PushToUpstreamAction.label = &Push to Upstream
FetchFromUpstreamAction.label = &Fetch from Upstream
@@ -244,4 +244,4 @@ ConfigureUpstreamPushCommand.name = Configure Upstream Push
OpenInTextEditorCommand.name = Open in Text Editor
ConfigureFetchFromUpstreamCommand.label = Configure F&etch from Upstream...
ConfigurePushToUpstreamCommand.label = Configure P&ush to Upstream...
-CommitMessageProviderExtension-point.name = CommitMessageProvider \ No newline at end of file
+CommitMessageProviderExtension-point.name = CommitMessageProvider
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index 2afb1acc8..3b769330f 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">

Back to the top