DESCRIPTION

Initializing a Gitflow repository should allow changing branch names

- added new dialog that opens when initializing the repository
- changed API for "git flow init" to accept a config PoJo
- deprecated redundant API
- added UI test

Bug: 475293
Change-Id: If7e314d749b0fcd3e77eb82576336c1aa20d4d14
Signed-off-by: Jamarion Hunt xxx@xxx.xxx

COMMENTS

author: Jamarion Hunt
date: 2015-08-21 08:49:01.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-08-21 08:49:07.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2015-08-21 09:10:49.000000000

Patch Set 1: Code-Review-1

Build Unstable 

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

-------------------------------------
author: Brenden Conley
date: 2015-08-21 09:19:34.000000000

Patch Set 1: -Code-Review

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

-------------------------------------
author: Brenden Conley
date: 2015-08-21 09:42:49.000000000

Patch Set 1: Code-Review-1

Build Unstable 

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

-------------------------------------
author: Brenden Conley
date: 2015-08-22 21:33:54.000000000

Patch Set 1: -Code-Review

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

-------------------------------------
author: Brenden Conley
date: 2015-08-22 21:55:41.000000000

Patch Set 1: Verified+1

Build Successful 

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

-------------------------------------
author: Douglas Trujillo
date: 2015-08-22 22:30:56.000000000

Patch Set 1: Code-Review-1

(8 comments)

if a repository already contains a commit and a master branch and the user chooses a non-default name e.g. "master1" for the master branch this branch doesn't exist at that point. If later a release is finished gitflow tries to switch to the non existing non-default master branch "master1". Since this doesn't exist it raises an internal error:

An internal error occurred during: "Finishing release...".
No branch 'master1' found.

Would be better to ask the user on init to create the non-default master branch or create it as part of init.

Line:11, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/InitParameters.java -> style nit: we don't use wildcard imports instead use Ctrl-Shift-O to let Eclipse generate imports

Line:28, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/InitOperation.java -> style nit: wrong sorting of imports, this should come after the next line

Line:40, org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF -> we usually assume semantic versioning hence the upper limit is usually up to the next major release excluding the next major release, i.e.

 s/[1.7.0,1.8.0)/[1.7.0,2.0.0)/

Line:41, org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF -> s/1.6.0/2.0.0/

Line:42, org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF -> s/1.6.0/2.0.0/

Line:43, org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF -> s/1.4.0/2.0.0/

Line:44, org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF -> s/1.6.0/2.0.0/

Line:16, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/GitFlowDefaults.java -> xxx@xxx.xxx 4.1 for new API, more below

-------------------------------------
author: Jamarion Hunt
date: 2015-08-23 20:31:08.000000000

Patch Set 1:

(9 comments)

Line:11, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/InitParameters.java -> Done

Line:28, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/InitOperation.java -> Done

Line:61, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/op/InitOperation.java -> This should be InitParameters

Line:40, org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF -> Done

Line:41, org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF -> Done

Line:42, org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF -> Done

Line:43, org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF -> Done

Line:44, org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF -> Done

Line:16, org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/GitFlowDefaults.java -> Done

-------------------------------------
author: Jamarion Hunt
date: 2015-08-23 20:34:09.000000000

Patch Set 1:

> (8 comments)
 > 
 > if a repository already contains a commit and a master branch and
 > the user chooses a non-default name e.g. "master1" for the master
 > branch this branch doesn't exist at that point. If later a release
 > is finished gitflow tries to switch to the non existing non-default
 > master branch "master1". Since this doesn't exist it raises an
 > internal error:
 > 
 > An internal error occurred during: "Finishing release...".
 > No branch 'master1' found.
 > 
 > Would be better to ask the user on init to create the non-default
 > master branch or create it as part of init.

Thanks for figuring this out. I will check what the reference implementation does in this case, and open a new bug.

-------------------------------------
author: Gerrit Johnathan Pham
date: 2015-08-24 15:07:49.000000000

Change could not be merged due to a path conflict.

Please rebase the change locally and upload the rebased commit for review.

-------------------------------------
author: Gerrit Johnathan Pham
date: 2015-08-24 20:17:21.000000000

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

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