Add current feature branch as the default choice for feature-finish - c…

…loses #227
aleksandr-m · Apr 29, 2020 · ab106da · ab106da
1 parent c3ccbee
commit ab106da
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java
@@ -523,6 +523,19 @@ private String removeQuotes(String str) {
         return str;
     }
 
+    /**
+     * Gets the current branch name.
+     * 
+     * @return Current branch name.
+     * @throws MojoFailureException
+     * @throws CommandLineException
+     */
+    protected String gitCurrentBranch() throws MojoFailureException, CommandLineException {
+        String name = executeGitCommandReturn("symbolic-ref", "-q", "--short", "HEAD");
+        name = StringUtils.strip(name);
+        return name;
+    }
+
     /**
      * Checks if local branch with given name exists.
      *

diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowFeatureFinishMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowFeatureFinishMojo.java
@@ -203,11 +203,11 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         }
     }
 
-    private String promptBranchName()
-            throws MojoFailureException, CommandLineException {
+    private String promptBranchName() throws MojoFailureException, CommandLineException {
         // git for-each-ref --format='%(refname:short)' refs/heads/feature/*
-        final String featureBranches = gitFindBranches(
-                gitFlowConfig.getFeatureBranchPrefix(), false);
+        final String featureBranches = gitFindBranches(gitFlowConfig.getFeatureBranchPrefix(), false);
+
+        final String currentBranch = gitCurrentBranch();
 
         if (StringUtils.isBlank(featureBranches)) {
             throw new MojoFailureException("There are no feature branches.");
@@ -216,17 +216,21 @@ private String promptBranchName()
         final String[] branches = featureBranches.split("\\r?\\n");
 
         List<String> numberedList = new ArrayList<String>();
+        String defaultChoice = null;
         StringBuilder str = new StringBuilder("Feature branches:").append(LS);
         for (int i = 0; i < branches.length; i++) {
             str.append((i + 1) + ". " + branches[i] + LS);
             numberedList.add(String.valueOf(i + 1));
+            if (branches[i].equals(currentBranch)) {
+                defaultChoice = String.valueOf(i + 1);
+            }
         }
         str.append("Choose feature branch to finish");
 
         String featureNumber = null;
         try {
             while (StringUtils.isBlank(featureNumber)) {
-                featureNumber = prompter.prompt(str.toString(), numberedList);
+                featureNumber = prompter.prompt(str.toString(), numberedList, defaultChoice);
             }
         } catch (PrompterException e) {
             throw new MojoFailureException("feature-finish", e);