Git Flow Integration plugin for IntelliJ

Last update: Dec 1, 2022

Related tags

Overview

Git Flow Integration for Intellij

An intelliJ plugin providing a UI layer for git-flow, which in itself is a collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model.

Supporting my work (so that the plugin doesn't die)

Do you use this free software at work? Great! Would you like it to stay free? Of course you do.

I'm not a Java developer. In fact, I don't even like Java. Still I've been actively supporting this plugin for the past 5+ years on my own free time.

If saved you or your company time and effort, please consider supporting me by buying me a cup of coffee. Better yet, get your boss to donate 10 cups. It's company money, they won't mind.

Getting started

For the best introduction to get started with git flow, please read Jeff Kreeftmeijer's blog post:

http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/

Or have a look at this cheat sheet by Daniel Kummer:

Who and why

This plugin was created by Opher Vishnia, after I couldn't find any similar implementation. I saw this suggestion page on the JetBrains site has more than 220 likes and 80 comments, and decided to take up the gauntlet :)

Huge shoutout to Kirill Likhodedov, who wrote much of the original git4idea plugin, without which this plugin could not exist

Installation

The plugin is available via the IntelliJ plugin manager. Just search for "Git Flow Integration" to get the latest version!

The plugin requires that you have gitflow installed, specifically the AVH edition. This is because the Vanilla Git Flow hasn't been maintained in years. See this page for details

Caveats

While the plugin is operational and contains all basic functions (init/feature/release/hotfix), it may contains bugs. With your help I'll be able to find and zap them all.

Helping out

This project is under active development. If you encounter any bug or an issue, I encourage you to add the them to the Issues list on Github. Feedback and suggestions are also very welcome.

License

Comments

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.
opened by Leenug 49

NullPointerException on GitFlow actions with build 181

Hi,

Thanks for this great plugin.

When I do Start new release, then enter "v1.2.3", it fails with:

null
java.lang.NullPointerException
	at gitflow.GitflowImpl.run(GitflowImpl.java:62)
	at gitflow.GitflowImpl.startRelease(GitflowImpl.java:252)
	at gitflow.actions.StartReleaseAction$1.run(StartReleaseAction.java:35)
	at com.intellij.openapi.progress.impl.CoreProgressManager$TaskRunnable.run(CoreProgressManager.java:750)
	at com.intellij.openapi.progress.impl.CoreProgressManager.a(CoreProgressManager.java:157)
	at com.intellij.openapi.progress.impl.CoreProgressManager.a(CoreProgressManager.java:580)
	at com.intellij.openapi.progress.impl.CoreProgressManager.executeProcessUnderProgress(CoreProgressManager.java:525)
	at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:85)
	at com.intellij.openapi.progress.impl.CoreProgressManager.runProcess(CoreProgressManager.java:144)
	at com.intellij.openapi.progress.impl.CoreProgressManager$4.run(CoreProgressManager.java:395)
	at com.intellij.openapi.application.impl.ApplicationImpl$1.run(ApplicationImpl.java:305)
	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
	at java.lang.Thread.run(Thread.java:745)

I will try to find out what's wrong.

opened by kylekatarnls 31

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.

opened by hiredgun 22

UI Freeze

Plug-in seems to hang IntelliJ IDEA.

Git Flow Integration (0.6.5.1)

"AWT-EventQueue-0 2018.1.2#IU-181.4668.68 IDEA, eap:false, os:Windows 10 10.0, java-version:JetBrains s.r.o 1.8.0_152-release-1136-b29" prio=0 tid=0x0 nid=0x0 waiting on condition
     java.lang.Thread.State: TIMED_WAITING
 on com.intellij.util.concurrency.Semaphore$Sync@31aa0841
	at sun.misc.Unsafe.park(Native Method)
	at java.util.concurrent.locks.LockSupport.parkNanos(LockSupport.java:215)
	at java.util.concurrent.locks.AbstractQueuedSynchronizer.doAcquireSharedNanos(AbstractQueuedSynchronizer.java:1037)
	at java.util.concurrent.locks.AbstractQueuedSynchronizer.tryAcquireSharedNanos(AbstractQueuedSynchronizer.java:1328)
	at com.intellij.util.concurrency.Semaphore.waitForUnsafe(Semaphore.java:109)
	at com.intellij.util.concurrency.Semaphore.waitFor(Semaphore.java:99)
	at com.intellij.execution.process.ProcessHandler.waitFor(ProcessHandler.java:87)
	at com.intellij.execution.process.BaseOSProcessHandler.waitFor(BaseOSProcessHandler.java:236)
	at git4idea.commands.GitTextHandler.waitForProcess(GitTextHandler.java:144)
	at git4idea.commands.GitHandler.runInCurrentThread(GitHandler.java:440)
	at git4idea.commands.GitImplBase.doRun(GitImplBase.java:145)
	at git4idea.commands.GitImplBase.run(GitImplBase.java:119)
	at git4idea.commands.GitImplBase.runCommand(GitImplBase.java:43)
	at git4idea.commands.GitImpl.runCommand(GitImpl.java:56)
	at git4idea.config.GitConfigUtil.getValue(GitConfigUtil.java:96)
	at gitflow.GitflowConfigUtil.getFeaturePrefix(GitflowConfigUtil.java:63)
	at gitflow.GitflowBranchUtil.hasGitflow(GitflowBranchUtil.java:53)
	at gitflow.ui.GitflowWidget.update(GitflowWidget.java:168)
	at gitflow.ui.GitflowWidget.access$100(GitflowWidget.java:54)
	at gitflow.ui.GitflowWidget$2.run(GitflowWidget.java:143)
	at com.intellij.openapi.application.TransactionGuardImpl$2.run(TransactionGuardImpl.java:315)
	at com.intellij.openapi.application.impl.LaterInvocator$FlushQueue.doRun(LaterInvocator.java:447)
	at com.intellij.openapi.application.impl.LaterInvocator$FlushQueue.runNextEvent(LaterInvocator.java:431)
	at com.intellij.openapi.application.impl.LaterInvocator$FlushQueue.run(LaterInvocator.java:415)
	at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:311)
	at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:762)
	at java.awt.EventQueue.access$500(EventQueue.java:98)
	at java.awt.EventQueue$3.run(EventQueue.java:715)
	at java.awt.EventQueue$3.run(EventQueue.java:709)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:80)
	at java.awt.EventQueue.dispatchEvent(EventQueue.java:732)
	at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:779)
	at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:720)
	at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:395)
	at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:201)
	at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:116)
	at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:105)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:93)
	at java.awt.EventDispatchThread.run(EventDispatchThread.java:82)

