DESCRIPTION

Interactive Rebase: Open Staging View in amend mode for the edit step

When the interactive rebase stops for editing a commit, the standard
workflow is that the commit to be edited has to be amended. To help
the user doing that we now automatically open the staging view in the
amend mode.

Change-Id: Ib42116bba78407cb651398b0d75c7bd33ae0f106
Signed-off-by: Carlie Harper xxx@xxx.xxx


COMMENTS

author: Carlie Harper
date: 2013-11-04 09:33:29.000000000

Uploaded patch set 6.

-------------------------------------
author: Brenden Conley
date: 2013-11-04 09:33:35.000000000

Patch Set 6:

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

-------------------------------------
author: Brenden Conley
date: 2013-11-04 09:34:23.000000000

Patch Set 6: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit.gerrit/5218/ : FAILURE

-------------------------------------
author: Douglas Trujillo
date: 2013-11-04 22:25:01.000000000

Patch Set 6: Code-Review-1

(4 comments)

Line:2035, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java -> style nit: trailing whitespace

Line:122, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/AbstractRebaseCommandHandler.java -> enums can be compared using ==

Line:135, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/AbstractRebaseCommandHandler.java -> why is reload needed ? I tried without and it seems this didn't change behavior

Line:142, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/AbstractRebaseCommandHandler.java -> I think when aborting interactive rebase we should ensure that the staging view's amend flag is set back to false

-------------------------------------
author: Carlie Harper
date: 2013-11-05 10:25:15.000000000

Patch Set 6:

(4 comments)

Line:2035, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java -> Done

Line:122, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/AbstractRebaseCommandHandler.java -> Done

Line:135, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/AbstractRebaseCommandHandler.java -> it is necessary if the staging view shows another repository and link with selection is not selected. In that case the staging view would be opened in amend mode for the other repository.

Line:142, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/AbstractRebaseCommandHandler.java -> Done

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