DESCRIPTION

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

If the current commit is a merge commit, this will bring 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: I4b140e254c76477ba644b15eb77286d65887515c

COMMENTS

author: Willow Cantrell
date: 2012-05-24 08:45:56.000000000

Uploaded patch set 13.

-------------------------------------
author: Willow Cantrell
date: 2012-05-24 08:47:21.000000000

Patch Set 13:

Finally got around to testing on Linux (on my ancient private dual-boot laptop)...
Replaced IDialogConstants.OK_ID with IDialogConstants.OK_LABEL for pressing OK in the test. Hope this helps.

-------------------------------------
author: Douglas Trujillo
date: 2012-05-24 11:34:24.000000000

Patch Set 13: I would prefer that you didn't submit this

still failing on Mac, I invite you to test this on my Mac ;-)


org.eclipse.egit.ui--All-SWT-Tests
org.eclipse.egit.ui.test.AllTests
org.eclipse.egit.ui.test.AllLocalTests
org.eclipse.egit.ui.test.team.actions.AllTeamActionTests
org.eclipse.egit.ui.test.team.actions.CompareActionsTest
testCompareWithPreviousWithMerge(org.eclipse.egit.ui.test.team.actions.CompareActionsTest)
org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException: Could not find widget.
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntilWidgetAppears(SWTBotFactory.java:348)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.shells(SWTBotFactory.java:112)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.shell(SWTBotFactory.java:102)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.shell(SWTBotFactory.java:93)
	at org.eclipse.egit.ui.test.team.actions.CompareActionsTest.testCompareWithPreviousWithMerge(CompareActionsTest.java:179)
...
Caused by: org.eclipse.swtbot.swt.finder.widgets.TimeoutException: Timeout after: 5000 ms.: Could not find shell matching: with text 'Commit Selection'
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(SWTBotFactory.java:398)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(SWTBotFactory.java:372)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(SWTBotFactory.java:360)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntilWidgetAppears(SWTBotFactory.java:346)
	... 59 more

org.eclipse.egit.ui.test.team.actions.ReplaceActionsTest
testReplaceWithPreviousWithMerge(org.eclipse.egit.ui.test.team.actions.ReplaceActionsTest)
org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException: Could not find widget.
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntilWidgetAppears(SWTBotFactory.java:348)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.shells(SWTBotFactory.java:112)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.shell(SWTBotFactory.java:102)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.shell(SWTBotFactory.java:93)
	at org.eclipse.egit.ui.test.team.actions.ReplaceActionsTest.testReplaceWithPreviousWithMerge(ReplaceActionsTest.java:130)
...
Caused by: org.eclipse.swtbot.swt.finder.widgets.TimeoutException: Timeout after: 5000 ms.: Could not find shell matching: with text 'Commit Selection'
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(SWTBotFactory.java:398)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(SWTBotFactory.java:372)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(SWTBotFactory.java:360)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntilWidgetAppears(SWTBotFactory.java:346)
	... 59 more

org.eclipse.egit.ui.view.synchronize.SynchronizeViewGitChangeSetModelTest
shouldExchangeCompareEditorSidesBetweenIncomingAndOutgoingChanges(org.eclipse.egit.ui.view.synchronize.SynchronizeViewGitChangeSetModelTest)
org.eclipse.swtbot.swt.finder.widgets.TimeoutException: Timeout after: 10000 ms.: null
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(SWTBotFactory.java:398)
	at org.eclipse.swtbot.swt.finder.SWTBotFactory.waitUntil(SWTBotFactory.java:372)
	at org.eclipse.egit.ui.test.TestUtil.waitUntilTreeHasNodeContainsText(TestUtil.java:188)
	at org.eclipse.egit.ui.view.synchronize.AbstractSynchronizeViewTest.waitForNodeWithText(AbstractSynchronizeViewTest.java:281)
	at org.eclipse.egit.ui.view.synchronize.AbstractSynchronizeViewTest.getCompareEditorForFileInGitChangeSet(AbstractSynchronizeViewTest.java:260)
	at org.eclipse.egit.ui.view.synchronize.SynchronizeViewGitChangeSetModelTest.shouldExchangeCompareEditorSidesBetweenIncomingAndOutgoingChanges(SynchronizeViewGitChangeSetModelTest.java:217)

-------------------------------------