https://youtrack.jetbrains.com/issue/IDEA-190524

opened by CrazyCoder 20

Integrate to task switcher

We are using a task server (Redmine) in PHPStorm and open tasks using the Tools -> Tasks and Contextes -> Open Task. This function allows creating new branches on the fly.

Could you integrate the git flow, so it is possible to create a new feature or hotfix on the fly?
enhancement

opened by amenk 20
idea2019.3 not install
I'm submitting a ...

[ ] bug report

[ ] feature request

[ ] puppy => You're not submitting a puppy. I already have one and he's adorable

What is the current behavior?

Is this a bug? Sorry about that. If so give me explicit details how to reproduce:

Open IntelliJ

???

Profit

What is the expected behavior?

What is the motivation / use case for changing the behavior?

Please tell me about your environment:

Gitflow4idea version: 0.7

Gitflow version: 1.12.3

IntelliJ Help -> about > click copy icon and paste here. Should look like this:

IntelliJ IDEA 2019.3 (Ultimate Edition) Build #IU-193.5233.57, built on November 20, 2019 Licensed to Vladislav Kovalenko Subscription is active until January 9, 2020 Runtime version: 11.0.4+10-b520.11 x86_64 VM: OpenJDK 64-Bit Server VM by JetBrains s.r.o macOS 10.14.6 GC: ParNew, ConcurrentMarkSweep Memory: 4029M Cores: 8 Registry: compiler.automake.allow.when.app.running=true Non-Bundled Plugins: GrepConsole, JProfiler, JRebelPlugin, Lombook Plugin, MavenRunHelper, SequenceDiagram, String Manipulation, cn.yiiguxing.plugin.translate, com.alibaba.p3c.smartfox, com.alibabacloud.intellij.toolkit-intellij, com.ccnode.codegenerator.MyBatisCodeHelperPro, com.dubreuia, com.github.novotnyr.gitlab-quickmr-idea-plugin, com.ppolivka.gitlabprojects, com.sjhy.plugin.easycode, de.netnexus.camelcaseplugin, gr.jchrist.gitextender, zielu.gittoolbox

* **Other information** (e.g. detailed explanation, stacktrace, related issues, suggestions how to fix, links for me to have context words of praises, pictures of puppies (again with the puppy??) )
opened by ken209 18

NPE when clicking the icon on bottom right

I'm submitting a ...
- [ X] bug report
- [ ] feature request
- [ ] puppy => You're not submitting a puppy. I already have one and he's adorable
What is the current behavior? NPE when clicking the icon on bottom right
Is this a bug? Sorry about that. If so give me explicit details how to reproduce:

Open IntelliJ
Click on the icon on the bottom right
Profit

What is the expected behavior? No NPE
What is the motivation / use case for changing the behavior?
Please tell me about your environment:
- Gitflow4idea version: 0.6.9
- Gitflow version: 1.12.2
- IntelliJ Help -> about > click copy icon and paste here. Should look like this:
```
  IntelliJ IDEA 2019.2.1 (Ultimate Edition)
```

Build #IU-192.6262.58, built on August 20, 2019 Runtime version: 11.0.3+12-b304.39 x86_64 VM: OpenJDK 64-Bit Server VM by JetBrains s.r.o macOS 10.14.6 GC: ParNew, ConcurrentMarkSweep Memory: 1981M Cores: 8




update failed for ActionGroup: Track Feature (null)[Track Feature]

