Bump develop when release branch created

docs/configuration.md

@@ -42,6 +42,10 @@ The global configuration options are:
 
  - **`commit-message-incrementing:`** Sets whether it should be possible to increment the version with special syntax in the commit message. See the `*-version-bump-message` options above for details on the syntax. Default set to `Enabled`; set to `Disabled` to disable.
 
+ - **`is-develop:`** Indicates this branch config represents develop in GitFlow
+
+ **`is-release-branch:`** Indicates this branch config represents a release branch in GitFlow
+
 ## Branch configuration
 
 Then we have branch specific configuration, which looks something like this:

src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -22,6 +22,7 @@ branches:
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
+    is-release-branch: true
   features?[/-]:
     mode: ContinuousDelivery
     tag: useBranchName
@@ -49,7 +50,8 @@ branches:
     track-merge-target: false
   dev(elop)?(ment)?$:
     mode: ContinuousDeployment
-    tag: unstable
+    tag: alpha
     increment: Minor
     prevent-increment-of-merged-branch-version: false
     track-merge-target: true
+    is-develop: true

src/GitVersionCore.Tests/ConfigProviderTests.cs

@@ -113,7 +113,7 @@ public void CanProvideConfigForNewBranch()
         tag: bugfix";
         SetupConfigFileContent(text);
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
-        
+
         config.Branches["bug[/-]"].Tag.ShouldBe("bugfix");
     }
 
@@ -162,7 +162,7 @@ public void CanReadDefaultDocument()
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
         config.AssemblyInformationalFormat.ShouldBe(null);
-        config.Branches["dev(elop)?(ment)?$"].Tag.ShouldBe("unstable");
+        config.Branches["dev(elop)?(ment)?$"].Tag.ShouldBe("alpha");
         config.Branches["releases?[/-]"].Tag.ShouldBe("beta");
         config.TagPrefix.ShouldBe(ConfigurationProvider.DefaultTagPrefix);
         config.NextVersion.ShouldBe(null);

src/GitVersionCore.Tests/GitToolsTestingExtensions.cs

@@ -14,9 +14,13 @@ public static Config ApplyDefaults(this Config config)
             return config;
         }
 
-        public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Config configuration, IRepository repository = null, string commitId = null, bool isForTrackedBranchOnly = true)
+        public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Config configuration = null, IRepository repository = null, string commitId = null, bool isForTrackedBranchOnly = true)
         {
-            ConfigurationProvider.ApplyDefaultsTo(configuration);
+            if (configuration == null)
+            {
+                configuration = new Config();
+                ConfigurationProvider.ApplyDefaultsTo(configuration);
+            }
             var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, configuration, isForTrackedBranchOnly, commitId);
             var executeGitVersion = ExecuteGitVersion(gitVersionContext);
             var variables = VariableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
@@ -54,7 +58,7 @@ public static void AssertFullSemver(this RepositoryFixtureBase fixture, Config c
             }
             if (commitId == null)
             {
-               fixture.SequenceDiagram.NoteOver(fullSemver, fixture.Repository.Head.FriendlyName, color: "#D3D3D3");
+                fixture.SequenceDiagram.NoteOver(fullSemver, fixture.Repository.Head.FriendlyName, color: "#D3D3D3");
             }
         }
 

src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

@@ -21,7 +21,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyExistingCommitId()
             fixture.Repository.MakeACommit();
             fixture.Repository.MakeACommit();
 
-            fixture.AssertFullSemver("1.1.0-unstable.3", commitId: thirdCommit.Sha);
+            fixture.AssertFullSemver("1.1.0-alpha.3", commitId: thirdCommit.Sha);
         }
     }
 
@@ -39,7 +39,7 @@ public void WhenDevelopHasMultipleCommits_SpecifyNonExistingCommitId()
             fixture.Repository.MakeACommit();
             fixture.Repository.MakeACommit();
 
-            fixture.AssertFullSemver("1.1.0-unstable.5", commitId: "nonexistingcommitid");
+            fixture.AssertFullSemver("1.1.0-alpha.5", commitId: "nonexistingcommitid");
         }
     }
 
