Add support for GitFlow version tag #30

sboulema · Jun 1, 2017 · 1ff07a0 · 1ff07a0
1 parent 62ab84b
commit 1ff07a0
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 11 deletions.
diff --git a/TGit/Commands/GitFlowMenuCommands.cs b/TGit/Commands/GitFlowMenuCommands.cs
@@ -68,6 +68,8 @@ private void InitCommand(object sender, EventArgs e)
             var flowDialog = new FlowDialog();
             if (flowDialog.ShowDialog() != DialogResult.OK) return;
 
+            var versionTag = string.IsNullOrEmpty(flowDialog.FlowOptions.TagPrefix) ? "\"\"" : flowDialog.FlowOptions.TagPrefix;
+
             /* 1. Add GitFlow config options
                  * 2. Checkout develop branch (create if it doesn't exist, reset if it does)
                  * 3. Push develop branch
@@ -81,6 +83,7 @@ private void InitCommand(object sender, EventArgs e)
                 FormatCliCommand($"config --add gitflow.prefix.feature {flowDialog.FlowOptions.FeaturePrefix}") +
                 FormatCliCommand($"config --add gitflow.prefix.release {flowDialog.FlowOptions.ReleasePrefix}") +
                 FormatCliCommand($"config --add gitflow.prefix.hotfix {flowDialog.FlowOptions.HotfixPrefix}") +
+                FormatCliCommand($"config --add gitflow.prefix.versiontag {versionTag}") +
                 (GitHelper.RemoteBranchExists(flowDialog.FlowOptions.DevelopBranch) ?
                     "echo." : 
                     FormatCliCommand($"checkout -b {flowDialog.FlowOptions.DevelopBranch}", false)),
@@ -241,7 +244,7 @@ private void FinishReleaseCommand(object sender, EventArgs e)
                     FormatCliCommand($"checkout {EnvHelper.FlowOptions.MasterBranch}") +
                     FormatCliCommand("pull") +
                     FormatCliCommand($"merge --no-ff {releaseBranch}") +
-                    FormatCliCommand($"tag {releaseName}") +
+                    FormatCliCommand($"tag {EnvHelper.FlowOptions.TagPrefix}{releaseName}") +
                     FormatCliCommand($"checkout {EnvHelper.FlowOptions.DevelopBranch}") +
                     FormatCliCommand("pull") +
                     FormatCliCommand($"merge --no-ff {releaseBranch}", false),
@@ -303,7 +306,7 @@ private void FinishHotfixCommand(object sender, EventArgs e)
                     FormatCliCommand($"checkout {EnvHelper.FlowOptions.MasterBranch}") +
                     FormatCliCommand("pull") +
                     FormatCliCommand($"merge --no-ff {hotfixBranch}") +
-                    FormatCliCommand($"tag {hotfixName}") +
+                    FormatCliCommand($"tag {EnvHelper.FlowOptions.TagPrefix}{hotfixName}") +
                     FormatCliCommand($"checkout {EnvHelper.FlowOptions.DevelopBranch}") +
                     FormatCliCommand("pull") +
                     FormatCliCommand($"merge --no-ff {hotfixBranch}", false),

diff --git a/TGit/FlowDialog.Designer.cs b/TGit/FlowDialog.Designer.cs
diff --git a/TGit/FlowDialog.cs b/TGit/FlowDialog.cs
@@ -26,7 +26,8 @@ private void okButton_Click(object sender, EventArgs e)
                 MasterBranch = masterTextBox.Text,
                 FeaturePrefix = featureTextBox.Text,
                 HotfixPrefix = hotfixTextBox.Text,
-                ReleasePrefix = releaseTextBox.Text
+                ReleasePrefix = releaseTextBox.Text,
+                TagPrefix = tagTextBox.Text
             };
             Close();
         }

diff --git a/TGit/FlowOptions.cs b/TGit/FlowOptions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using System.Windows.Forms;
+using System.Linq;
 
 namespace SamirBoulema.TGit
 {
@@ -11,6 +9,7 @@ public class FlowOptions
         public string FeaturePrefix;
         public string ReleasePrefix;
         public string HotfixPrefix;
+        public string TagPrefix;
 
         public FlowOptions()
         {
@@ -24,6 +23,7 @@ public FlowOptions(string input)
             FeaturePrefix = string.Empty;
             ReleasePrefix = string.Empty;
             HotfixPrefix = string.Empty;
+            TagPrefix = string.Empty;
 
             foreach (var line in input.Split(';'))
             {
@@ -47,6 +47,10 @@ public FlowOptions(string input)
                 {
                     HotfixPrefix = line.Split(' ').Last();
                 }
+                else if (line.StartsWith("gitflow.prefix.versiontag"))
+                {
+                    TagPrefix = line.Split(' ').Last();
+                }
             }
         }
     }