opherv/gitflow4idea

Git Flow Integration plugin for IntelliJ

gitflow4idea's Issues

Phpstorm hangs while changing active tab

I had a problem with my PhpStorm on MAC related with git flow plugin. Every time after changing active tab, PhpStorm hung for about 3 seconds. I wrote about this issue to IntelliJ support and they suggested to turn off Git Flow Integration plugin and it solved my problem.

Can't finish release because of getopt issue.

14:50:53.820: git flow release finish -m "Version 0.2.2" 0.2.2
flags:FATAL the available getopt does not support spaces in options

Keymap for gitflow actions

Yesterday, I installed phpstrom gitflow4idea plugin.

This is very powerful for me. But I think something need more.
It is keymap setting. On keymap setting gitflow plugins actions can not set keymap.

I set 'git push', 'git pull' and 'git commit' key map on Git Intergration bundle plugin. but gitflow plugin can not do that.

So. I think this function is needed.

What do you think?

Git flow integration plugin for PhpStorm now working after installing it.

First all, thank you for taking the initiative to create this plug-in. Next, I just installed gitflow4idea from PhpStorm but I'm getting the error shown below (I'm using PhpStorm 7.1 and I've been git flow from the command for a while now) after entering the name of the feature at the New Feature pop-up screen. The plugin "Git Flow Integration" version is 0.3.4.

Btw, PhpStorm points at the "Changes" tool windows says "Error, please have a look at the Version Control console for more details", and error shown the Version tool window is shown below:

15:04:08.113: git flow feature start add-tmz
git: 'flow' is not a git command. See 'git --help'.
Did you mean one of these?
    reflog
    show

Support for -F flag (fetch from $ORIGIN before performing local operation)

Would be very useful to have a UI setting to add the -F flag for feature start & finish operations - perhaps even default it to on?

Ambiguous error after starting a feature

After I use the plugin to start a new feature I keep getting a red bubble saying "Error" appear from changes tab. However, everything does appear to have worked. The feature branch is correctly created.

When I view the event log in IntelliJ it merely says:

10:47:01 AM Error

Can't finish hotfix - getopt does not support spaces in options

I was able to start a hotfix branch, but trying to finish it gave me the following errors:

12:12:16.169: git flow hotfix start Fix_has_shortcode
Switched to a new branch 'hotfix/Fix_has_shortcode'
Summary of actions:
- A new branch 'hotfix/Fix_has_shortcode' was created, based on 'master'
- You are now on branch 'hotfix/Fix_has_shortcode'
Follow-up actions:
- Bump the version number now!
- Start committing your hot fixes
- When done, run:
     git flow hotfix finish 'Fix_has_shortcode'
12:15:47.934: cd /Users/morganestes/Documents/Websites/www.phase5system.dev
12:15:47.934: git flow hotfix finish -m "Tagging version 1.3.3" Fix_has_shortcode
flags:FATAL the available getopt does not support spaces in options
12:16:20.540: cd /Users/morganestes/Documents/Websites/www.phase5system.dev
12:16:20.540: git flow hotfix finish -m "Tagging version Fix_has_shortcode" Fix_has_shortcode
flags:FATAL the available getopt does not support spaces in options
12:21:43.782: cd /Users/morganestes/Documents/Websites/www.phase5system.dev
12:21:43.782: git flow hotfix finish -m "Tagging version 1.3.3" Fix_has_shortcode
flags:FATAL the available getopt does not support spaces in options

I'm running PhpStorm 7.1 build PS-133.326 on OS X Mavericks 10.9.1. Git-flow version is 0.4.1.

Have a bag in PhpStorm 7.0

PhpStorm 7.0 Build #PS-131.374
JRE 1.6.0_27
GitFlow plugin version - 0.3.1

On press "Gitflow" button in bottom panel PhpStorm show next message:

IDE Fatal Errors

Exception in plugin Git Flow Integration...

Detail:

null
java.lang.NullPointerException
    at java.lang.String.startsWith(String.java:1433)
    at java.lang.String.startsWith(String.java:1462)
    at gitflow.GitflowBranchUtil.isCurrentBranchFeature(GitflowBranchUtil.java:64)
    at gitflow.GitflowActions.getActions(GitflowActions.java:112)
    at gitflow.ui.GitflowWidget.getPopupStep(GitflowWidget.java:107)
    at com.intellij.openapi.wm.impl.status.IdeStatusBarImpl$MultipleTextValuesPresentationWrapper$1.onClick(IdeStatusBarImpl.java:691)
    at com.intellij.ui.ClickListener$1.mouseReleased(ClickListener.java:73)
    at java.awt.Component.processMouseEvent(Component.java:6288)
    at javax.swing.JComponent.processMouseEvent(JComponent.java:3267)
    at java.awt.Component.processEvent(Component.java:6053)
    at java.awt.Container.processEvent(Container.java:2045)
    at java.awt.Component.dispatchEventImpl(Component.java:4649)
    at java.awt.Container.dispatchEventImpl(Container.java:2103)
    at java.awt.Component.dispatchEvent(Component.java:4475)
    at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4633)
    at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4297)
    at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4227)
    at java.awt.Container.dispatchEventImpl(Container.java:2089)
    at java.awt.Window.dispatchEventImpl(Window.java:2587)
    at java.awt.Component.dispatchEvent(Component.java:4475)
    at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:675)
    at java.awt.EventQueue.access$300(EventQueue.java:96)
    at java.awt.EventQueue$2.run(EventQueue.java:634)
    at java.awt.EventQueue$2.run(EventQueue.java:632)
    at java.security.AccessController.doPrivileged(Native Method)
    at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:108)
    at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:119)
    at java.awt.EventQueue$3.run(EventQueue.java:648)
    at java.awt.EventQueue$3.run(EventQueue.java:646)
    at java.security.AccessController.doPrivileged(Native Method)
    at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:108)
    at java.awt.EventQueue.dispatchEvent(EventQueue.java:645)
    at com.intellij.ide.IdeEventQueue.e(IdeEventQueue.java:696)
    at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:520)
    at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:335)
    at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:275)
    at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:200)
    at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:190)
    at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:185)
    at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:177)
    at java.awt.EventDispatchThread.run(EventDispatchThread.java:138)