java.lang.NullPointerException
	at java.base/java.lang.String.contains(String.java:2036)
	at gitflow.GitflowBranchUtil.getRemoteBranchesWithPrefix(GitflowBranchUtil.java:166)
	at gitflow.actions.AbstractTrackAction.isActionAllowedForBranch(AbstractTrackAction.java:31)
	at gitflow.actions.AbstractBranchAction.update(AbstractBranchAction.java:39)
	at com.intellij.openapi.actionSystem.ex.ActionUtil.performDumbAwareUpdate(ActionUtil.java:176)
	at com.intellij.openapi.actionSystem.impl.ActionUpdater.doUpdate(ActionUpdater.java:378)
	at com.intellij.openapi.actionSystem.impl.ActionUpdater.lambda$null$1(ActionUpdater.java:78)
	at com.intellij.openapi.actionSystem.impl.ActionUpdater.callAction(ActionUpdater.java:106)
	at com.intellij.openapi.actionSystem.impl.ActionUpdater.lambda$new$2(ActionUpdater.java:79)
	at com.intellij.openapi.actionSystem.impl.ActionUpdater.update(ActionUpdater.java:364)
	at com.intellij.openapi.actionSystem.impl.ActionUpdater.expandGroupChild(ActionUpdater.java:231)
	at com.intellij.openapi.actionSystem.impl.ActionUpdater.lambda$doExpandActionGroup$19(ActionUpdater.java:215)
	at com.intellij.util.containers.ContainerUtil.concat(ContainerUtil.java:1609)
	at com.intellij.openapi.actionSystem.impl.ActionUpdater.doExpandActionGroup(ActionUpdater.java:215)
	at com.intellij.openapi.actionSystem.impl.ActionUpdater.expandActionGroup(ActionUpdater.java:139)
	at com.intellij.openapi.actionSystem.impl.ActionUpdater.expandActionGroup(ActionUpdater.java:131)
	at com.intellij.openapi.actionSystem.impl.Utils.expandActionGroup(Utils.java:50)
	at com.intellij.ui.popup.ActionStepBuilder.appendActionsFromGroup(ActionStepBuilder.java:112)
	at com.intellij.ui.popup.ActionStepBuilder.buildGroup(ActionStepBuilder.java:69)
	at com.intellij.ui.popup.PopupFactoryImpl$ActionGroupPopup.getActionItems(PopupFactoryImpl.java:268)
	at com.intellij.ui.popup.PopupFactoryImpl$ActionGroupPopup.createStep(PopupFactoryImpl.java:249)
	at com.intellij.ui.popup.PopupFactoryImpl$ActionGroupPopup.<init>(PopupFactoryImpl.java:189)
	at com.intellij.ui.popup.PopupFactoryImpl$ActionGroupPopup.<init>(PopupFactoryImpl.java:173)
	at gitflow.ui.GitflowWidget.getPopupStep(GitflowWidget.java:115)
	at com.intellij.openapi.wm.impl.status.IdeStatusBarImpl$MultipleTextValuesPresentationWrapper$1.onClick(IdeStatusBarImpl.java:652)
	at com.intellij.ui.ClickListener$1.mouseReleased(ClickListener.java:59)
	at java.desktop/java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:297)
	at java.desktop/java.awt.Component.processMouseEvent(Component.java:6651)
	at java.desktop/javax.swing.JComponent.processMouseEvent(JComponent.java:3342)
	at java.desktop/java.awt.Component.processEvent(Component.java:6416)
	at java.desktop/java.awt.Container.processEvent(Container.java:2263)
	at java.desktop/java.awt.Component.dispatchEventImpl(Component.java:5026)
	at java.desktop/java.awt.Container.dispatchEventImpl(Container.java:2321)
	at java.desktop/java.awt.Component.dispatchEvent(Component.java:4858)
	at java.desktop/java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4918)
	at java.desktop/java.awt.LightweightDispatcher.processMouseEvent(Container.java:4547)
	at java.desktop/java.awt.LightweightDispatcher.dispatchEvent(Container.java:4488)
	at java.desktop/java.awt.Container.dispatchEventImpl(Container.java:2307)
	at java.desktop/java.awt.Window.dispatchEventImpl(Window.java:2772)
	at java.desktop/java.awt.Component.dispatchEvent(Component.java:4858)
	at java.desktop/java.awt.EventQueue.dispatchEventImpl(EventQueue.java:778)
	at java.desktop/java.awt.EventQueue$4.run(EventQueue.java:727)
	at java.desktop/java.awt.EventQueue$4.run(EventQueue.java:721)
	at java.base/java.security.AccessController.doPrivileged(Native Method)
	at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:85)
	at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:95)
	at java.desktop/java.awt.EventQueue$5.run(EventQueue.java:751)
	at java.desktop/java.awt.EventQueue$5.run(EventQueue.java:749)
	at java.base/java.security.AccessController.doPrivileged(Native Method)
	at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:85)
	at java.desktop/java.awt.EventQueue.dispatchEvent(EventQueue.java:748)
	at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:817)
	at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:762)
	at com.intellij.ide.IdeEventQueue.lambda$dispatchEvent$8(IdeEventQueue.java:405)
	at com.intellij.openapi.progress.impl.CoreProgressManager.computePrioritized(CoreProgressManager.java:704)
	at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:404)
	at java.desktop/java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:203)
	at java.desktop/java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:124)
	at java.desktop/java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:113)
	at java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:109)
	at java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101)
	at java.desktop/java.awt.EventDispatchThread.run(EventDispatchThread.java:90)

opened by danielspeicher 17

Not working on 182
I'm submitting a ...

[*] bug report

[ ] feature request

[ ] puppy => You're not submitting a puppy. I already have one and he's adorable

What is the current behavior? Not working on version 182 i think this is related to #200

And Thanks for this wonderful plugin !
opened by RamezIssac 15
Please support IntelliJ IDEA 2016.2 EAP (162.74.16)

IntelliJ IDEA 2016.2 EAP Build #IU-162.74.16, built on May 13, 2016 IntelliJ IDEA EAP User Expiration date: June 12, 2016 JRE: 1.8.0_92-b14 x86_64 JVM: Java HotSpot(TM) 64-Bit Server VM by Oracle Corporation

