Community
Participate
Working Groups
Build Identifier: It would be nice if EGit added a "Enable Git Flow" extension on GIT Projects so that it would be easier to use git-flow extensions. More info: http://nvie.com/posts/a-successful-git-branching-model/ - Explanation of the workflow http://nvie.com/posts/a-git-flow-screencast/ - Screencast showing it in action http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/ - Usage of the workflow in blog post form https://github.com/nvie/gitflow - Repo of the git flow extension, also contains wiki pages about it. Reproducible: Always
There is also an issue related to this in JBoss Tools: https://issues.jboss.org/browse/JBIDE-9080
this is an enhancement request
Do you see this as a set of menu extensions to start and finish the specific branch types? Would a larger visualization of the branches and their relation to each other (perhaps using GEF or Zest) be useful as well?
That would be awesome !
+1 This would improve the quality of the plugin greatly !
A visualization of features-under-development and available releases would be great (along with context menu support to switch there). UI integration to start/stop features, releases, hotfixes would be needed to. I'd prefer to have this in a separate view.
This feature would be fantastic and make egit much easier to use
I can second this request. Would be really great to see this happening.
bug309578 covers the most important parts of "git flow".
Any news?
I have been working on a Git Flow extension for EGit recently. Thus far, I only implemented the features I need personally, but I think it got to a point where it has some advantages for others as well. Most importantly it does not run into resource locking issues, as it sometimes happens when combining the command line tool with the Eclipse workspace refresh hooks. Now, I hope to contribute this to EGit, so others can start contributing, and we can soon have a full Git Flow implementation in Eclipse! I took care to write tests, add copyright headers and "sign off" on every commit, so I hope there is not too much in the way, given that a commiter finds the time to review it. If you want to try the current state, here you go. But be sure to make a backup of your repository. https://bintray.com/artifact/download/goliath/generic/org.eclipse.egit.repository-4.0.0-SNAPSHOT-luna.zip The UI so far is rudimentary, and consists of two context menu contributions. One in the repository view, another one in the history view. I have plans to improve this, but ideas are welcome. The sources are on GitHub: https://github.com/Treehopper/egit If you want to build it, this currently seems to be the way: $ mvn clean install -Djgit-site=https://repo.eclipse.org/content/unzip/snapshots.unzip/org/eclipse/jgit/org.eclipse.jgit.repository/4.0.0-SNAPSHOT/org.eclipse.jgit.repository-4.0.0-SNAPSHOT.zip-unzip/
great news, will give it a try soon Looking forward that you contribute this to EGit, follow the contributor guide [1] to push your changes to Gerrit. Let us know on the mailing list if you need any help. [1] https://wiki.eclipse.org/EGit/Contributor_Guide#Contributing_Patches
if you want your contributions to be shipped with 4.0 and Mars they should be in before Mars IP log review on May 22
I tried your new feature (I don't use git-flow so far) and it already looks pretty good I think in order to prevent polluting the menus for EGit users which don't use git-flow we should have a way to enable it globally or on some repositories, I propose we use a custom git config option to implement that. We already do that for enabling the Gerrit code review workflow. If there is a way to auto-detect that git-flow is used on a repository we could auto-enable git-flow menus on that repo.
Yes, you can see in config and if there are these or such lines: [gitflow "branch"] master = master develop = develop [gitflow "prefix"] feature = feature/ release = release/ hotfix = hotfix/ support = support/ versiontag = Another way is when repo has some common accepted branches, like: "master and develop" or at least one branch named "feature/...", "hotfix/..." or else.
(In reply to Alexander Ustimenko from comment #15) > Yes, you can see in config and if there are these or such lines: > > [gitflow "branch"] > master = master > develop = develop > [gitflow "prefix"] > feature = feature/ > release = release/ > hotfix = hotfix/ > support = support/ > versiontag = this is pretty explicit, so we should auto-enable git-flow menus if such entries are in the configuration of a repository > Another way is when repo has some common accepted branches, like: "master > and develop" or at least one branch named "feature/...", "hotfix/..." or > else. this is only a weak indicator
(In reply to Matthias Sohn from comment #16) > this is pretty explicit, so we should auto-enable git-flow menus if such > entries are in the configuration of a repository One command is still necessary though: "git flow init" to create said entries. Global (de-)activation is not a good option I think because it is probably rather common to have both, git-flow and non-git-flow repositorys in EGit at the same time. But there are some other possibilities. For example, entire separate views for git flow, or simply accessing all git flow features via quick access. I am sure others will contribute ideas as well, as soon as the core commands are complete and free from major bugs. I am currently working on preparing for the review.
I don't see a need to separate views for git-flow, I just want to avoid that users which don't use git-flow see the git-flow commands in prominent places at the top of EGit menus (we had similar discussions for the Gerrit menus). Hence this should be configurable. Maybe we could use the following approach: - show the git-flow menus on repositories which have any gitflow config entries - always show the menu entry for "git-flow init" on repository nodes in the repositories view and maybe also at the bottom of the EGit team menu on projects
(In reply to Matthias Sohn from comment #18) > Maybe we could use the following approach: > - show the git-flow menus on repositories which have any gitflow config > entries > - always show the menu entry for "git-flow init" on repository nodes in the > repositories view and maybe also at the bottom of the EGit team menu on > projects I think I can make that work. If there are multiple ways to access the git flow commands, I am also open to disabling the context menu entries via preferences. I don't think they are the best/quickest way to work with git flow anyway because I often run multiple git flow commands in sequence. As Christian Pontesegger pointed out, having additional views for git flow might have some benefits. If that's what it's going to be in the end, there might be no need for the menu entry. But, I don't have a strong opinion about any of that. :)
(In reply to Max Hohenegger from comment #19) > (In reply to Matthias Sohn from comment #18) > > Maybe we could use the following approach: > > - show the git-flow menus on repositories which have any gitflow config > > entries > > - always show the menu entry for "git-flow init" on repository nodes in the > > repositories view and maybe also at the bottom of the EGit team menu on > > projects > I think I can make that work. then I propose you start this way, it's probably less work than implementing a new view and I think it's important to quickly get out a first implementation to get some usage to collect feedback from users > If there are multiple ways to access the git flow commands, I am also open > to disabling the context menu entries via preferences. I don't think they > are the best/quickest way to work with git flow anyway because I often run > multiple git flow commands in sequence. > As Christian Pontesegger pointed out, having additional views for git flow > might have some benefits. If that's what it's going to be in the end, there > might be no need for the menu entry. if it turns out a new git-flow view makes sense then of course add it
Here is my contribution: https://git.eclipse.org/r/#/c/46858/ Let me know if there is something you want changed!
merged as http://git.eclipse.org/c/egit/egit.git/commit/?id=9904bd578ea60f3d28f38fec69af0456af805b12 with this change EGit now has basic support for git-flow, file new bugs for further enhancements of git-flow support
I will create a new Bugzilla component for gitflow support in EGit as soon as webmaster has provisioned the corresponding inbox email address
Matthias and Max, I'm currently using the stable build of the egit which has the gitFlow add-on (we're a git-flow shop). In some cases it works and in other cases none of the options are available (even after the Init Git Flow). I'd like to help you test this excellent new feature. I've searched for a specific discussion group but I haven't seen one. I did see that there is a gitFlow comp in Bugzilla. Is that the only place for comments?
You are very welcome helping us testing and providing feedback. Send your comments to the egit-dev mailing list [1] or file bugs and enhancement requests for EGit / Gitflow here in Bugzilla. Note that in order to be able to post to the mailing list you first have to subscribe for this list. [1] https://dev.eclipse.org/mailman/listinfo/egit-dev
@David, also have a look in the Gitflow component for existing bugs/enhancements: https://bugs.eclipse.org/bugs/buglist.cgi?component=Gitflow&list_id=12101833&product=EGit&query_format=advanced