java.lang.NullPointerException
    at java.lang.String.startsWith(String.java:1433)
    at java.lang.String.startsWith(String.java:1462)
    at gitflow.GitflowBranchUtil.isCurrentBranchFeature(GitflowBranchUtil.java:64)
    at gitflow.GitflowActions.getActions(GitflowActions.java:112)
    at gitflow.ui.GitflowWidget.getPopupStep(GitflowWidget.java:107)
    at com.intellij.openapi.wm.impl.status.IdeStatusBarImpl$MultipleTextValuesPresentationWrapper$1.onClick(IdeStatusBarImpl.java:691)
    at com.intellij.ui.ClickListener$1.mouseReleased(ClickListener.java:73)
    at java.awt.Component.processMouseEvent(Component.java:6288)
    at javax.swing.JComponent.processMouseEvent(JComponent.java:3267)
    at java.awt.Component.processEvent(Component.java:6053)
    at java.awt.Container.processEvent(Container.java:2045)
    at java.awt.Component.dispatchEventImpl(Component.java:4649)
    at java.awt.Container.dispatchEventImpl(Container.java:2103)
    at java.awt.Component.dispatchEvent(Component.java:4475)
    at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4633)
    at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4297)
    at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4227)
    at java.awt.Container.dispatchEventImpl(Container.java:2089)
    at java.awt.Window.dispatchEventImpl(Window.java:2587)
    at java.awt.Component.dispatchEvent(Component.java:4475)
    at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:675)
    at java.awt.EventQueue.access$300(EventQueue.java:96)
    at java.awt.EventQueue$2.run(EventQueue.java:634)
    at java.awt.EventQueue$2.run(EventQueue.java:632)
    at java.security.AccessController.doPrivileged(Native Method)
    at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:108)
    at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:119)
    at java.awt.EventQueue$3.run(EventQueue.java:648)
    at java.awt.EventQueue$3.run(EventQueue.java:646)
    at java.security.AccessController.doPrivileged(Native Method)
    at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:108)
    at java.awt.EventQueue.dispatchEvent(EventQueue.java:645)
    at com.intellij.ide.IdeEventQueue.e(IdeEventQueue.java:696)
    at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:520)
    at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:335)
    at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:275)
    at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:200)
    at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:190)
    at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:185)
    at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:177)
    at java.awt.EventDispatchThread.run(EventDispatchThread.java:138)

RubyMine 6.3.3 - Not Loading

Always start with this error.
Screen Capture

WebStorm 6.0.1 install issue

Something wrong happens when I'm trying to install 0.3.6 version on my WebStorm.
When I search it through "browse rep" and click download && install - nothing happens.
If I try to install it from disk it says "Plugin Git Flow Integration is incompatible with current installation".
Tried 0.2.1 and others 0.3.x - not working too. What should I do? Seems that I need new WebStorm...

CI

Please fill out this request form to add this awesome plugin to Open Source CI server: https://docs.google.com/spreadsheet/viewform?hl=en_US&formkey=dERWT1Nmc08tQ2RzV29aWElWdjg3amc6MQ#gid=0

If you will have any questions with build configuration I will be happy to help!

Option to not tagging hotfix

Please add option to not tagging hotfixes ("-n" option of git-flow)

'Flow' not recognised in Pycharm on Mavericks

I've tried to installed this plugin a couple of times in Pycharm (3.4.1) on Mavericks but I always get an error saying that git flow isn't installed when I try to use it;

15:32:55.114: git flow feature start adminmedia_fix
git: 'flow' is not a git command. See 'git --help'.
Did you mean one of these?
    reflog
    show

However if I'm in terminal there isn't anything wrong with flow and I've been creating & finishing features without any problems.

IDEA stopped working after installing the release

After installing your plugin my IDEA doesn't start up anymore. I paste the console log down below. If you need any further information on - for example - what plugins I do have installed, just ask.

Jan