Thank you.

opened by natros 14
Unsupported Git Flow version
I'm submitting a ...

[x] bug report

What is the current behavior? When i open project i got However, after any interaction with git (e.g. push or commit), this error disappears and everything starts working fine.

Is this a bug? Sorry about that. If so give me explicit details how to reproduce:

Open IntelliJ (Rider in my case)

Profit

What is the expected behavior? Plugin should work from the start of the project

Please tell me about your environment:

Gitflow4idea version: 0.7.3

Gitflow version: 1.12.3 (AVH Edition)

JetBrains Rider 2020.2 EAP 4 Build #RD-202.5792.135, built on June 24, 2020 Rider EAP User Expiration date: July 24, 2020 Runtime version: 11.0.7+10-b944.12 amd64 VM: OpenJDK 64-Bit Server VM by JetBrains s.r.o. .NET Framework 4.0.30319.42000 Windows 10 10.0
opened by SKProCH 13
Support for IntelliJ 2019.1

After switching to the new EAP (2019.1) the plugin is not more available. I cant even find it in the Plugins sections of Settings. Maybe there is just the general support for the new version missing? I miss the plugin because I am not very handy with git command line.

opened by klaushauschild1984 13
Can we support IntelliJ IDEA 2022.1.1
I'm submitting a ...

[x] bug report

[ ] feature request

[ ] puppy => You're not submitting a puppy. I already have one and he's adorable

What is the current behavior?

What is the expected behavior? support new version of idea
opened by gudqs7 1
java.lang.Throwable: Assertion failed: dataContext has no component for new ListPopupStep
I'm submitting a ...

[X] bug report

What is the current behavior? java.lang.Throwable: Assertion failed: dataContext has no component for new ListPopupStep at com.intellij.openapi.diagnostic.Logger.assertTrue(Logger.java:218) at com.intellij.ui.popup.PopupFactoryImpl$ActionGroupPopup.createStep(PopupFactoryImpl.java:256) at com.intellij.ui.popup.PopupFactoryImpl$ActionGroupPopup.(PopupFactoryImpl.java:214) at com.intellij.ui.popup.PopupFactoryImpl$ActionGroupPopup.(PopupFactoryImpl.java:181) at gitflow.ui.GitflowWidget.getPopupStep(GitflowWidget.java:135) at gitflow.ui.GitflowWidget.lambda$getClickConsumer$0(GitflowWidget.java:163) at com.intellij.openapi.wm.impl.status.widget.StatusBarWidgetWrapper$StatusBarWidgetClickListener.onClick(StatusBarWidgetWrapper.java:169) at com.intellij.ui.ClickListener$1.mouseReleased(ClickListener.java:59) at java.desktop/java.awt.AWTEventMulticaster.mouseReleased(AWTEventMulticaster.java:297) at java.desktop/java.awt.Component.processMouseEvent(Component.java:6654) at java.desktop/javax.swing.JComponent.processMouseEvent(JComponent.java:3345) at java.desktop/java.awt.Component.processEvent(Component.java:6419) at java.desktop/java.awt.Container.processEvent(Container.java:2263) at java.desktop/java.awt.Component.dispatchEventImpl(Component.java:5029) at java.desktop/java.awt.Container.dispatchEventImpl(Container.java:2321) at java.desktop/java.awt.Component.dispatchEvent(Component.java:4861) at java.desktop/java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4918) at java.desktop/java.awt.LightweightDispatcher.processMouseEvent(Container.java:4547) at java.desktop/java.awt.LightweightDispatcher.dispatchEvent(Container.java:4488) at java.desktop/java.awt.Container.dispatchEventImpl(Container.java:2307) at java.desktop/java.awt.Window.dispatchEventImpl(Window.java:2790) at java.desktop/java.awt.Component.dispatchEvent(Component.java:4861) at java.desktop/java.awt.EventQueue.dispatchEventImpl(EventQueue.java:778) at java.desktop/java.awt.EventQueue$4.run(EventQueue.java:727) at java.desktop/java.awt.EventQueue$4.run(EventQueue.java:721) at java.base/java.security.AccessController.doPrivileged(Native Method) at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:85) at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:95) at java.desktop/java.awt.EventQueue$5.run(EventQueue.java:751) at java.desktop/java.awt.EventQueue$5.run(EventQueue.java:749) at java.base/java.security.AccessController.doPrivileged(Native Method) at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:85) at java.desktop/java.awt.EventQueue.dispatchEvent(EventQueue.java:748) at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:891) at com.intellij.ide.IdeEventQueue.dispatchMouseEvent(IdeEventQueue.java:820) at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:757) at com.intellij.ide.IdeEventQueue.lambda$dispatchEvent$6(IdeEventQueue.java:447) at com.intellij.openapi.progress.impl.CoreProgressManager.computePrioritized(CoreProgressManager.java:818) at com.intellij.ide.IdeEventQueue.lambda$dispatchEvent$7(IdeEventQueue.java:446) at com.intellij.openapi.application.impl.ApplicationImpl.runIntendedWriteActionOnCurrentThread(ApplicationImpl.java:805) at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:498) at java.desktop/java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:203) at java.desktop/java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:124) at java.desktop/java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:113) at java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:109) at java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101) at java.desktop/java.awt.EventDispatchThread.run(EventDispatchThread.java:90)

Is this a bug? Sorry about that. If so give me explicit details how to reproduce:

