DESCRIPTION

[wip] Add dialog to choose merge strategy before merging operations

Change-Id: I7e3fa7a00f616905a2005f58fdf46998866ce26f
Signed-off-by: Maleah Marks xxx@xxx.xxx


COMMENTS

author: Maleah Marks
date: 2015-09-07 09:24:22.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-09-07 09:24:28.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/7559/

-------------------------------------
author: Brenden Conley
date: 2015-09-07 10:14:31.000000000

Patch Set 1: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit.gerrit/7559/ : ABORTED

-------------------------------------
author: Douglas Trujillo
date: 2015-09-10 14:00:30.000000000

Patch Set 1: Code-Review-1

(8 comments)

There shouldn't be an extra dialog if an action already has an option dialog. E.g. if you start "Merge..." from a repository node in repositories view this already shows some other merge options, in that case we should embed the merge strategy choice. If we show the merge strategy dialog we should also show all the other merge options which make sense for the action being called. Basically this means the merge strategy options should be merged with the other merge options already existing.

Instead of showing the option dialog only in one of many menus offering "merge" I would like to change this to only showing the option dialog if a modifier key is pressed while clicking on the merge action in any git menu having the merge action. This would avoid we have to duplicate a lot of menu entries and still allow ad-hoc decision if options should be shown or not. There could be another option "always show options"

Rebase and cherry-pick don't show the strategy dialog (I tried from history view and from repositories view)

Line:249, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties -> Always use the preferred strategy

Line:1896, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties -> see picture attached to https://bugs.eclipse.org/bugs/show_bug.cgi?id=476788#c2

Line:1903, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties -> we should also have a short recognizable name matching the name in native git if it exists there as well, e.g. ours, theirs, resolve, recursive

Line:1, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/jobs/MergeJob.java -> missing license header

Line:1, org.eclipse.egit.core/src/org/eclipse/egit/core/op/AbstractMergingOperation.java -> missing license header

Line:1, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/PreferredStrategyDialog.java -> missing license header

Line:1, org.eclipse.egit.core/src/org/eclipse/egit/core/op/MergingOperation.java -> missing license header

Line:1, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/PreferredMergedStrategyHelper.java -> missing license header

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