[   2272]  ERROR - llij.ide.plugins.PluginManager - Duplicate registration for EP: Git4Idea.GitHttpAuthDataProvider 
java.lang.RuntimeException: Duplicate registration for EP: Git4Idea.GitHttpAuthDataProvider
  at com.intellij.openapi.extensions.impl.ExtensionsAreaImpl.registerExtensionPoint(ExtensionsAreaImpl.java:323)
  at com.intellij.openapi.extensions.impl.ExtensionsAreaImpl.registerExtensionPoint(ExtensionsAreaImpl.java:135)
  at com.intellij.openapi.extensions.impl.ExtensionsAreaImpl.registerAreaExtensionsAndPoints(ExtensionsAreaImpl.java:348)
  at com.intellij.ide.plugins.IdeaPluginDescriptorImpl.setLoader(IdeaPluginDescriptorImpl.java:377)
  at com.intellij.ide.plugins.PluginManager.a(PluginManager.java:275)
  at com.intellij.ide.plugins.PluginManager.initPlugins(PluginManager.java:120)
  at com.intellij.openapi.application.impl.ApplicationImpl.d(ApplicationImpl.java:402)
  at com.intellij.openapi.application.impl.ApplicationImpl.<init>(ApplicationImpl.java:239)
  at com.intellij.openapi.application.ex.ApplicationManagerEx.createApplication(ApplicationManagerEx.java:39)
  at com.intellij.idea.IdeaApplication.<init>(IdeaApplication.java:89)
  at com.intellij.idea.IdeaUltimateApplication.<init>(IdeaUltimateApplication.java:13)
  at com.intellij.idea.MainImpl.a(MainImpl.java:137)
  at com.intellij.idea.MainImpl.access$000(MainImpl.java:30)
  at com.intellij.idea.MainImpl$1.proceed(MainImpl.java:124)
  at com.intellij.ide.a.e.y$4.run(y$4.java:364)
  at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:251)
  at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:733)
  at java.awt.EventQueue.access$200(EventQueue.java:103)
  at java.awt.EventQueue$3.run(EventQueue.java:694)
  at java.awt.EventQueue$3.run(EventQueue.java:692)
  at java.security.AccessController.doPrivileged(Native Method)
  at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76)
  at java.awt.EventQueue.dispatchEvent(EventQueue.java:703)
  at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242)
  at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161)
  at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:150)
  at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:146)
  at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:138)
  at java.awt.EventDispatchThread.run(EventDispatchThread.java:91)
[   2278]  ERROR - llij.ide.plugins.PluginManager - IntelliJ IDEA 12.1.4  Build #IU-129.713 
[   2278]  ERROR - llij.ide.plugins.PluginManager - JDK: 1.7.0_25 
[   2278]  ERROR - llij.ide.plugins.PluginManager - VM: Java HotSpot(TM) 64-Bit Server VM 
[   2278]  ERROR - llij.ide.plugins.PluginManager - Vendor: Oracle Corporation 
[   2278]  ERROR - llij.ide.plugins.PluginManager - OS: Linux 
[   2278]  ERROR - llij.ide.plugins.PluginManager - Duplicate registration for EP: Git4Idea.GitHttpAuthDataProvider 
java.lang.RuntimeException: Duplicate registration for EP: Git4Idea.GitHttpAuthDataProvider
  at com.intellij.openapi.extensions.impl.ExtensionsAreaImpl.registerExtensionPoint(ExtensionsAreaImpl.java:323)
  at com.intellij.openapi.extensions.impl.ExtensionsAreaImpl.registerExtensionPoint(ExtensionsAreaImpl.java:135)
  at com.intellij.openapi.extensions.impl.ExtensionsAreaImpl.registerAreaExtensionsAndPoints(ExtensionsAreaImpl.java:348)
  at com.intellij.ide.plugins.IdeaPluginDescriptorImpl.setLoader(IdeaPluginDescriptorImpl.java:377)
  at com.intellij.ide.plugins.PluginManager.a(PluginManager.java:275)
  at com.intellij.ide.plugins.PluginManager.initPlugins(PluginManager.java:120)
  at com.intellij.openapi.application.impl.ApplicationImpl.d(ApplicationImpl.java:402)
  at com.intellij.openapi.application.impl.ApplicationImpl.<init>(ApplicationImpl.java:239)
  at com.intellij.openapi.application.ex.ApplicationManagerEx.createApplication(ApplicationManagerEx.java:39)
  at com.intellij.idea.IdeaApplication.<init>(IdeaApplication.java:89)
  at com.intellij.idea.IdeaUltimateApplication.<init>(IdeaUltimateApplication.java:13)
  at com.intellij.idea.MainImpl.a(MainImpl.java:137)
  at com.intellij.idea.MainImpl.access$000(MainImpl.java:30)
  at com.intellij.idea.MainImpl$1.proceed(MainImpl.java:124)
  at com.intellij.ide.a.e.y$4.run(y$4.java:364)
  at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:251)
  at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:733)
  at java.awt.EventQueue.access$200(EventQueue.java:103)
  at java.awt.EventQueue$3.run(EventQueue.java:694)
  at java.awt.EventQueue$3.run(EventQueue.java:692)
  at java.security.AccessController.doPrivileged(Native Method)
  at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76)
  at java.awt.EventQueue.dispatchEvent(EventQueue.java:703)
  at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242)
  at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161)
  at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:150)
  at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:146)
  at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:138)
  at java.awt.EventDispatchThread.run(EventDispatchThread.java:91)