Open IntelliJ

What is the expected behavior?

crash dialog

What is the motivation / use case for changing the behavior?

no crash dialog

Please tell me about your environment:

Gitflow4idea version: 0.7.8 (patched 0.7.7)

Gitflow version: 1.12.3 (AVH Edition)

IntelliJ Help -> about > click copy icon and paste here. Should look like this:

IntelliJ IDEA 2021.3.2 (Ultimate Edition) Build #IU-213.6777.52, built on January 28, 2022 Runtime version: 11.0.13+7-b1751.25 amd64 VM: OpenJDK 64-Bit Server VM by JetBrains s.r.o.

The crash came after selecting "New Feature", entered a name for the new feature, clicked "OK"
opened by noragen 0

Access from event dispatch thread is not allowed.

I'm submitting a ...
- [x] bug report
- [ ] feature request
What is the current behavior? Rubymine tells me about an IDE Fatal Error
Is this a bug? Sorry about that. If so give me explicit details how to reproduce:

Open Rubymine
Work on feature branch
Finish feature
Resolve merge conflicts
Confirm modal window that merge was successful
IDE Fatal Error report

What is the expected behavior? No IDE Fatal Error report
What is the motivation / use case for changing the behavior?
Please tell me about your environment:
- Gitflow4idea version: 0.7.7
- Gitflow version: 1.12.3 (AVH Edition)
- IntelliJ Help -> about > click copy icon and paste here. Should look like this:
```
  RubyMine 2021.2.3
  Build #RM-212.5457.52, built on October 14, 2021
  Runtime version: 11.0.12+7-b1504.40 amd64
  VM: OpenJDK 64-Bit Server VM by JetBrains s.r.o.
```
Other information

This exception occured together with exception already described in #326.

Stacktrace:

com.intellij.openapi.diagnostic.RuntimeExceptionWithAttachments: EventQueue.isDispatchThread()=true Toolkit.getEventQueue()=com.intellij.ide.IdeEventQueue@669496f0
Current thread: Thread[AWT-EventQueue-0,6,main] 2093310791
SystemEventQueueThread: Thread[AWT-EventQueue-0,6,main] 2093310791
	at com.intellij.openapi.application.impl.ApplicationImpl.throwThreadAccessException(ApplicationImpl.java:1030)
	at com.intellij.openapi.application.impl.ApplicationImpl.assertIsNonDispatchThread(ApplicationImpl.java:1013)
	at git4idea.GitUtil.getRepositoryForRoot(GitUtil.java:640)
	at git4idea.merge.GitMerger.mergeCommit(GitMerger.java:63)
	at git4idea.merge.GitMerger.mergeCommit(GitMerger.java:55)
	at gitflow.actions.GitflowAction.askUserForMergeSuccess(GitflowAction.java:108)
	at gitflow.actions.GitflowAction.handleMerge(GitflowAction.java:92)
	at gitflow.actions.FinishFeatureAction$1.onSuccess(FinishFeatureAction.java:91)
	at com.intellij.openapi.progress.impl.CoreProgressManager.finishTask(CoreProgressManager.java:615)
	at com.intellij.openapi.progress.impl.ProgressManagerImpl.finishTask(ProgressManagerImpl.java:162)
	at com.intellij.openapi.progress.impl.CoreProgressManager.lambda$runProcessWithProgressAsync$6(CoreProgressManager.java:538)
	at com.intellij.openapi.application.TransactionGuardImpl.runWithWritingAllowed(TransactionGuardImpl.java:214)
	at com.intellij.openapi.application.TransactionGuardImpl.access$200(TransactionGuardImpl.java:21)
	at com.intellij.openapi.application.TransactionGuardImpl$2.run(TransactionGuardImpl.java:196)
	at com.intellij.openapi.application.impl.ApplicationImpl.runIntendedWriteActionOnCurrentThread(ApplicationImpl.java:794)
	at com.intellij.openapi.application.impl.ApplicationImpl.lambda$invokeLater$4(ApplicationImpl.java:350)
	at com.intellij.openapi.application.impl.FlushQueue.doRun(FlushQueue.java:84)
	at com.intellij.openapi.application.impl.FlushQueue.runNextEvent(FlushQueue.java:133)
	at com.intellij.openapi.application.impl.FlushQueue.flushNow(FlushQueue.java:46)
	at com.intellij.openapi.application.impl.FlushQueue$FlushNow.run(FlushQueue.java:189)
	at java.desktop/java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:313)
	at java.desktop/java.awt.EventQueue.dispatchEventImpl(EventQueue.java:776)
	at java.desktop/java.awt.EventQueue$4.run(EventQueue.java:727)
	at java.desktop/java.awt.EventQueue$4.run(EventQueue.java:721)
	at java.base/java.security.AccessController.doPrivileged(Native Method)
	at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:85)
	at java.desktop/java.awt.EventQueue.dispatchEvent(EventQueue.java:746)
	at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:885)
	at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:754)
	at com.intellij.ide.IdeEventQueue.lambda$dispatchEvent$6(IdeEventQueue.java:441)
	at com.intellij.openapi.progress.impl.CoreProgressManager.computePrioritized(CoreProgressManager.java:825)
	at com.intellij.ide.IdeEventQueue.lambda$dispatchEvent$7(IdeEventQueue.java:440)
	at com.intellij.openapi.application.impl.ApplicationImpl.runIntendedWriteActionOnCurrentThread(ApplicationImpl.java:794)
	at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:486)
	at java.desktop/java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:203)
	at java.desktop/java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:124)
	at java.desktop/java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:113)
	at java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:109)
	at java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:101)
	at java.desktop/java.awt.EventDispatchThread.run(EventDispatchThread.java:90)

