DESCRIPTION

Added support for keeping branch after Gitflow feature finish

- added new option to API
- added checkbox to feature finish dialog
- added tests and UI tests
- refactored feature finish UI tests to reduce redundancy

Bug: 477786
Change-Id: I4e58529378c976c83b7564e817db6f7be00d0cec
Signed-off-by: Jamarion Hunt xxx@xxx.xxx

COMMENTS

author: Jamarion Hunt
date: 2015-09-19 16:20:13.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-09-19 16:20:19.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2015-09-19 16:42:25.000000000

Patch Set 1: Verified+1

Build Successful 

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

-------------------------------------
author: Douglas Trujillo
date: 2015-09-21 07:24:46.000000000

Patch Set 1: Code-Review-1

(11 comments)

Line:71, org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/uitext.properties -> s/is complete/the feature/

Line:68, org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureFinishHandler.java -> keepBranch ?

Line:24, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/FeatureFinishOperation.java -> keep is too generic:

s/keep/keepBranch/

Line:64, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/FeatureFinishOperation.java -> missing javadoc

Line:67, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/FeatureFinishOperation.java -> s/setKeep/setKeepBranch/

Line:117, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/GitFlowOperation.java -> s/keep/keepBranch/

Line:29, org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureFinishKeepBranchHandlerTest.java -> this method name contradicts the intention expressed in the class name, I guess you meant something like testFeatureFinishKeepBranch() ?

Line:31, org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FinishFeatureDialog.java -> I'd name this keepBranch

Line:109, org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FinishFeatureDialog.java -> this is cryptic, javadoc should be understandable without reading the implementation

Line:111, org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FinishFeatureDialog.java -> I'd name this isKeepBranch

Line:12, /COMMIT_MSG -> this refactoring seems not directly related to implement the keep branch option and could be split into a separate change

-------------------------------------
author: Jamarion Hunt
date: 2015-09-21 09:19:20.000000000

Patch Set 1:

(11 comments)

Line:71, org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/uitext.properties -> Done

Line:68, org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureFinishHandler.java -> Done

Line:24, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/FeatureFinishOperation.java -> Done

Line:64, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/FeatureFinishOperation.java -> Done

Line:67, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/FeatureFinishOperation.java -> Done

Line:117, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/GitFlowOperation.java -> Done

Line:29, org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureFinishKeepBranchHandlerTest.java -> Done

Line:31, org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FinishFeatureDialog.java -> Done

Line:109, org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FinishFeatureDialog.java -> Done

Line:111, org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FinishFeatureDialog.java -> Done

Line:12, /COMMIT_MSG -> Well, the change would introduce the redundancy, but yes, I can split it, if that is better than having the redundancy on master for some time.

-------------------------------------
author: Jamarion Hunt
date: 2015-09-21 09:28:10.000000000

Patch Set 1:

(1 comment)

Line:12, /COMMIT_MSG -> Done

-------------------------------------
author: Gerrit Johnathan Pham
date: 2015-09-22 06:28:02.000000000

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

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