[   2280]  ERROR - llij.ide.plugins.PluginManager - IntelliJ IDEA 12.1.4  Build #IU-129.713 
[   2280]  ERROR - llij.ide.plugins.PluginManager - JDK: 1.7.0_25 
[   2280]  ERROR - llij.ide.plugins.PluginManager - VM: Java HotSpot(TM) 64-Bit Server VM 
[   2280]  ERROR - llij.ide.plugins.PluginManager - Vendor: Oracle Corporation 
[   2280]  ERROR - llij.ide.plugins.PluginManager - OS: Linux 

Make sure finishRelease invokes the merge dialog like finishFeature does

Wrong message on "Start Hotfix" action

When confirming a new hotfix start, the "internal" IDE message says

new hotfix XXX was created, based on 'develop'

Version Control Log pane, instead, says:

12:37:59.745: git flow hotfix start version-both
Switched to a new branch 'hotfix/version-both'
Summary of actions:
- A new branch 'hotfix/version-both' was created, based on 'master'
- You are now on branch 'hotfix/version-both'
Follow-up actions:
- Bump the version number now!
- Start committing your hot fixes
- When done, run:
     git flow hotfix finish 'version-both'

So, basically, it seems gitflow plugin reports the wrong branch name ("develop" instead "master").

IDE: intelliJ 13
Plugin version: 0.3.2

IncompatibleClassChangeError in Android Studio

Hey,

It looks like Android Studio ships with a slightly different version of git4idea which makes gitflow4idea throw an IncompatibleClassChangeError exception on startup:

Found class git4idea.repo.GitRepositoryManager, but interface was expected: Found class git4idea.repo.GitRepositoryManager, but interface was expected
java.lang.IncompatibleClassChangeError: Found class git4idea.repo.GitRepositoryManager, but interface was expected
    at gitflow.GitflowBranchUtil.<init>(GitflowBranchUtil.java:41)
    at gitflow.GitflowActions.<init>(GitflowActions.java:63)
    at gitflow.ui.GitflowWidget$2.run(GitFlowWidget.java:158)
    at com.intellij.openapi.application.impl.LaterInvocator$FlushQueue.run(LaterInvocator.java:347)
    at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:251)
    at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:727)
    at java.awt.EventQueue.access$200(EventQueue.java:103)
    at java.awt.EventQueue$3.run(EventQueue.java:688)
    at java.awt.EventQueue$3.run(EventQueue.java:686)
    at java.security.AccessController.doPrivileged(Native Method)
    at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76)
    at java.awt.EventQueue.dispatchEvent(EventQueue.java:697)
    at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:696)
    at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:524)
    at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:335)
    at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242)
    at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161)
    at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:150)
    at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:146)
    at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:138)
    at java.awt.EventDispatchThread.run(EventDispatchThread.java:91)

And when I click on the popup menu I get a NullPointerException:

null
java.lang.NullPointerException
    at gitflow.ui.GitflowWidget.getPopupStep(GitFlowWidget.java:107)
    at com.intellij.openapi.wm.impl.status.IdeStatusBarImpl$MultipleTextValuesPresentationWrapper$1.onClick(IdeStatusBarImpl.java:691)
    at com.intellij.ui.ClickListener$1.mouseReleased(ClickListener.java:73)
    at java.awt.Component.processMouseEvent(Component.java:6505)
    at javax.swing.JComponent.processMouseEvent(JComponent.java:3321)
    at java.awt.Component.processEvent(Component.java:6270)
    at java.awt.Container.processEvent(Container.java:2229)
    at java.awt.Component.dispatchEventImpl(Component.java:4861)
    at java.awt.Container.dispatchEventImpl(Container.java:2287)
    at java.awt.Component.dispatchEvent(Component.java:4687)
    at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4832)
    at java.awt.LightweightDispatcher.processMouseEvent(Container.java:4492)
    at java.awt.LightweightDispatcher.dispatchEvent(Container.java:4422)
    at java.awt.Container.dispatchEventImpl(Container.java:2273)
    at java.awt.Window.dispatchEventImpl(Window.java:2719)
    at java.awt.Component.dispatchEvent(Component.java:4687)
    at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:729)
    at java.awt.EventQueue.access$200(EventQueue.java:103)
    at java.awt.EventQueue$3.run(EventQueue.java:688)
    at java.awt.EventQueue$3.run(EventQueue.java:686)
    at java.security.AccessController.doPrivileged(Native Method)
    at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76)
    at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:87)
    at java.awt.EventQueue$4.run(EventQueue.java:702)
    at java.awt.EventQueue$4.run(EventQueue.java:700)
    at java.security.AccessController.doPrivileged(Native Method)
    at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76)
    at java.awt.EventQueue.dispatchEvent(EventQueue.java:699)
    at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:696)
    at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:520)
    at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:335)
    at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242)
    at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161)
    at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:150)
    at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:146)
    at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:138)
    at java.awt.EventDispatchThread.run(EventDispatchThread.java:91)

I'm using Windows 8 x64.

Thanks!

Implement automated testing & building (continuous integration)

UI does not refresh immediatly after finish release

TODO - check if same applies for feature/hotfix

JGit-flow

Would you consider updating the plugin to use JGit-flow? This would eliminate the need to install gitflow on the OS to use the plugin.

Git Flow is in "unsupported" state in PHPStorm 8.0.2 EAP 139.14