@@ -61,10 +61,11 @@ public void CanChangeDevelopTagViaConfig()
         {
             Branches =
             {
-                {"dev(elop)?(ment)?$", new BranchConfig
                 {
-                    Tag = "alpha"
-                }
+                    "dev(elop)?(ment)?$", new BranchConfig
+                    {
+                        Tag = "alpha"
+                    }
                 }
             }
         };
@@ -97,7 +98,7 @@ public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
             fixture.Repository.MakeATaggedCommit("1.0.0");
             fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
             fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.1.0-unstable.1");
+            fixture.AssertFullSemver("1.1.0-alpha.1");
         }
     }
 
@@ -116,7 +117,7 @@ public void MergingReleaseBranchBackIntoDevelopWithMergingToMaster_DoesBumpDevel
 
             fixture.Repository.Checkout("develop");
             fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
-            fixture.AssertFullSemver("2.1.0-unstable.0");
+            fixture.AssertFullSemver("2.1.0-alpha.2");
         }
     }
 
@@ -154,7 +155,30 @@ public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()
             var commit = fixture.Repository.Head.Tip;
             fixture.Repository.MakeACommit();
             fixture.Repository.Checkout(commit);
-            fixture.AssertFullSemver("1.1.0-unstable.1");
+            fixture.AssertFullSemver("1.1.0-alpha.1");
+        }
+    }
+
+    [Test]
+    public void InheritVersionFromReleaseBranch()
+    {
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.MakeATaggedCommit("1.0.0");
+            fixture.BranchTo("develop");
+            fixture.MakeACommit();
+            fixture.BranchTo("release/2.0.0");
+            fixture.MakeACommit();
+            fixture.MakeACommit();
+            fixture.Checkout("develop");
+            fixture.AssertFullSemver("2.1.0-alpha.0");
+            fixture.MakeACommit();
+            fixture.AssertFullSemver("2.1.0-alpha.1");
+            fixture.MergeNoFF("release/2.0.0");
+            fixture.AssertFullSemver("2.1.0-alpha.4");
+            fixture.BranchTo("feature/MyFeature");
+            fixture.MakeACommit();
+            fixture.AssertFullSemver("2.1.0-MyFeature.1+1");
         }
     }
 }

src/GitVersionCore.Tests/IntegrationTests/DocumentationSamples.cs

@@ -22,7 +22,7 @@ public void GitFlowFeatureBranch()
 
             // Branch to develop
             fixture.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-unstable.1");
+            fixture.AssertFullSemver("1.3.0-alpha.1");
 
             // Open Pull Request
             fixture.BranchTo("feature/myfeature", "feature");
@@ -37,7 +37,7 @@ public void GitFlowFeatureBranch()
             fixture.SequenceDiagram.Destroy("feature/myfeature");
             fixture.SequenceDiagram.NoteOver("Feature branches should\r\n" +
                              "be deleted once merged", "feature/myfeature");
-            fixture.AssertFullSemver("1.3.0-unstable.3");
+            fixture.AssertFullSemver("1.3.0-alpha.3");
         }
     }
 
@@ -56,7 +56,7 @@ public void GitFlowPullRequestBranch()
 
             // Branch to develop
             fixture.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-unstable.1");
+            fixture.AssertFullSemver("1.3.0-alpha.1");
 
             // Open Pull Request
             fixture.BranchTo("pull/2/merge", "pr");
@@ -71,7 +71,7 @@ public void GitFlowPullRequestBranch()
             fixture.SequenceDiagram.Destroy("pull/2/merge");
             fixture.SequenceDiagram.NoteOver("Feature branches/pr's should\r\n" +
                              "be deleted once merged", "pull/2/merge");
-            fixture.AssertFullSemver("1.3.0-unstable.3");
+            fixture.AssertFullSemver("1.3.0-alpha.3");
         }
     }
 
@@ -129,7 +129,7 @@ public void GitFlowMinorRelease()
             // Make another commit on develop
             fixture.Checkout("develop");
             fixture.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-unstable.2");
+            fixture.AssertFullSemver("1.4.0-alpha.1");
 
             // Make a commit to release-1.3.0
             fixture.Checkout("release/1.3.0");