opened by diesl 0

Execute command on all repos in "Open task" widget
I'm submitting a ...

[ ] bug report

[x] feature request

[ ] puppy => You're not submitting a puppy. I already have one and he's adorable

What is the current behavior? In opened task in Open Task widget exists gitflow start feature (and other flow ways). In open task window i might start feature with gitflow plugin. But feature branch started on single git-repository only (repo choosen appropriate with opened file in main editor window). Need functionality for started feature branches on all repositories connected to a project, if checked in IDE settings "Execute branch operation on all roots"

Is this a bug? Sorry about that. If so give me explicit details how to reproduce:

Open IntelliJ

Turn on Open task widget and try to start new task

Choose start feature

And if you use two or more repositories in your project - then executed start feature branch only on one git repository

What is the expected behavior? Started feature - need create feature branches on all repos

What is the motivation / use case for changing the behavior? Project with git submodules where any feature request need edit code in root repository and in submodule(s). Example: Multisites with common engine

Please tell me about your environment:

Gitflow4idea version: 0.7.7

Gitflow version: 1.12.3 (AVH Edition)

IntelliJ Help -> about > click copy icon and paste here. Should look like this:

PhpStorm 2021.2.2 Build #PS-212.5284.49, built on September 16, 2021 Licensed to Demidov Aleksander Subscription is active until March 23, 2022. Runtime version: 13.0.2+8 amd64 VM: Java HotSpot(TM) 64-Bit Server VM by Oracle Corporation Linux 5.13.11-1-manjaro GC: G1 Young Generation, G1 Old Generation Memory: 2300M Cores: 6 Registry: run.processes.with.pty=TRUE Non-Bundled Plugins: com.kite.intellij (1.9.4), String Manipulation (8.15.203.000.3), com.alayouni.ansiHighlight (1.2.4), dev.meanmail.plugin.nginx-intellij-plugin (2021.2-212), Gitflow (0.7.7), com.github.jk1.ytplugin (1.2.8), ideanginx9 (0.1.9), com.tang (1.3.6.219-IDEA212), uk.co.ben-gibson.remote.repository.mapper (3.3.5), com.faebeee.vuecomponentcreator (2.7.3), tv.twelvetone.intellij.plugins.intellivue (1.1.8), com.jetbrains.plugins.jade (212.5080.8), com.funivan.idea.phpClean (2020.12.22), Nette framework helpers (0.4.5), de.espend.idea.php.annotation (8.0.0), de.espend.idea.laravel (0.15.4), ru.adelf.idea.dotenv (2021.3.0.212), NEON support (0.5.1) Current Desktop: XFCE

* **Other information** (e.g. detailed explanation, stacktrace, related issues, suggestions how to fix, links for me to have context words of praises, pictures of puppies (again with the puppy??) )
opened by dimti 0
Gitflow repository initialization stucks
I'm submitting a ...

[x] bug report

[ ] feature request

What is the current behavior? When I try to initialize git flow the process stucks according to the console at git -c credential.helper= -c core.quotepath=false -c log.showSignature=false flow init

Is this a bug? Sorry about that. If so give me explicit details how to reproduce:

Open IntelliJ

Activate the "Init Repo" action in the Gitflow plugin

The init repo progress bar stucks

What is the expected behavior? The repository initializes with gitflow

What is the motivation / use case for changing the behavior?

Please tell me about your environment:

Gitflow4idea version: 0.7.7

Gitflow version: 1.12.3 (AVH Edition)

IntelliJ Help -> about > click copy icon and paste here. Should look like this:

IntelliJ IDEA 2021.2.3 (Ultimate Edition)

Build #IU-212.5457.46, built on October 12, 2021 Licensed to ************* Subscription is active until ************** Runtime version: 11.0.12+7-b1504.40 amd64 VM: OpenJDK 64-Bit Server VM by JetBrains s.r.o. Linux 5.11.0-38-generic GC: G1 Young Generation, G1 Old Generation Memory: 1988M Cores: 4 Non-Bundled Plugins: com.intellij.apacheConfig (212.5457.62), com.github.kornilovaL.flamegraphProfiler (1.0), org.jetbrains.plugins.hocon (2021.1.0), Gitflow (0.7.7), org.jetbrains.plugins.localization (212.5457.62), com.jetbrains.plugins.ini4idea (212.5457.62), mobi.hsz.idea.gitignore (4.3.0), com.github.masahirosuzuka.PhoneGapIntelliJPlugin (212.5457.62), Pythonid (212.5457.59), ru.meanmail.plugin.requirements (2021.4.1-212), com.intellij.plugins.html.instantEditing (212.4746.57), com.jetbrains.php (212.5457.49), com.thvardhan.gradianto (4.4), org.jetbrains.kotlin (212-1.5.31-release-546-IJ4638.7), zielu.gittoolbox (212.7.15), org.intellij.scala (2021.2.23), com.intellij.bigdatatools (212.4037.68) Kotlin: 212-1.5.31-release-546-IJ4638.7 Current Desktop: GNOME