I can't enable and use gitflow plugin in newest EAP...

Enable custom editing of branch names in non-default configuration

Take a look at a comparison between the plugins init screen and the one from SmartGit/Hg.

The "next release" and "production release" branches are drop-downs and cannot be edited.

Plugin causes frequent IDE freeze in Android Studio 0.4.2

When this plugin is installed, we observe frequent UI freezes when navigating between different editors and panes in Android Studio 0.4.2.

Here's the AWT event queue thread dump:

"AWT-EventQueue-1 0.4.2#AI-133.970939, eap:true" prio=6 tid=10630d000 nid=0x11c307000 runnable [11c304000]
   java.lang.Thread.State: RUNNABLE
    at java.io.BufferedInputStream.<init>(BufferedInputStream.java:158)
    at java.lang.UNIXProcess$1.run(UNIXProcess.java:66)
    at java.security.AccessController.doPrivileged(Native Method)
    at java.lang.UNIXProcess.<init>(UNIXProcess.java:60)
    at java.lang.ProcessImpl.start(ProcessImpl.java:91)
    at java.lang.ProcessBuilder.start(ProcessBuilder.java:452)
    at com.intellij.execution.configurations.GeneralCommandLine.startProcess(GeneralCommandLine.java:291)
    at com.intellij.execution.configurations.GeneralCommandLine.createProcess(GeneralCommandLine.java:272)
    at git4idea.commands.GitTextHandler.createProcess(GitTextHandler.java:122)
    at git4idea.commands.GitTextHandler.startProcess(GitTextHandler.java:57)
    - locked <7bbede3a8> (a java.lang.Object)
    at git4idea.commands.GitHandler.start(GitHandler.java:457)
    - locked <7bbed1728> (a git4idea.commands.GitSimpleHandler)
    at git4idea.commands.GitHandler.runInCurrentThread(GitHandler.java:794)
    at git4idea.commands.GitSimpleHandler.run(GitSimpleHandler.java:236)
    at git4idea.config.GitConfigUtil.getValue(GitConfigUtil.java:120)
    at gitflow.GitflowConfigUtil.getDevelopBranch(GitflowConfigUtil.java:49)
    at gitflow.GitflowActions.<init>(GitflowActions.java:80)
    at gitflow.ui.GitflowWidget$2.run(GitflowWidget.java:158)
    at com.intellij.openapi.application.impl.LaterInvocator$FlushQueue.run(LaterInvocator.java:346)
    - locked <7c2c31070> (a java.lang.Object)
    at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:209)
    at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:715)
    at java.awt.EventQueue.access$400(EventQueue.java:82)
    at java.awt.EventQueue$2.run(EventQueue.java:676)
    at java.awt.EventQueue$2.run(EventQueue.java:674)
    at java.security.AccessController.doPrivileged(Native Method)
    at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:86)
    at java.awt.EventQueue.dispatchEvent(EventQueue.java:685)
    at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:696)
    at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:524)
    at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:335)
    at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:296)
    at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:211)
    at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:201)
    at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:196)
    at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:188)
    at java.awt.EventDispatchThread.run(EventDispatchThread.java:122)

Without looking into the code in-depth, it appears to be either executing a command line tool from the UI thread quite frequently.

Option to avoid tagging release

Currently when finishing release the release tag is created from develop branch. But in our case this is a wrong behavior. Now I have to delete this tag and create a new tag from master manually. It will be nice to have an option to force GitFlow make tags from master.

Additional Parameter Options [Enhancement]

Feature Request: Support for more command-line flags (-r, -k, --keepremote, --keeplocal, etc)

Instead of necessarily adding every possible flag to the settings UI, possibly a single box for each gitflow action where the user can enter a custom string which will be appended.

So if your workflow prefers git flow feature finish -r --keepremote, you can just enter -r --keepremote into a box for Finish Feature, and it'll be used whenever that action is clicked.

"Missing argument <version>" when "Don't tag release" enabled

When "Don't tag release" option enabled git-flow invoked without version number, like this:

git flow release finish -n

And so we got error:

Missing argument <version>

Init repo

After Init gitflow repo I have to restart PhpStorm to make gitflow integratoin work, because it shows "No Gitflow" label and causes NullPointerException on click.

After restart everything works fine.

PhpStorm veersion: 7.1.3
Gitflow Integration version: 0.3.4

PhpStorm incompatible with latest version

I don't know if this is a bug or expected behavior: Version 0.2.1 works fine with latest PhpStorm (6.0.3) version but 0.3.x does not. Since the official plugin site (http://plugins.jetbrains.com/update/index?pr=phpStorm&updateId=14161) states it is compatible and I didn't find any other indicator, you might want to put a notice somewhere that 0.3 is not compatible with PhpStorm 6.0.x. Or even better, fix the incompatibility ;)

FYI, the error message I get for 0.3.1 is "Plugin Git Flow Integration is incompatible with current installation"

Option to set template for tag commit message

It will be nice have an ability to change tag commit template globally. For example to translate it.

compatibility with IDEA 12

Hi,

I just saw your plugin and liked to use it. I haven't found it in the hosted plugins by intellij, so I downloaded the version (0.3.1) from http://plugins.jetbrains.com/plugin/7315 and tried to manually install it.

