Add a "Previous Version" option to the Replace With menu

If the current commit is a merge commit, this will open a dialog asking
the user to select one of the parents.

This dialog is also added to the "Compare with Previous" action handler.

Change-Id: I8a5076ba29ebae7da28f837ed1217b89afe1474d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index c13ee0b382..93ba7e586e 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -315,6 +315,8 @@ ReplaceTargetSelectionDialog_ReplaceButton=&Replace
 ReplaceTargetSelectionDialog_ReplaceMessage=Select a branch, tag, or reference to replace the resource with
 ReplaceTargetSelectionDialog_ReplaceTitle=Replace ''{0}'' with a Branch, Tag, or Reference"
 ReplaceTargetSelectionDialog_ReplaceWindowTitle=Replace
+ReplaceWithPreviousActionHandler_NoParentCommitDialogMessage=No previous revision of {0} could be found in the repository.
+ReplaceWithPreviousActionHandler_NoParentCommitDialogTitle=Previous revision not found
 RepositoryAction_errorFindingRepo=Could not find a repository associated with this project
 RepositoryAction_errorFindingRepoTitle=Cannot Find Repository
 RepositoryAction_multiRepoSelection=Cannot perform action on multiple repositories simultaneously.\n\nPlease select items from only one repository.
@@ -1297,6 +1299,13 @@ CommitSearchQuery_Label=Git Commit Search
 CommitSearchQuery_TaskSearchCommits=Searching commits in {0}
 CommitSearchResult_LabelPlural=''{0}'' - {1} commit matches
 CommitSearchResult_LabelSingle=''{0}'' - 1 commit match
+CommitSelectDialog_AuthoColumn=Author
+CommitSelectDialog_DateColumn=Date
+CommitSelectDialog_IdColumn=Id
+CommitSelectDialog_Message=Please select a Commit
+CommitSelectDialog_MessageColumn=Message
+CommitSelectDialog_Title=Commit Selection
+CommitSelectDialog_WindowTitle=Commit Selection
 CommitSelectionDialog_BuildingCommitListMessage=Building commit list
 CommitSelectionDialog_DialogMessage=Please select a commit from the list
 CommitSelectionDialog_DialogTitle={0} commits in repository {1}
@@ -1568,4 +1577,4 @@ GitOpenInCompareAction_cannotRetrieveCommitWithId=Cannot retrieve commit with id
 
 CloneFailureDialog_tile=Transport Error
 CloneFailureDialog_dontShowAgain=Don't show this dialog again
-CloneFailureDialog_checkList={0}\n\nPlease check:\nNetwork Connection settings\nNetwork Connection -> SSH2 Eclipse preferences\n\nYou may also need to restart Eclipse after making changes in preferences.
\ No newline at end of file
+CloneFailureDialog_checkList={0}\n\nPlease check:\nNetwork Connection settings\nNetwork Connection -> SSH2 Eclipse preferences\n\nYou may also need to restart Eclipse after making changes in preferences.