Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2017-07-14 14:21:19 +0000
committerThomas Wolf2017-10-16 21:10:51 +0000
commita0e6c966acaa71713e0557a7a172c75b2197c9f6 (patch)
treef3ef0d4948a40d6b8d8df83e86ac6b44f0b63ab3 /org.eclipse.egit.ui/plugin.properties
parentee5336775acf9efa647ba8e0f5a9009ac90da77e (diff)
downloadegit-a0e6c966acaa71713e0557a7a172c75b2197c9f6.tar.gz
egit-a0e6c966acaa71713e0557a7a172c75b2197c9f6.tar.xz
egit-a0e6c966acaa71713e0557a7a172c75b2197c9f6.zip
Move history page actions into plugin.xml and remove default handlers
The history view's main context menu was built programmatically, apparently because of bug 322751, which undid an earlier attempt to do this (bug 321516). Move the context menu back to plugin.xml. Remove the menu items from CommitGraphTable and add a new section in the menu ("history.group") so that we can add our built-in commands in our own group, not just under "additions". Basically all the history view commands had defaultHandlers. To remove them, we need quite a lot of new dedicated handlers. Verified that the error described in bug 322751 did not re-appear. There should be only minor visual changes in the context menu of the history view. We only show applicable operations, and I have slightly re-arranged a few separators. There is quite some duplication between handlers. With the new IRepositoryCommit interface, it should be possible to unify many commands, but this is postponed to future commits. Bug: 495064 Change-Id: I73951763904f61ec1b116dc1781cbcc6b0fdb65f Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui/plugin.properties')
-rw-r--r--org.eclipse.egit.ui/plugin.properties38
1 files changed, 38 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties
index a2ef5e9fc5..8dc5f9ffaf 100644
--- a/org.eclipse.egit.ui/plugin.properties
+++ b/org.eclipse.egit.ui/plugin.properties
@@ -183,6 +183,7 @@ CommitViewerCommands.extension.name = The commit viewer commands
CompareCommand.name = Compare with each other
CompareWithMenu.label= Comp&are With
CompareWithWorkTreeCommand.name = Compare with Working Tree
+CompareWithHeadCommand.name = Compare commit with HEAD
CompareWithCommitCommand.name = Compare with Commit...
CompareWithHistoryCommand.name = Compare with Branch, Tag or Reference...
ReplaceWithMenu.label=Rep&lace With
@@ -283,6 +284,7 @@ RewordCommitCommand.name = Reword Commit
EditCommitCommand.name = Edit Commit
RevertCommand.name = Revert Commit
RebaseCurrentCommand.name = Rebase
+RebaseInteractiveCurrentCommand.name = Rebase Interactive
DisconnectCommand.name = Disconnect
RepoViewPullMenu.label = P&ull
@@ -372,6 +374,7 @@ OpenCommitAction.label = Open Git Commit...
OpenCommit.name = Open Git Commit
ShowBlameAction_label = &Show Revision Information
ShowBlameCommand.name = Show Revision Information
+ShowVersionsCommand.name=Open this Version
GitVariable_git_dir=The path to the .git directory for the selected or named resource
GitVariable_git_repo_relative_path=Path of the selected or named resource relative to the Git repository
@@ -417,3 +420,38 @@ extension.traceComponent.name = Git
ImportChangedProjects.label = Import Changed Projects
ImportChangedProjectsCommand = Import Changed Projects
+
+HistoryCheckoutCommand.label=&Check Out
+HistoryCheckoutCommand.label2=&Check Out...
+HistoryCherryPick.label=C&herry-Pick...
+HistoryCompareVersions.label=Compare with &Each Other
+HistoryCompareVersionsInTree.label=Compare with Each Other in &Tree
+HistoryCompareWithWorkspace.label=Compare with &Workspace
+HistoryCompareWithHead.label=Compare with &HEAD
+HistoryCreateBranch.label=Create &Branch...
+HistoryCreatePatch.label=Create P&atch...
+HistoryCreateTag.label=Create &Tag...
+HistoryDeleteBranch.label=&Delete Branch
+HistoryDeleteTag.label=De&lete Tag...
+HistoryMerge.label=&Merge
+HistoryModifyMenu.label=Modi&fy
+HistoryModifyEdit.label=&Edit
+HistoryModifyReword.label=&Reword
+HistoryModifySquash.label=&Squash
+HistoryOpenInCommitViewer.label=Open in Commit &Viewer
+HistoryOpenInTextEditorCommand.label=Open in Te&xt Editor
+HistoryPushCommit.label=&Push Commit...
+HistoryQuickdiffMenu.label=&Quick Diff
+HistoryQuickdiffSet.label=&Set as Baseline
+HistoryRebaseCurrent.label=R&ebase HEAD on
+HistoryRebaseInteractive.label=Rebase &Interactive
+HistoryRenameBranch.label=Re&name Branch...
+HistoryResetHard.label=&Hard (HEAD, Index, and Working Tree)
+HistoryResetMenu.label=&Reset
+HistoryResetMixed.label=&Mixed (HEAD and Index)
+HistoryResetQuickDiffHead.label=Reset Baseline to &Current Revision (HEAD)
+HistoryResetQuickDiffHeadParent.label=Reset Baseline to &Previous Revision (HEAD^1)
+HistoryResetSoft.label=&Soft (HEAD Only)
+HistoryRevert.label=&Revert Commit
+HistoryShowBlame.label=&Show Revision Information
+HistoryShowVersions.label=&Open \ No newline at end of file

Back to the top