Is it possible to make this plugin compatible with the version 12 of IDEA or are there major changes?

Thanks,
Tony

Compatability Issues with GitHub, BitBucket and Heroku plugins

Add error handling on improperly initialized repos (nullpointerexception)

when id click on gitflow i got the following exception

NullPointerException: Error during dispatching of java.awt.event.MouseEvent[MOUSE_RELEASED,(983,707),absolute(1049,759),button=1,modifiers=Button1,clickCount=1] on frame0
33

Exception NoClassDefFoundError since EAP138.1289

Hi,

Since i've updated phpStorm to the latest EAP 138.1289 i get the following error:

NoClassDefFoundError: git4idea/commands/GitLineHandlerPasswordRequestAware

This error appear each time i open a project

Merge conflict on finish branch should invoke merge tool

When I have a merge conflict (two feature branches modified the same thing and try to merge back into develop), I simply get "Error". I believe IDEA's git plugin gives me the option to merge. Can you hook into that?

Add an option for hotfix message template

When i click on finish hotfix - popup windoiw appers asking me to write tag message. And there are already text present. Something like "Tagging hotfix {hotfixname}". And i can't just click OK on it. Because that text not quoted and causes error. It will be really nice if prepopulated text will consists only from hotfix name. And quoting tag message is very importatnt thing too.

Change plugin.xml to support up to version 133

PhpStorm EAP 138.84

After PhpStorm update GitFow Integration plogin not working and marked on red color

IDEA 13.1

This plugin no longer works with 13.1 Community edition.

Exception in latest EAP

IntelliJ 138.1503.3

2014-08-19 09:38:28,389 [ 540401]  ERROR - plication.impl.ApplicationImpl - IntelliJ IDEA (Cassiopeia) IU-138.1503.3  Build #IU-138.1503.3 
2014-08-19 09:38:28,389 [ 540401]  ERROR - plication.impl.ApplicationImpl - JDK: 1.7.0_67 
2014-08-19 09:38:28,389 [ 540401]  ERROR - plication.impl.ApplicationImpl - VM: Java HotSpot(TM) 64-Bit Server VM 
2014-08-19 09:38:28,390 [ 540402]  ERROR - plication.impl.ApplicationImpl - Vendor: Oracle Corporation 
2014-08-19 09:38:28,390 [ 540402]  ERROR - plication.impl.ApplicationImpl - OS: Linux 
2014-08-19 09:38:28,390 [ 540402]  ERROR - plication.impl.ApplicationImpl - Last Action: EditorLineStart 
2014-08-19 09:38:28,471 [ 540483]  ERROR - plication.impl.ApplicationImpl - cannot create class "gitflow.actions.PublishHotfixAction" [Plugin: Gitflow] 
com.intellij.diagnostic.PluginException: cannot create class "gitflow.actions.PublishHotfixAction" [Plugin: Gitflow]
    at com.intellij.openapi.actionSystem.impl.ActionManagerImpl.a(ActionManagerImpl.java:287)
    at com.intellij.openapi.actionSystem.impl.ActionManagerImpl.a(ActionManagerImpl.java:239)
    at com.intellij.openapi.actionSystem.impl.ActionManagerImpl.getAction(ActionManagerImpl.java:232)
    at com.intellij.ide.util.gotoByName.GotoActionItemProvider.a(GotoActionItemProvider.java:133)
    at com.intellij.ide.util.gotoByName.GotoActionItemProvider.filterElements(GotoActionItemProvider.java:75)
    at com.intellij.ide.util.gotoByName.GotoActionItemProvider.filterElements(GotoActionItemProvider.java:63)
    at com.intellij.ide.util.gotoByName.ChooseByNameBase$CalcElementsThread.addElementsByPattern(ChooseByNameBase.java:1560)
    at com.intellij.ide.util.gotoByName.ChooseByNameBase$CalcElementsThread$1$1$1.run(ChooseByNameBase.java:1512)
    at com.intellij.openapi.application.impl.ApplicationImpl.runReadAction(ApplicationImpl.java:941)
    at com.intellij.ide.util.gotoByName.ChooseByNameBase$CalcElementsThread$1$1.run(ChooseByNameBase.java:1497)
    at com.intellij.ide.util.gotoByName.ChooseByNameBase$CalcElementsThread$1.run(ChooseByNameBase.java:1524)
    at com.intellij.openapi.progress.impl.ProgressManagerImpl$2.run(ProgressManagerImpl.java:184)
    at com.intellij.openapi.progress.ProgressManager.executeProcessUnderProgress(ProgressManager.java:222)
    at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:218)
    at com.intellij.openapi.progress.impl.ProgressManagerImpl.runProcess(ProgressManagerImpl.java:171)
    at com.intellij.ide.util.gotoByName.ChooseByNameBase$CalcElementsThread.run(ChooseByNameBase.java:1491)
    at com.intellij.openapi.application.impl.ApplicationImpl$9.run(ApplicationImpl.java:446)
    at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
    at java.util.concurrent.FutureTask.run(FutureTask.java:262)
    at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
    at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
    at java.lang.Thread.run(Thread.java:745)
    at com.intellij.openapi.application.impl.ApplicationImpl$1$1.run(ApplicationImpl.java:149)
