Add AutoStash parameter

matkoch · Nov 6, 2019 · 7abb1b2 · 7abb1b2
1 parent ed79a2c
commit 7abb1b2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
@@ -57,6 +57,12 @@ project {
             value = "",
             allowEmpty = true,
             display = ParameterDisplay.NORMAL)
+        text (
+            "env.AutoStash",
+            label = "AutoStash",
+            value = "True",
+            allowEmpty = true,
+            display = ParameterDisplay.NORMAL)
         param(
             "teamcity.runner.commandline.stdstreams.encoding",
             "IBM-437"

diff --git a/build/Build.GitFlow.cs b/build/Build.GitFlow.cs
@@ -14,10 +14,10 @@
 
 partial class Build
 {
+    [Parameter] readonly bool AutoStash = true;
+
     Target Changelog => _ => _
-        .OnlyWhenStatic(
-            () => GitRepository.IsOnReleaseBranch() ||
-                  GitRepository.IsOnHotfixBranch())
+        .OnlyWhenStatic(() => GitRepository.IsOnReleaseBranch() || GitRepository.IsOnHotfixBranch())
         .Executes(() =>
         {
             FinalizeChangelog(ChangelogFile, GitVersion.MajorMinorPatch, GitRepository);
@@ -31,7 +31,7 @@ partial class Build
         .Executes(() =>
         {
             if (!GitRepository.IsOnReleaseBranch())
-                Git($"checkout -b {ReleaseBranchPrefix}/{GitVersion.MajorMinorPatch} {DevelopBranch}");
+                Checkout($"{ReleaseBranchPrefix}/{GitVersion.MajorMinorPatch}", start: DevelopBranch);
             else
                 FinishReleaseOrHotfix();
         });
@@ -48,7 +48,7 @@ partial class Build
                 .DisableLogOutput()).Result;
 
             if (!GitRepository.IsOnHotfixBranch())
-                Git($"checkout -b {HotfixBranchPrefix}/{masterVersion.Major}.{masterVersion.Minor}.{masterVersion.Patch + 1} {MasterBranch}");
+                Checkout($"{HotfixBranchPrefix}/{masterVersion.Major}.{masterVersion.Minor}.{masterVersion.Patch + 1}", start: MasterBranch);
             else
                 FinishReleaseOrHotfix();
         });
@@ -66,4 +66,15 @@ void FinishReleaseOrHotfix()
 
         Git($"push origin {MasterBranch} {DevelopBranch} {GitVersion.MajorMinorPatch}");
     }
+
+    void Checkout(string branch, string start)
+    {
+        if (AutoStash)
+            Git("git stash");
+
+        Git($"checkout -b {branch} {start}");
+
+        if (AutoStash)
+            Git("git stash apply");
+    }
 }
diff --git a/shell-completion.yml b/shell-completion.yml
@@ -1,4 +1,5 @@
 ApiKey: 
+AutoStash: 
 Configuration:
 - Debug
 - Release