@@ -158,7 +158,7 @@ public void GitFlowMinorRelease()
 
             // Not 0 for commit count as we can't know the increment rules of the merged branch
             fixture.Checkout("develop");
-            fixture.AssertFullSemver("1.4.0-unstable.2");
+            fixture.AssertFullSemver("1.4.0-alpha.4");
         }
     }
 
@@ -185,7 +185,7 @@ public void GitFlowMajorRelease()
             // Make another commit on develop
             fixture.Checkout("develop");
             fixture.MakeACommit();
-            fixture.AssertFullSemver("1.4.0-unstable.2");
+            fixture.AssertFullSemver("2.1.0-alpha.1");
 
             // Make a commit to release-2.0.0
             fixture.Checkout("release/2.0.0");
@@ -215,7 +215,7 @@ public void GitFlowMajorRelease()
 
             // Not 0 for commit count as we can't know the increment rules of the merged branch
             fixture.Checkout("develop");
-            fixture.AssertFullSemver("2.1.0-unstable.2");
+            fixture.AssertFullSemver("2.1.0-alpha.4");
         }
     }
 
@@ -394,7 +394,7 @@ public void GitHubFlowMajorRelease()
             fixture.AssertFullSemver("2.0.0-beta.1");
 
             // test that the CommitsSinceVersionSource should still return commit count
-            var version = fixture.GetVersion(new Config());
+            var version = fixture.GetVersion();
             version.CommitsSinceVersionSource.ShouldBe("2");
 
             // Make a commit after a tag should bump up the beta

src/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs

@@ -37,10 +37,10 @@ public void PatchLatestReleaseExample()
 
             // Verify develop version
             fixture.Repository.Checkout("develop");
-            fixture.AssertFullSemver("1.3.0-unstable.1");
+            fixture.AssertFullSemver("1.3.0-alpha.1");
 
             fixture.Repository.MergeNoFF("hotfix-1.2.1", Generate.SignatureNow());
-            fixture.AssertFullSemver("1.3.0-unstable.5");
+            fixture.AssertFullSemver("1.3.0-alpha.5");
         }
     }
 
@@ -118,9 +118,9 @@ public void PatchOlderReleaseExample()
 
             // Verify develop version
             fixture.Repository.Checkout("develop");
-            fixture.AssertFullSemver("2.1.0-unstable.1");
+            fixture.AssertFullSemver("2.1.0-alpha.1");
             fixture.Repository.MergeNoFF("support-1.1", Generate.SignatureNow());
-            fixture.AssertFullSemver("2.1.0-unstable.7");
+            fixture.AssertFullSemver("2.1.0-alpha.7");
         }
     }
 }

src/GitVersionCore.Tests/IntegrationTests/OtherScenarios.cs

@@ -40,7 +40,7 @@ public void AllowNotHavingMaster()
                 fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
                 fixture.Repository.Branches.Remove(fixture.Repository.Branches["master"]);
 
-                fixture.AssertFullSemver("1.1.0-unstable.1");
+                fixture.AssertFullSemver("1.1.0-alpha.1");
             }
         }
 
@@ -60,7 +60,7 @@ public void DoNotBlowUpWhenDevelopAndFeatureBranchPointAtSameCommit()
                 fixture.LocalRepositoryFixture.Repository.Checkout(fixture.Repository.Head.Tip);
                 fixture.LocalRepositoryFixture.Repository.Branches.Remove("master");
                 fixture.InitialiseRepo();
-                fixture.AssertFullSemver("1.1.0-unstable.1");
+                fixture.AssertFullSemver("1.1.0-alpha.1");
             }
         }
     }

src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

@@ -24,7 +24,7 @@ public void NoMergeBacksToDevelopInCaseThereAreNoChangesInReleaseBranch()
 
             fixture.Repository.Branches.Remove(releaseBranch);
 
-            fixture.AssertFullSemver("1.1.0-unstable.1");
+            fixture.AssertFullSemver("1.1.0-alpha.1");
         }
     }
 
@@ -48,12 +48,12 @@ public void NoMergeBacksToDevelopInCaseThereAreChangesInReleaseBranch()
             // Merge to develop
             fixture.Repository.Checkout("develop");
             fixture.Repository.MergeNoFF("release/1.0.0");