Caused by: java.lang.reflect.InvocationTargetException
    at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
    at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)
    at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
    at java.lang.reflect.Constructor.newInstance(Constructor.java:526)
    at com.intellij.openapi.actionSystem.impl.ActionManagerImpl.a(ActionManagerImpl.java:264)
    ... 22 more
Caused by: java.lang.NoClassDefFoundError: git4idea/commands/GitLineHandlerPasswordRequestAware
    at java.lang.Class.forName0(Native Method)
    at java.lang.Class.forName(Class.java:270)
    at com.intellij.openapi.components.impl.ServiceManagerImpl$MyComponentAdapter.a(ServiceManagerImpl.java:128)
    at com.intellij.openapi.components.impl.ServiceManagerImpl$MyComponentAdapter.a(ServiceManagerImpl.java:171)
    at com.intellij.openapi.components.impl.ServiceManagerImpl$MyComponentAdapter.initializeInstance(ServiceManagerImpl.java:159)
    at com.intellij.openapi.components.impl.ServiceManagerImpl$MyComponentAdapter$1.compute(ServiceManagerImpl.java:147)
    at com.intellij.openapi.application.impl.ApplicationImpl.runReadAction(ApplicationImpl.java:953)
    at com.intellij.openapi.components.impl.ServiceManagerImpl$MyComponentAdapter.getComponentInstance(ServiceManagerImpl.java:139)
    at com.intellij.util.pico.DefaultPicoContainer.getLocalInstance(DefaultPicoContainer.java:236)
    at com.intellij.util.pico.DefaultPicoContainer.getInstance(DefaultPicoContainer.java:223)
    at com.intellij.util.pico.DefaultPicoContainer.getComponentInstance(DefaultPicoContainer.java:210)
    at org.picocontainer.alternatives.AbstractDelegatingMutablePicoContainer.getComponentInstance(AbstractDelegatingMutablePicoContainer.java:75)
    at com.intellij.openapi.components.ServiceManager.getService(ServiceManager.java:36)
    at gitflow.actions.GitflowAction.<init>(GitflowAction.java:22)
    at gitflow.actions.PublishHotfixAction.<init>(PublishHotfixAction.java:13)
    ... 27 more
Caused by: java.lang.ClassNotFoundException: git4idea.commands.GitLineHandlerPasswordRequestAware PluginClassLoader[Gitflow, 0.3.7.2]
    at com.intellij.ide.plugins.cl.PluginClassLoader.loadClass(PluginClassLoader.java:68)
    at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
    ... 42 more

Implement git flow init -f (force reinit)

Once you have init the repository configuration, it's imposible to reconfigure it.

[Hotfix]Error on tag

On Publish Hotfix, your plugin return errors in version control terminal because in your command to create tag, you add too many parameters.

11:11:01.427: cd /home/throrin19/Programmation/Web/goomeoeventsapi
11:11:01.427: git flow hotfix finish -m "Tagging version 4.0.9" 4.0.9
Switched to branch 'master'
Merge made by the 'recursive' strategy.
 app/controllers/v1/events_controller.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
fatal: too many params
Tagging failed. Please run finish again to retry.

Error: Gitflow is not installed

When trying to start a new hotfix, feature or release the following error is returned in the event log:

13:18:29 Error: Gitflow is not installed
13:18:29 Error

Gitflow is installed and works as expected from both my external terminal and PHP Storms built in terminal.

Init Gitflow repo default settings

When i use gitflow init from console it suggests me to use 'master' branch for production releases and it make sense. But Gitflow Integration plugin suggests me to use 'develop' branch for both, production and next release.

I think we have to use default settings from original gitflow. Or atleast have ability to set these params in plugin settings.

Hotfix based on develop

When i create hotfix I see notice that tells my that new hotfix branch was created based on "develop". But its not true. All gitflow hotfixes based on master branch!

Error on IntelliJ IDEA 13.1.3 after update to 0.3.7

I'm using IntelliJ IDEA 13.1.3 (Build 135.909). After update to 0.3.7, I cannot open any my IntelliJ IDEA projects. When I open a project, I meet a following error message.

Plugin 'Gitflow' failed to initialize and will be disabled.  Please restart IntelliJ IDEA.

