Add branch change tasks to allow for gitflow releasing

[jakehschwartz]

• Add inquireBranches, setReleaseBranch and setNextBranch which mimic the version setting/changing commands
• Add gitflow test case

[jakehschwartz]

My tests fail (because I just blindly copied another test). What test framework are the tests in sbt-test package using? Does anyone have any resources that I could look at to figure out how to structure a test?

[xuwei-k]

http://www.scala-sbt.org/0.13/docs/Testing-sbt-plugins.html

[jakehschwartz]

Thanks @xuwei-k. Now that my tests pass, I still need some guidance on how make this work with hg and svn. Thanks in advance!

[jakehschwartz]

Thanks for the review @jroper. I assumed those were not the correct implementations for hg and svn, that's why I added //FIXMEs and hopefully someone who did know what do to could help out. But if it is acceptable to just throw an exception, then I will do that, in addition to adding documentation.

[jroper]

When/if someone goes to use this feature with hg/svn, it will be nice if rather than getting a nondescript error due to the wrong commands being run, they get an error that says exactly what the problem is - that is that the commands haven't been implemented. I don't think anyone is going to come and implement them for you anytime soon, I certainly don't have the time to do it, and I guess over 90% of sbt release users use git anyway, so I don't see any reason to hold back adding this feature until all backends are supported.

[jakehschwartz]

@jroper I have added the documentation that you requested. I also made a major change. I realized the branch switching would not work with pushing because of the tracking remote/branch requirement. Now when creating a new branch, the tracking remote will be set the tracking remote of the current branch. This will allow us to use git push -u REMOTE BRANCH as you mentioned in the other PR. What do you think about this approach?

[danielkza]

While I do not use GitFlow, being able to switch branches would be very useful to me, as my team protects the master branches of all repositories, and hence, I would like to create new release branches so they can be approved by pull request.

Is any help needed with testing/reviewing/improving this PR?

[jakehschwartz]

In terms of testing, this should work as described, I have been using it for several weeks.

[stephennancekivell]

How exactly does this PR follow the git-flow process? If it doesnt follow it exactly the docs should be clear on that.

The (git flow page)[http://nvie.com/posts/a-successful-git-branching-model/] talks about release branches and merging back to develop, which I dont see in this PR. Or is it that this just merges to a release branch and never to master.

I think these are nice additions and they should not be held back, but think we should be a little clearer in the docs. Maybe call it "Simplified GitFlow".

[noelwelsh]

These changes would be very useful to me. It is possible to fix the conflicts and get this merged?

[ouriel26]

It would be great if conflicts could be resolved !!!!!

[Meehau]

@jakehschwartz Thanks for the awesome improvement :) It would be really great if you could finalize this pull request!