DESCRIPTION

[stagingView] Show rebase buttons if rebase is in progress

In order to enable showing a conflict warning when there are unresolved
conflicts we need to enhance RepositoryState in JGit to provide
additional states representing rebase with conflicts. This will be done
in another change.

Bug: 414930
Change-Id: I54ebec9cbfb89b994e857cd8a20b2be6a55c65fb
Signed-off-by: Douglas Trujillo xxx@xxx.xxx
Also-by: Willow Cantrell xxx@xxx.xxx
Also-by: Danika Greer xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2013-09-18 12:03:57.000000000

Uploaded patch set 9.

-------------------------------------
author: Brenden Conley
date: 2013-09-18 12:04:03.000000000

Patch Set 9:

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

-------------------------------------
author: Brenden Conley
date: 2013-09-18 12:23:25.000000000

Patch Set 9: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit.gerrit/4898/ : UNSTABLE

-------------------------------------
author: Danika Greer
date: 2013-09-18 13:13:00.000000000

Patch Set 9:

(3 comments)

Line:441, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java -> Looks like this doesn't need to be a field anymore.

Line:538, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java -> This is my bad from the RFC change, should use UIText.StagingView_RebaseLabel.

Line:738, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java -> Are the above changes necessary after moving the rebase buttons into their own section?

-------------------------------------
author: Douglas Trujillo
date: 2013-09-18 13:30:26.000000000

Patch Set 9:

(3 comments)

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

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

Line:738, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java -> done, modulo automatic formatter

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