com.intellij.diagnostic.PluginException: gitflow/GitflowComponent : Unsupported major.minor version 51.0 [Plugin: Gitflow]
    at com.intellij.ide.plugins.cl.PluginClassLoader.b(PluginClassLoader.java:130)
    at com.intellij.ide.plugins.cl.PluginClassLoader.a(PluginClassLoader.java:77)
    at com.intellij.ide.plugins.cl.PluginClassLoader.loadClass(PluginClassLoader.java:66)
    at java.lang.ClassLoader.loadClass(ClassLoader.java:247)
    at java.lang.Class.forName0(Native Method)
    at java.lang.Class.forName(Class.java:249)
    at com.intellij.openapi.components.impl.ComponentManagerImpl$ComponentsRegistry.a(ComponentManagerImpl.java:408)
    at com.intellij.openapi.components.impl.ComponentManagerImpl$ComponentsRegistry.a(ComponentManagerImpl.java:398)
    at com.intellij.openapi.components.impl.ComponentManagerImpl$ComponentsRegistry.access$000(ComponentManagerImpl.java:384)
    at com.intellij.openapi.components.impl.ComponentManagerImpl.a(ComponentManagerImpl.java:107)
    at com.intellij.openapi.components.impl.ComponentManagerImpl.init(ComponentManagerImpl.java:89)
    at com.intellij.openapi.project.impl.ProjectImpl.init(ProjectImpl.java:296)
    at com.intellij.openapi.project.impl.ProjectManagerImpl.a(ProjectManagerImpl.java:280)
    at com.intellij.openapi.project.impl.ProjectManagerImpl.access$400(ProjectManagerImpl.java:83)
    at com.intellij.openapi.project.impl.ProjectManagerImpl$10.compute(ProjectManagerImpl.java:580)
    at com.intellij.openapi.project.impl.ProjectManagerImpl$10.compute(ProjectManagerImpl.java:576)
    at com.intellij.openapi.progress.impl.ProgressManagerImpl$4.run(ProgressManagerImpl.java:240)
    at com.intellij.openapi.progress.impl.ProgressManagerImpl$TaskRunnable.run(ProgressManagerImpl.java:471)
    at com.intellij.openapi.progress.impl.ProgressManagerImpl$6.run(ProgressManagerImpl.java:281)
    at com.intellij.openapi.progress.impl.ProgressManagerImpl$2.run(ProgressManagerImpl.java:178)
    at com.intellij.openapi.progress.ProgressManager.executeProcessUnderProgress(ProgressManager.java:209)
    at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:212)
    at com.intellij.openapi.progress.impl.ProgressManagerImpl.runProcess(ProgressManagerImpl.java:171)
    at com.intellij.openapi.application.impl.ApplicationImpl$10$1.run(ApplicationImpl.java:645)
    at com.intellij.openapi.application.impl.ApplicationImpl$8.run(ApplicationImpl.java:419)
    at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:439)
    at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
    at java.util.concurrent.FutureTask.run(FutureTask.java:138)
    at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:895)
    at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:918)
    at java.lang.Thread.run(Thread.java:695)
    at com.intellij.openapi.application.impl.ApplicationImpl$1$1.run(ApplicationImpl.java:149)
Caused by: java.lang.UnsupportedClassVersionError: gitflow/GitflowComponent : Unsupported major.minor version 51.0
    at java.lang.ClassLoader.defineClass1(Native Method)
    at java.lang.ClassLoader.defineClassCond(ClassLoader.java:637)
    at java.lang.ClassLoader.defineClass(ClassLoader.java:621)
    at java.lang.ClassLoader.defineClass(ClassLoader.java:471)
    at com.intellij.util.lang.UrlClassLoader._defineClass(UrlClassLoader.java:195)
    at com.intellij.util.lang.UrlClassLoader.defineClass(UrlClassLoader.java:191)
    at com.intellij.util.lang.UrlClassLoader._findClass(UrlClassLoader.java:167)
    at com.intellij.ide.plugins.cl.PluginClassLoader.b(PluginClassLoader.java:124)
    ... 31 more

Please check this error, and could you tell me how can I solve this error?

Should I add an option to push tags?

Currently, the intellij git4idea plugin doesn't have any way of pushing tags. It used to have this functionality but it got removed. See this issue

This means that while you can finish a release and push it with gitflow4idea, you still need to push the release tag externally using command line or some other git client, which is highly inconvenient.

While running git commands is out of the scope of this plugin, I feel that it might be useful to add a general "push tags" command (that runs git push --tags) as one of the gitflow actions, at least until Jetbrains addresses this issue.

What do you think?

Doesn't look like its running git-flow hooks

I have a few git-flow hooks and they work fine when running from the command line:

git flow hotfix start etc....

it runs the following hook

#!/bin/sh
#
# Runs at the end of git flow hotfix start
#
# Positional arguments:
# $1    The version (including the version prefix)
# $2    The origin remote
# $3    The full branch name (including the feature prefix)
# $4    The base from which this feature is started
#
VERSION=$1
ORIGIN=$2
BRANCH=$3
BASE=$4

# Implement your script here.
. "$HOOKS_DIR"/gitflow-functions
ROOTDIR=$(git rev-parse --show-toplevel)

gitflow_set_major_minor $VERSION
gitflow_build_version

gitflow_update_version $AVH_VERSION

#> $ROOTDIR/sql_changes.sql

#git commit -a -m "Cleared sql migration file for version: $AVH_VERSION"

# To terminate the git-flow action, return a non-zero exit code.
exit 0

starting a hotfix from the IDE doesn't look like it runs the hook, as the version file still has the same version etc....

PHPStorm EAP access

it would be AMAZING if you could update teh version to allow the EAP users to install this plugin.

IDEA 12 files out of sync after changes

Every time gitflow changes something (switch to a different branch, merge, etc), the file is out of sync, and it takes a while and a popup for IDEA to get back in sync. Is it possible to have it synx automatically?

This is for 0.2.1.

multiple repo management not working

I have a setup like this:
-root-repo
--extension1-repo
--extension2-repo
The extensions are no submodules but multiple 3rd party addons.
I have enabled the vcs-root directories in phpstorm and i get another gitflow-dropdown in the status bar. The problem is, that all dropdowns only affect my root-repo and i am not able to use git-flow from phpstorm in the sub-repositories.