* **Other information** (e.g. detailed explanation, stacktrace, related issues, suggestions how to fix, links for me to have context words of praises, pictures of puppies (again with the puppy??) ) I have been able to simulate same behavior on a Win10 OS using the same plugin and IntelliJ version
opened by marek-bohuncak 1

Releases(0.7.7)

0.7.7(Aug 18, 2021)
Changelog for 0.7.7

Fix issue with "Unsupported gitflow version" message presented at startup #328 #329

Support for 2021.2 build

Source code(tar.gz)
Source code(zip)
gitflow4idea-0.7.7.jar(144.51 KB)
0.7.6(Apr 13, 2021)
Changelog for 0.7.6

Fix "Error using shortcuts" #322

fix Finishing BugFix throws stacktrace #320

Support for 2021.1 build

Source code(tar.gz)
Source code(zip)
gitflow4idea-0.7.6.jar(144.31 KB)
0.7.5(Dec 18, 2020)
Changelog for 0.7.5

PluginException: Icon cannot be found in 'AllIcons.Vcs.CheckOut' #314 (@tumb1er)

Support for 2020.3 build

Source code(tar.gz)
Source code(zip)
gitflow4idea-0.7.5.jar(142.76 KB)
0.7.4(Jul 31, 2020)
Fix deprecations #298 (@fabmars)

Support for 2020.2 build

Source code(tar.gz)
Source code(zip)
gitflow4idea-0.7.4.jar(141.43 KB)
0.7.3(May 22, 2020)
Changelog for 0.7.3

Implemented sorting and filtering of track branch dialog #290 (@mmopitz)

Fix Version 0.7.2 causes that Active Tool Windows only is showed in one project if you have several open #301 (@tumb1er)

Fix Unsupported Git Flow version Fix #302 (@opherv)

Fix init settings shown in UI are misleading (do not match default) #283 (@opherv)

Source code(tar.gz)
Source code(zip)
gitflow4idea-0.7.3.jar(141.47 KB)
0.7.2(May 3, 2020)
Changelog for 0.7.2

Support for Idea build 200 #276 (@fabmars, @tumb1er )

Fix Icon cannot be found in 'AllIcons.Vcs.' #286 (@fabmars)

Fix finish release error (Mac OS) #273 (@opherv)

Breaking 'Search Everywhere' dialog window for projects without git #265 (@opherv)

Other bugfixes (@opherv)

Source code(tar.gz)
Source code(zip)
gitflow4idea-0.7.2.jar(139.50 KB)
0.7.1(Dec 13, 2019)
Changelog for 0.7.1

Support for Idea build 193 #259 (@opherv)

Check that the user has AVH version of git flow installed, show dialog otherwise #253 (@opherv)

Add safety which should help fix #249 - Init repo failed #259 (@opherv)

Fix Memory leak of ProjectImpl and GitRepositoryImpl after projet is closed #255 (@opherv)

Add icons to actions #232 (@opherv)

Source code(tar.gz)
Source code(zip)
gitflow4idea-0.7.1.zip(129.77 KB)
0.7.0(Sep 5, 2019)
Changelog for 0.7.0

Fix NPE when clicking Gitflow menu #245 (@opherv)

Fix "Init gitflow" doesn't update widget #247 (@opherv)

Fix Wrong message when finishing a feature #144 (@opherv)

Feature: Re-init gitflow (access from VCS>Git>Gitflow>Advanced menu) #50 (@bmwsedee / @opherv)

"Feature": Don't show branch select combo on new Hotfix (@opherv)

Source code(tar.gz)
Source code(zip)
gitflow4idea-0.7.0.zip(124.32 KB)
0.6.9(Aug 22, 2019)
Changelog for 0.6.9

Support for Idea build 192 #241 (@opherv)

Feature: No Fast-forward option is not working #225 (@opherv)

Hotfix: option -k to keep branch after performing finish #199 (@opherv)

Exceptions #243 #235 #323 #223 (@bmwsedee)

Source code(tar.gz)
Source code(zip)
gitflow4idea-0.6.9.zip(119.43 KB)
0.6.8(Apr 6, 2019)
Changelog for 0.6.8

Support for Idea build 191 #221 (@ottnorml)

Fix performance issues in plugin #195 (@bmwsedee)

Source code(tar.gz)
Source code(zip)
gitflow4idea-0.6.8.zip(114.73 KB)
0.6.7(Dec 22, 2018)
Changelog for 0.6.7

Support for Idea build 183 #210 (@opherv)

Feature: Bugfix support #122 (@straurob)

Feature: pushOnFinish to feature options (@bmwsedee)

Bugfix UI freeze on custom gitflow init #198 (@bmwsedee)

Implementation: plugin is now built with gradle (@straurob)

Note - if you see 'no gitflow' in the status bar you will need to re-init using git flow init -f
Source code(tar.gz)
Source code(zip)
gitflow4idea-0.6.7.zip(107.65 KB)
0.6.6(Sep 21, 2018)
Changelog for 0.6.6 (Emma)

@opherv:

Support for Idea build 182 (finally! :) #204

Bugfix NullPointerException while "Track Release" #154

Bugfix: NullPointerException on close active task #197

Source code(tar.gz)
Source code(zip)
gitflow_0.6.6.jar(126.24 KB)
0.6.5.1(Apr 4, 2018)
Changelog for 0.6.5.1:

@opherv:

Fixed some issues that prevented plugin from working properly #194 #193

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.6.5.1.jar(125.57 KB)
0.6.5(Apr 4, 2018)
Changelog for 0.6.5:

@opherv:

