DESCRIPTION

Handle rebase modes 'preserve' and 'interactive' in EGit

EGit and JGit treated branch.<name>.rebase as a boolean config value,
which is wrong: git actually also allows 'preserve' and 'interactive'.

Since commit aadbb158 in JGit, JGit does recognize these extra values.

Adapt the EGit UI (wizards & dialogs for branch creation, branch
configuration, pulling and pushing a branch) to provide a UI to let
the user select any valid BranchRebaseMode value. Introduce a new
BranchRebaseModeCombo for this.

Adapt UI tests.

Honor the setting in all relevant operations in EGit.

Note that JGit currently ignores the "interactive" setting in a
PullCommand and performs a normal rebase instead.

Bug: 499482
Change-Id: I0a3b639bbb9e5dd5d93134587410ba72c0549cc7
Signed-off-by: Alayna Houston xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2016-10-20 20:24:33.000000000

Uploaded patch set 4: Patch Set 3 was rebased.

-------------------------------------
author: Brenden Conley
date: 2016-10-20 20:24:39.000000000

Patch Set 4:

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

-------------------------------------
author: Douglas Trujillo
date: 2016-10-20 20:26:22.000000000

Patch Set 4: Code-Review+2

-------------------------------------
author: Brenden Conley
date: 2016-10-20 20:42:43.000000000

Patch Set 4: Verified-1

Build Failed 

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

-------------------------------------
author: Brenden Conley
date: 2016-10-20 20:43:50.000000000

Patch Set 4: -Verified

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

-------------------------------------
author: Brenden Conley
date: 2016-10-20 21:10:19.000000000

Patch Set 4: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/9165/ : SUCCESS

-------------------------------------
author: Gerrit Johnathan Pham
date: 2016-10-20 21:15:17.000000000

Change has been successfully merged into the git repository by Douglas Trujillo

-------------------------------------
author: Douglas Trujillo
date: 2016-10-20 21:48:25.000000000

Patch Set 4:

> > When using command "Pull..." on a local branch which has no
 > > upstream configuration yet the Pull wizard pre-fills the field
 > > "Reference" with the name of the currently checked out local
 > > branch, if there is no upstream branch with that name the pull
 > > command fails with the following error:
 > >
 > > "Remote origin did not advertise Ref for branch refs/heads/b.
 > This
 > > Ref may not exist in the remote or may be hidden by permission
 > > settings."
 > >
 > > I think it would be better if the Pull wizard would check if the
 > > reference matching the current local branch exists upstream, and
 > if
 > > it doesn't exist it should not pre-fill the field "Reference" to
 > > avoid the above error.
 > 
 > Actually, I think when Mikael introduced this PullWizard he started
 > with a copy of the PushWizard. When pushing, it makes sense to
 > propose the local branch name if it has no upstream config yet. For
 > pulling, it doesn't make sense at all. I suggest the wizard should
 > just leave the field empty in that case. There is content assist on
 > the field, which will then go fetch the advertised refs from the
 > server. Doing that automatically takes too long. (Oh, and the
 > tooltip on the content assist light bulb is wrong. It doesn't show
 > "previously used values", it proposes actually advertised refs.)
 > 
 > But in any case I think this should be done in a separate change.
 > It's unrelated to supporting rebase modes 'preserve' and
 > 'interactive'.

pushed fixes for these issues: https://git.eclipse.org/r/#/c/83641/, https://git.eclipse.org/r/#/c/83646/

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