[gitflow] Implement squash parameter for feature finish
commit2e5f1c90fec3f0c2d8707218ec4a07dddcfc355b
authorMax Hohenegger <eclipse@hohenegger.eu>
Sun, 5 Jul 2015 21:48:14 +0000 (5 23:48 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Fri, 14 Aug 2015 11:00:17 +0000 (14 13:00 +0200)
tree15abf1474d44d5d69f24c719b8b326b6b2cc3808
parent1332a1fedf6a2f189eb90644946a7309423eccf3
[gitflow] Implement squash parameter for feature finish

- added squash option
- added dialog to select squash option
- fixed package name dialog => dialogs
- added test for squash and fixed existing test

Bug: 471026
Change-Id: Iaaa8a88e2962737c90f646966f1bc1e380708f39
Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
13 files changed:
org.eclipse.egit.gitflow.test/src/org/eclipse/egit/gitflow/op/FeatureFinishOperationTest.java
org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/Activator.java
org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/UIText.java
org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureCheckoutHandler.java
org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureFinishHandler.java
org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureTrackHandler.java
org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/AbstractGitFlowBranchSelectionDialog.java [moved from org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialog/AbstractGitFlowBranchSelectionDialog.java with 98% similarity]
org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/FinishFeatureDialog.java [new file with mode: 0644]
org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/uitext.properties
org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/FeatureFinishOperation.java
org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/GitFlowOperation.java
org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/ReleaseFinishOperation.java
org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureStartFinishHandlerTest.java