Add support for git-flow-next #46

AlexRaycan · 2025-11-05T10:03:18Z

Fixes #45

This PR adds support for git-flow-next version of git-flow.

Changes:

Added detection of git-flow-next by checking for \gitflow.branch.main.type\ config key
For git-flow-next, use hardcoded branch names (\main\ and \develop) instead of reading from config
Added fallback logic to support both old git-flow AVH and new git-flow-next config formats
Updated init dialog to use smart defaults: detect existing branches (main/master, develop/dev) and use them as defaults
When 'Use non-default configuration' is enabled, show dropdown lists with popular branch names + existing branches

Testing:

Tested with empty repository (no commits)
Tested with existing main branch
Tested with existing master branch
Widget correctly shows 'Gitflow' status after initialization
All git-flow operations (start feature, finish feature, etc.) work correctly

…e version checks and user prompts for unsupported versions.

- Updated GitInitLineHandler to support case-insensitive matching for various branch prompts, improving user experience during initialization. - Modified GitflowVersionTester to clarify version support checks, ensuring only maintained versions are recognized. - Added plugin.xml for Git Flow Integration Plus, defining plugin metadata and dependencies. - Created UI forms for various Gitflow actions, including AbstractBranchStartDialog, AbstractGitflowActionAckDialog, GitflowBranchChooseDialog, GitflowCloseTaskPanel, GitflowInitOptionsDialog, GitflowOpenTaskPanel, and GitflowOptionsForm, enhancing the user interface for Gitflow operations.

… in GitflowConfigUtil and InitRepoAction

…development branches based on existing local branches

AlexRaycan · 2025-11-05T10:06:04Z

It was edited by GitHub Copilot in Agent mode, because I'm not Java dev, but I use this plugin) I tested it and it works like a charm)

Copilot

Pull Request Overview

This pull request adds support for the modern git-flow-next implementation alongside the existing AVH version. The changes detect and adapt to git-flow-next's configuration schema while maintaining backward compatibility with AVH.

Extends version detection to recognize git-flow-next as a supported implementation
Updates configuration reading to handle both legacy AVH and new git-flow-next config keys
Improves initialization dialog with smarter branch selection that prioritizes "main" over "master"

Reviewed Changes

Copilot reviewed 12 out of 20 changed files in this pull request and generated 12 comments.

Show a summary per file