-            fixture.AssertFullSemver("1.1.0-unstable.1");
+            fixture.AssertFullSemver("1.1.0-alpha.2");
 
             fixture.Repository.MakeACommit();
             fixture.Repository.Branches.Remove(releaseBranch);
 
-            fixture.AssertFullSemver("1.1.0-unstable.2");
+            fixture.AssertFullSemver("1.1.0-alpha.2");
         }
     }
 
@@ -226,7 +226,7 @@ public void WhenReleaseBranchIsMergedIntoDevelopHighestVersionIsTakenWithIt()
             fixture.Repository.Checkout("develop");
             fixture.Repository.MergeNoFF("release-1.0.0", Generate.SignatureNow());
 
-            fixture.AssertFullSemver("2.1.0-unstable.5");
+            fixture.AssertFullSemver("2.1.0-alpha.6");
         }
     }
 
@@ -265,7 +265,7 @@ public void WhenMergingReleaseBackToDevShouldNotResetBetaVersion()
             fixture.Repository.Checkout("develop");
 
             fixture.Repository.MakeCommits(1);
-            fixture.AssertFullSemver("1.1.0-unstable.1");
+            fixture.AssertFullSemver("1.1.0-alpha.1");
 
             fixture.Repository.CreateBranch("release-2.0.0");
             fixture.Repository.Checkout("release-2.0.0");

src/GitVersionCore.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs

@@ -15,7 +15,7 @@ public void WhenDevelopBranchedFromMasterWithLegacyVersionTags_DevelopCanUseReac
             fixture.Repository.MakeATaggedCommit("1.0.0.0");
             fixture.Repository.MakeCommits(2);
             fixture.Repository.Checkout(fixture.Repository.CreateBranch("develop"));
-            fixture.AssertFullSemver("1.1.0-unstable.2");
+            fixture.AssertFullSemver("1.1.0-alpha.2");
         }
     }
 }

src/GitVersionCore.Tests/TestEffectiveConfiguration.cs

@@ -22,12 +22,15 @@ public TestEffectiveConfiguration(
             CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled,
             int legacySemVerPadding = 4,
             int buildMetaDataPadding = 4,
-            int commitsSinceVersionSourcePadding = 4) : 
+            int commitsSinceVersionSourcePadding = 4,
+            bool isDevelop = false,
+            bool isRelease = false) : 
                 base(assemblyVersioningScheme, assemblyInformationalFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch, 
                     branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
                     trackMergeTarget,
                     majorMessage, minorMessage, patchMessage,
-                    commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceVersionSourcePadding)
+                    commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceVersionSourcePadding,
+                    isDevelop, isRelease)
         {
         }
     }

src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs

@@ -48,7 +48,7 @@ public void AppliesBranchPreReleaseTag()
 
             var version = sut.FindVersion(context);
 
-            version.ToString("f").ShouldBe("1.0.0-unstable.1+2");
+            version.ToString("f").ShouldBe("1.0.0-alpha.1+2");
         }
 
         [Test]

src/GitVersionCore/Configuration/BranchConfig.cs

@@ -17,6 +17,8 @@ public BranchConfig(BranchConfig branchConfiguration)
             TagNumberPattern = branchConfiguration.TagNumberPattern;
             TrackMergeTarget = branchConfiguration.TrackMergeTarget;
             CommitMessageIncrementing = branchConfiguration.CommitMessageIncrementing;
+            IsDevelop = branchConfiguration.IsDevelop;
+            IsReleaseBranch = branchConfiguration.IsReleaseBranch;
         }
 
         [YamlMember(Alias = "mode")]
@@ -42,5 +44,11 @@ public BranchConfig(BranchConfig branchConfiguration)
 
         [YamlMember(Alias = "commit-message-incrementing")]
         public CommitMessageIncrementMode? CommitMessageIncrementing { get; set; }
+
+        [YamlMember(Alias = "is-develop")]
+        public bool IsDevelop { get; set; }
+
+        [YamlMember(Alias = "is-release-branch")]
+        public bool IsReleaseBranch { get; set; }
     }
 }