Support for Idea build 181 - hopefully works this time #184

Maintenance - refactoring of options handling for easier implementation of future flags/options

Feature: Add a configurable -k option for any kind of branches #165

Feature: Add support for keeplocal and keepremote when finishing release #178

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.6.5.jar(125.41 KB)
0.6.4(Mar 25, 2018)
Changelog for 0.6.4:

@opherv:

Support for Idea build 181 #184

Feature: Switch to appropriate feature branch when active task was changed (@YanickFrehner) #124

Bugfix: error on closing non-gitflow active task #180

Maintenance: Do not use GitVcs from GitHandler as project can be null now (@iasemenov)

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.6.4.jar(121.72 KB)
0.6.3(Oct 5, 2017)
Changelog for 0.6.3:

@opherv:

Support for Idea build 173

Bugfix: NullPointerException when invoking with keyboard shortcut #156

Bugfix: NullpointerException when starting a feature #157

@akaryakina:

Bugfix: Unable to start new feature. Glitches in the dialog #138

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.6.3.jar(119.68 KB)
0.6.2(Jun 22, 2017)
Changelog for 0.6.2:

@opherv:

Bugfix: Starting a release does always tell the branch is already checked out #151

Bugfix: NullPointerException in open/close task dialogs #149

Bugfix: Publish feature doesn't work anymore #150

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.6.2.jar(119.37 KB)
0.6.1(Jun 20, 2017)
Changelog for 0.6.1:

@opherv:

Support (in theory) for Idea build 172

Enhancement - Support for multi-repos #42

Bugfix: Wrong message when finishing a feature #144

Bugfix: GitFlow re-initializes status bar menu when finishing hotfixes or checking out new branches #146

Bugfix: Init git-flow repo for non-default configuration #147, #100

Bugfix: Git now has GitFlow in it, but not fully compatible with this plugin #125

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.6.1.jar(119.19 KB)
0.5.1(Mar 20, 2017)
Changelog for 0.5.1:

Support for Idea build 171 (@wyhasany)

Enhancement - Added option to always create a commit when finishing a feature #133 (@MrIncredible007 )

Bugfix for #123: Wrong message when finishing a release (@opherv)

Bugfix for #129: Wrong message when finishing a feature (@opherv)

Bugfix for #130: Do not allow branch names with ampersands (@opherv)

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.5.1.jar(113.55 KB)
0.5(Nov 17, 2016)
Changelog for 0.5:

Support for Idea build 163

Enhancement - Auto convert SPACE to _ when naming branch #119

Bugfix Open Task Dialog broken if project isn't git enabled #126

Bugfix (hopefully) random crashes #107

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.5.jar(112.93 KB)
0.4.9(Aug 17, 2016)
Changelog for 0.4.9:

Enhancement #104 - Intergration with IntelliJ Idea task switcher

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.4.9.jar(110.43 KB)
0.4.8(Jul 14, 2016)
Changelog for 0.4.8:

Fix #111 - Compatibility with build 162 (@wgriffioen & @opherv)

Enhancement #101 - Added feature --keeplocal flag (@pileon)

Note - this version is based on JDK 1.8 to work with build 162
Source code(tar.gz)
Source code(zip)
gitflow4idea_0.4.8.jar(101.07 KB)
0.4.7(Mar 22, 2016)
Changelog for 0.4.7:

Compatibility with build 145

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.4.7.jar(101.10 KB)
0.4.6(Nov 10, 2015)
Changelog for 0.4.6:

This release is identical to the previous - but should prevent the annoying message to upgrade for non compatible versions

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.4.6.jar(102.20 KB)
0.4.5(Nov 3, 2015)
Changelog for 0.4.5:

fix #78 - compatibility with builds 143 and newer (@sharkmachine)

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.4.5.jar(102.20 KB)
0.4.4(Sep 10, 2015)
Changelog for 0.4.4:

Fix bug #69 - "Synchronize" after starting a feature branch while inside another feature branch (@opherv)

Fix bug #72 - Gitflow init with non-default configuration sets wrong prefixes (@alextsc)

Enhancement #63 - Allows to start a feature/hotfix from a non default branch (@alextsc)

Enhancement - New action names (@alextsc)

Project development setup guide (@alextsc)

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.4.4.jar(102.51 KB)
0.4.3(Jun 7, 2015)
Changelog for 0.4.3:

Added "Gitflow Operations Popup..."-Action #69 (@avbk)

Resolved NPE on 141.1408 build #71 (@opherv)

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.4.3.jar(98.11 KB)
0.4.2(Mar 29, 2015)
Changelog for 0.4.2:

Added compatibility to 141 build (@tdegrunt)

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.4.2.jar(97.35 KB)
0.4.1(Mar 1, 2015)
Changelog for 0.4.1:

Added compatibility to 140 build (#61) @Opherv

Fix #33 (Phpstorm hangs while changing active tab) @Opherv

Work towards resolving #54 (Enable custom editing of branch names in non-default configuration) @Opherv

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.4.1.jar(97.35 KB)
0.4(Oct 21, 2014)
Changelog for 0.4:

Fix for #56 ("Git Flow is in "unsupported" state in PHPStorm 8.0.2 EAP 139.14") @Opherv

Added -F to options (#55) @Opherv

Fix #40 (UI does not refresh immediately after finish release) @Opherv

Source code(tar.gz)
Source code(zip)
gitflow4idea_0.4.jar(95.69 KB)