File	Description
src/main/java/gitflow/GitflowVersionTester.java	Extended version check to recognize git-flow-next in addition to AVH
src/main/java/gitflow/GitflowConfigUtil.java	Added dual config key support for both AVH and git-flow-next formats
src/main/java/gitflow/GitInitLineHandler.java	Made prompt matching case-insensitive to handle variations between implementations
src/main/java/gitflow/ui/GitflowInitOptionsDialog.java	Implemented smart branch selection favoring modern naming conventions
src/main/java/gitflow/actions/InitRepoAction.java	Added config reload logic and sequencing to ensure widget updates correctly
src/main/java/gitflow/ui/GitflowWidget.java	Added debug logging and updated unsupported version dialog message
src/main/java/gitflow/ui/UnsupportedVersionWidgetPresentation.java	Enhanced error message with installation guidance
README.md	Updated documentation to recommend git-flow-next
GITFLOW_VERSION.md	Rewrote installation guide for git-flow-next
gradle.properties	Added Java home configuration
docs/git-flow-next-validation.md	New validation documentation
bin/main/*.form	New UI form files (binary/build artifacts)

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-11-05T10:07:28Z

src/main/java/gitflow/ui/GitflowInitOptionsDialog.java

+            List<String> productionBranches = Arrays.asList("main", "master", "production");
+            List<String> developmentBranches = Arrays.asList("develop", "development", "dev");
+
+            // Add existing local branches to the options
+            for (String branch : localBranches) {
+                if (!productionBranches.contains(branch)) {
+                    productionBranches = new java.util.ArrayList<>(productionBranches);
+                    ((java.util.ArrayList<String>) productionBranches).add(branch);
+                }
+                if (!developmentBranches.contains(branch)) {
+                    developmentBranches = new java.util.ArrayList<>(developmentBranches);
+                    ((java.util.ArrayList<String>) developmentBranches).add(branch);


The loop creates a new ArrayList on every iteration when a branch is added. Initialize mutable lists before the loop to avoid unnecessary object creation and improve performance.

Suggested change

List<String> productionBranches = Arrays.asList("main", "master", "production");

List<String> developmentBranches = Arrays.asList("develop", "development", "dev");

// Add existing local branches to the options

for (String branch : localBranches) {

if (!productionBranches.contains(branch)) {

productionBranches = new java.util.ArrayList<>(productionBranches);

((java.util.ArrayList<String>) productionBranches).add(branch);

}

if (!developmentBranches.contains(branch)) {

developmentBranches = new java.util.ArrayList<>(developmentBranches);

((java.util.ArrayList<String>) developmentBranches).add(branch);

List<String> productionBranches = new java.util.ArrayList<>(Arrays.asList("main", "master", "production"));

List<String> developmentBranches = new java.util.ArrayList<>(Arrays.asList("develop", "development", "dev"));

// Add existing local branches to the options

for (String branch : localBranches) {

if (!productionBranches.contains(branch)) {

productionBranches.add(branch);

}

if (!developmentBranches.contains(branch)) {

developmentBranches.add(branch);

Copilot · 2025-11-05T10:07:29Z

src/main/java/gitflow/ui/GitflowWidget.java

+        // Debug logging
+        System.out.println("GitflowWidget.update() - hasGitflow: " + hasGitflow);
+        if (gitflowBranchUtil != null) {
+            System.out.println("  - master: " + gitflowBranchUtil.getBranchnameMaster());
+            System.out.println("  - develop: " + gitflowBranchUtil.getBranchnameDevelop());
+            System.out.println("  - feature prefix: " + gitflowBranchUtil.getPrefixFeature());
+        }


System.out.println should not be used in production code. Replace with proper logging using a logger instance (e.g., Logger.getInstance(GitflowWidget.class)).

Copilot · 2025-11-05T10:07:29Z

src/main/java/gitflow/actions/InitRepoAction.java

                    if (result.success()) {
                        String successMessage = getSuccessMessage();
+
+                        System.out.println("InitRepoAction: Git flow init success");


System.out.println should not be used in production code. Replace with proper logging using a logger instance (e.g., Logger.getInstance(InitRepoAction.class)).

Copilot · 2025-11-05T10:07:29Z

src/main/java/gitflow/actions/InitRepoAction.java

+                        GitflowConfigUtil gitflowConfigUtil = GitflowConfigUtil.getInstance(myProject, myRepo);
+                        gitflowConfigUtil.update();
+
+                        System.out.println("InitRepoAction: Config updated - master=" + gitflowConfigUtil.masterBranch + ", develop=" + gitflowConfigUtil.developBranch);


System.out.println should not be used in production code. Replace with proper logging using a logger instance (e.g., Logger.getInstance(InitRepoAction.class)).

Copilot · 2025-11-05T10:07:30Z

src/main/java/gitflow/actions/InitRepoAction.java

+
+                        // Update the widget AFTER config is reloaded - use invokeLater to ensure UI update
+                        ApplicationManager.getApplication().invokeLater(() -> {
+                            System.out.println("InitRepoAction: Notifying repository changed");


System.out.println should not be used in production code. Replace with proper logging using a logger instance (e.g., Logger.getInstance(InitRepoAction.class)).

Copilot · 2025-11-05T10:07:30Z

src/main/java/gitflow/GitflowConfigUtil.java

+                    // For git-flow-next, branch names are hardcoded to "main" and "develop"
+                    if (isGitflowNext) {
+                        masterBranch = "main";
+                        developBranch = "develop";


Hard-coding branch names to 'main' and 'develop' for git-flow-next may not be correct. The comment states 'branch names are hardcoded' but git-flow-next typically allows customization. Verify this assumption is correct or read the actual configured branch names from git-flow-next config.

Suggested change

// For git-flow-next, branch names are hardcoded to "main" and "develop"

if (isGitflowNext) {

masterBranch = "main";

developBranch = "develop";

// For git-flow-next, read branch names from config (do not hardcode)

if (isGitflowNext) {

masterBranch = GitConfigUtil.getValue(project, root, "gitflow.branch.main");

if (masterBranch == null) {

masterBranch = "main";

}

developBranch = GitConfigUtil.getValue(project, root, "gitflow.branch.develop");

if (developBranch == null) {

developBranch = "develop";

}

src/main/java/gitflow/ui/GitflowWidget.java

Copilot · 2025-11-05T10:07:31Z

src/main/java/gitflow/ui/GitflowWidget.java

        boolean hasGitflow = gitflowBranchUtil.hasGitflow();
+
+        // Debug logging
+        System.out.println("GitflowWidget.update() - hasGitflow: " + hasGitflow);
+        if (gitflowBranchUtil != null) {
+            System.out.println("  - master: " + gitflowBranchUtil.getBranchnameMaster());
+            System.out.println("  - develop: " + gitflowBranchUtil.getBranchnameDevelop());
+            System.out.println("  - feature prefix: " + gitflowBranchUtil.getPrefixFeature());
+        }


Variable gitflowBranchUtil may be null at this access as suggested by this null guard.

Suggested change

boolean hasGitflow = gitflowBranchUtil.hasGitflow();

// Debug logging

System.out.println("GitflowWidget.update() - hasGitflow: " + hasGitflow);

if (gitflowBranchUtil != null) {

System.out.println(" - master: " + gitflowBranchUtil.getBranchnameMaster());

System.out.println(" - develop: " + gitflowBranchUtil.getBranchnameDevelop());

System.out.println(" - feature prefix: " + gitflowBranchUtil.getPrefixFeature());

}

if (gitflowBranchUtil == null) {

myText = "No Gitflow";

myTooltip = getDisplayableBranchTooltip(repo);

return;

}

boolean hasGitflow = gitflowBranchUtil.hasGitflow();

// Debug logging

System.out.println("GitflowWidget.update() - hasGitflow: " + hasGitflow);

System.out.println(" - master: " + gitflowBranchUtil.getBranchnameMaster());

System.out.println(" - develop: " + gitflowBranchUtil.getBranchnameDevelop());

System.out.println(" - feature prefix: " + gitflowBranchUtil.getPrefixFeature());

Copilot · 2025-11-05T10:07:31Z

src/main/java/gitflow/ui/GitflowInitOptionsDialog.java

+                    ((java.util.ArrayList<String>) productionBranches).add(branch);
+                }
+                if (!developmentBranches.contains(branch)) {
+                    developmentBranches = new java.util.ArrayList<>(developmentBranches);
+                    ((java.util.ArrayList<String>) developmentBranches).add(branch);


List is cast to the concrete type ArrayList, losing abstraction.

Suggested change

((java.util.ArrayList<String>) productionBranches).add(branch);

}

if (!developmentBranches.contains(branch)) {

developmentBranches = new java.util.ArrayList<>(developmentBranches);

((java.util.ArrayList<String>) developmentBranches).add(branch);

productionBranches.add(branch);

}

if (!developmentBranches.contains(branch)) {

developmentBranches = new java.util.ArrayList<>(developmentBranches);

developmentBranches.add(branch);

Copilot · 2025-11-05T10:07:32Z

src/main/java/gitflow/ui/GitflowInitOptionsDialog.java

+            List<String> productionBranches = Arrays.asList("main", "master", "production");
+            List<String> developmentBranches = Arrays.asList("develop", "development", "dev");
+
+            // Add existing local branches to the options
+            for (String branch : localBranches) {
+                if (!productionBranches.contains(branch)) {
+                    productionBranches = new java.util.ArrayList<>(productionBranches);
+                    ((java.util.ArrayList<String>) productionBranches).add(branch);
+                }
+                if (!developmentBranches.contains(branch)) {
+                    developmentBranches = new java.util.ArrayList<>(developmentBranches);
+                    ((java.util.ArrayList<String>) developmentBranches).add(branch);


List is cast to the concrete type ArrayList, losing abstraction.

Suggested change

List<String> productionBranches = Arrays.asList("main", "master", "production");

List<String> developmentBranches = Arrays.asList("develop", "development", "dev");

// Add existing local branches to the options

for (String branch : localBranches) {

if (!productionBranches.contains(branch)) {

productionBranches = new java.util.ArrayList<>(productionBranches);

((java.util.ArrayList<String>) productionBranches).add(branch);

}

if (!developmentBranches.contains(branch)) {

developmentBranches = new java.util.ArrayList<>(developmentBranches);

((java.util.ArrayList<String>) developmentBranches).add(branch);

List<String> productionBranches = new java.util.ArrayList<>(Arrays.asList("main", "master", "production"));

List<String> developmentBranches = new java.util.ArrayList<>(Arrays.asList("develop", "development", "dev"));

// Add existing local branches to the options

for (String branch : localBranches) {

if (!productionBranches.contains(branch)) {

productionBranches.add(branch);

}

if (!developmentBranches.contains(branch)) {

developmentBranches.add(branch);

RubinCarter

Hi @AlexRaycan, thank you for this PR! The git-flow-next support implementation looks good overall.

I noticed a couple of minor issues that should be addressed before merging:

1. Build artifacts should not be committed

The following files appear to be Gradle build outputs and should be removed from the PR:

bin/main/META-INF/plugin.xml
bin/main/gitflow/ui/AbstractBranchStartDialog.form
bin/main/gitflow/ui/AbstractGitflowActionAckDialog.form
bin/main/gitflow/ui/GitflowBranchChooseDialog.form
bin/main/gitflow/ui/GitflowCloseTaskPanel.form
bin/main/gitflow/ui/GitflowInitOptionsDialog.form
bin/main/gitflow/ui/GitflowOpenTaskPanel.form
bin/main/gitflow/ui/GitflowOptionsForm.form

These are generated files that get created during the build process. They shouldn't be tracked in version control.

2. IDE configuration files should not be committed

.vscode/settings.json

This is a personal IDE configuration file. It's best practice to keep these out of the repository (they're usually in .gitignore).

Could you please remove these files from your PR? You can do this with:

git rm -r bin/
git rm -r .vscode/
git commit --amend
git push --force

Thanks again for your contribution! 🙏

…tionsDialog to support custom branch names and improve fallback priorities

- Add git-flow-next config compatibility layer in GitflowConfigUtil - Smart branch detection for init dialog (prioritize main over master) - Improve init prompt matching for different git-flow implementations - Force config reload after init to ensure widget updates correctly Co-authored-by: AlexRaycan <alex@example.com>

RubinCarter · 2026-01-28T02:36:36Z

Hi @AlexRaycan,

Thanks again for this great PR! I've merged the core changes from your work into the develop branch and released v0.8.1-beta.2:

https://github.com/RubinCarter/gitflow4idea-plus/releases/tag/v0.8.1-beta.2

What was merged:

✅ GitflowConfigUtil.java - git-flow-next config compatibility layer
✅ GitflowInitOptionsDialog.java - Smart branch detection (main > master)
✅ InitRepoAction.java - Config reload after init
✅ GitInitLineHandler.java - Case-insensitive prompt matching

Still need your action:

Before I can fully merge this PR, please remove the build artifacts and IDE config files:

git rm -r bin/
git rm -r .vscode/
git commit --amend
git push --force

Or I can close this PR since the important changes are already in develop. Let me know your preference!

Thanks for contributing to git-flow-next support! 🙏

RubinCarter · 2026-01-28T02:37:44Z

Thanks for cleaning up the PR! The build artifacts and IDE config files have been removed. ✅

Since I've already merged the core changes into develop and released v0.8.1-beta.2, I'll close this PR now. Your contribution is credited in the commit:

241fdf9

Thanks again for the git-flow-next support! 🎉

RubinCarter · 2026-01-28T02:39:01Z

Closing this PR as the core changes have been manually merged into develop and released as v0.8.1-beta.2.

Your contributions are included:

Git-flow-next config compatibility layer
Smart branch detection for init dialog (main > master)
Case-insensitive prompt matching for different git-flow implementations
Config reload after init

Credit in commit: 241fdf9

Thank you for your contribution! 🙏

AlexRaycan · 2026-01-28T02:39:30Z

Hi! I ran your commands 😅, so I'm not sure why it didn't work 🥲. If possible, please test all functions, as I may have missed something.

RubinCarter · 2026-01-28T02:43:54Z

Hi @AlexRaycan,

Thanks for confirming! Yes, you did run those commands correctly - I can see the bin/ and .vscode/ folders were successfully removed from the PR. 👍

I apologize for the confusing messages earlier - I posted the cleanup request before I noticed you had already done it!

Regarding testing: I've already tested the core functionality and released it as v0.8.1-beta.2. The changes are working well:

✅ Git-flow-next config detection
✅ Smart branch detection (main > master priority)
✅ Case-insensitive prompt matching
✅ Config reload after init

If any issues come up during user testing, I'll let you know. Thanks again for your contribution! 🙏

AlexRaycan and others added 5 commits November 5, 2025 08:19

Update documentation and validation for git-flow-next support; enhanc…

2aef228

…e version checks and user prompts for unsupported versions.

Add initial configuration files for Java and Gradle settings

4194e23

Add support for new git-flow-next configuration keys and update logic…

14374e3

… in GitflowConfigUtil and InitRepoAction

Enhance GitflowInitOptionsDialog to determine default production and …

29725cc

…development branches based on existing local branches

Copilot AI review requested due to automatic review settings November 5, 2025 10:03

Copilot AI reviewed Nov 5, 2025

View reviewed changes

Bump version to 0.9.0 - add git-flow-next support

5d42ea3

albertKrafter mentioned this pull request Jan 24, 2026

Could not determine git flow version #44

Open

RubinCarter reviewed Jan 27, 2026

View reviewed changes

Enhance branch detection logic in GitflowConfigUtil and GitflowInitOp…

06a1d50

…tionsDialog to support custom branch names and improve fallback priorities

AlexRaycan force-pushed the feature/git-flow-next branch from a23b59b to 06a1d50 Compare January 27, 2026 21:23

RubinCarter closed this Jan 28, 2026

RubinCarter reopened this Jan 28, 2026

RubinCarter closed this Jan 28, 2026

Add support for git-flow-next #46

Add support for git-flow-next #46

Uh oh!

Conversation

AlexRaycan commented Nov 5, 2025

Uh oh!

AlexRaycan commented Nov 5, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

RubinCarter left a comment

Choose a reason for hiding this comment

1. Build artifacts should not be committed

2. IDE configuration files should not be committed

Uh oh!

RubinCarter commented Jan 28, 2026

What was merged:

Still need your action:

Uh oh!

RubinCarter commented Jan 28, 2026

Uh oh!

RubinCarter commented Jan 28, 2026

Uh oh!

AlexRaycan commented Jan 28, 2026

Uh oh!

RubinCarter commented Jan 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants