Fixed mode config inheritance, removed the commit count from metadata when using continuous deployment mode

JakeGinnivan · JakeGinnivan · commit 7ca51bf3571f · 2015-02-16T19:12:52.000Z
diff --git a/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs b/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs
@@ -26,21 +26,7 @@ public void CanChangeDevelopTagViaConfig()
             fixture.Repository.MakeATaggedCommit("1.0.0");
             fixture.Repository.CreateBranch("develop").Checkout();
             fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.1.0-alpha.1+1");
-        }
-    }
-
-    [Test]
-    public void CanClearDevelopTagViaConfig()
-    {
-        var config = new Config();
-        config.Branches["develop"].Tag = "";
-        using (var fixture = new EmptyRepositoryFixture(config))
-        {
-            fixture.Repository.MakeATaggedCommit("1.0.0");
-            fixture.Repository.CreateBranch("develop").Checkout();
-            fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.1.0+1");
+            fixture.AssertFullSemver("1.1.0-alpha.1");
         }
     }
 
@@ -52,7 +38,7 @@ public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
             fixture.Repository.MakeATaggedCommit("1.0.0");
             fixture.Repository.CreateBranch("develop").Checkout();
             fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.1.0-unstable.1+1");
+            fixture.AssertFullSemver("1.1.0-unstable.1");
         }
     }
 
@@ -71,7 +57,7 @@ public void MergingReleaseBranchBackIntoDevelopWithMergingToMaster_DoesBumpDevel
 
             fixture.Repository.Checkout("develop");
             fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
-            fixture.AssertFullSemver("2.1.0-unstable.1+0");
+            fixture.AssertFullSemver("2.1.0-unstable.0");
         }
     }
 
@@ -100,7 +86,7 @@ public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()
             var commit = fixture.Repository.Head.Tip;
             fixture.Repository.MakeACommit();
             fixture.Repository.Checkout(commit);
-            fixture.AssertFullSemver("1.1.0-unstable.1+1");
+            fixture.AssertFullSemver("1.1.0-unstable.1");
         }
     }
 }
diff --git a/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs b/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs
@@ -33,10 +33,10 @@ public void PatchLatestReleaseExample()
 
             // Verify develop version
             fixture.Repository.Checkout("develop");
-            fixture.AssertFullSemver("1.3.0-unstable.1+1");
+            fixture.AssertFullSemver("1.3.0-unstable.1");
 
             fixture.Repository.MergeNoFF("hotfix-1.2.1", Constants.SignatureNow());
-            fixture.AssertFullSemver("1.3.0-unstable.1+0");
+            fixture.AssertFullSemver("1.3.0-unstable.0");
         }
     }
 
@@ -84,9 +84,9 @@ public void PatchOlderReleaseExample()
 
             // Verify develop version
             fixture.Repository.Checkout("develop");
-            fixture.AssertFullSemver("2.1.0-unstable.1+1");
+            fixture.AssertFullSemver("2.1.0-unstable.1");
             fixture.Repository.MergeNoFF("support-1.1", Constants.SignatureNow());
-            fixture.AssertFullSemver("2.1.0-unstable.1+7");
+            fixture.AssertFullSemver("2.1.0-unstable.7");
         }
     }
 }
diff --git a/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs b/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs
@@ -129,7 +129,7 @@ public void WhenReleaseBranchIsMergedIntoDevelopHighestVersionIsTakenWithIt()
             fixture.Repository.Checkout("develop");
             fixture.Repository.MergeNoFF("release-1.0.0", Constants.SignatureNow());
 
-            fixture.AssertFullSemver("2.1.0-unstable.1+5");
+            fixture.AssertFullSemver("2.1.0-unstable.5");
         }
     }
 
diff --git a/GitVersionCore.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs b/GitVersionCore.Tests/IntegrationTests/SwitchingToGitFlowScenarios.cs
@@ -14,7 +14,7 @@ public void WhenDevelopBranchedFromMasterWithLegacyVersionTags_DevelopCanUseReac
             fixture.Repository.MakeATaggedCommit("1.0.0.0");
             fixture.Repository.MakeCommits(2);
             fixture.Repository.CreateBranch("develop").Checkout();
-            fixture.AssertFullSemver("1.1.0-unstable.1+2");
+            fixture.AssertFullSemver("1.1.0-unstable.2");
         }
     }
 }
diff --git a/GitVersionCore.Tests/IntegrationTests/WikiScenarios.cs b/GitVersionCore.Tests/IntegrationTests/WikiScenarios.cs
@@ -45,7 +45,7 @@ public void MinorReleaseExample()
             // Branch to develop
             fixture.Repository.CreateBranch("develop").Checkout();
             fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-unstable.1+1");
+            fixture.AssertFullSemver("1.3.0-unstable.1");
 
             // Open Pull Request
             fixture.Repository.CreateBranch("pull/2/merge").Checkout();
@@ -56,7 +56,7 @@ public void MinorReleaseExample()
             // Merge into develop
             fixture.Repository.Checkout("develop");
             fixture.Repository.MergeNoFF("pull/2/merge", Constants.SignatureNow());
-            fixture.AssertFullSemver("1.3.0-unstable.1+3");
+            fixture.AssertFullSemver("1.3.0-unstable.3");
 
             // Create release branch
             fixture.Repository.CreateBranch("release-1.3.0").Checkout();
@@ -65,7 +65,7 @@ public void MinorReleaseExample()
             // Make another commit on develop
             fixture.Repository.Checkout("develop");
             fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.3.0-unstable.1+4");
+            fixture.AssertFullSemver("1.3.0-unstable.4");
 
             // Make a commit to release-1.3.0
             fixture.Repository.Checkout("release-1.3.0");
@@ -89,7 +89,7 @@ public void MinorReleaseExample()
             // Verify develop version
             fixture.Repository.Checkout("develop");
             fixture.Repository.MergeNoFF("release-1.3.0", Constants.SignatureNow());
-            fixture.AssertFullSemver("1.4.0-unstable.1+0");
+            fixture.AssertFullSemver("1.4.0-unstable.0");
         }
     }
 }
diff --git a/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt b/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt
@@ -11,8 +11,8 @@
   "LegacySemVer":"1.2.3-unstable5",
   "LegacySemVerPadded":"1.2.3-unstable0005",
   "AssemblySemVer":"1.2.3.0",
-  "FullSemVer":"1.2.3-unstable.5+4",
-  "InformationalVersion":"1.2.3-unstable.5+4.Branch.develop.Sha.commitSha",
+  "FullSemVer":"1.2.3-unstable.5",
+  "InformationalVersion":"1.2.3-unstable.5+Branch.develop.Sha.commitSha",
   "BranchName":"develop",
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable0005",
diff --git a/GitVersionCore/GitVersionContext.cs b/GitVersionCore/GitVersionContext.cs
@@ -60,10 +60,8 @@ public GitVersionContext(IRepository repository, Branch currentBranch, Config co
         void CalculateEffectiveConfiguration()
         {
             var currentBranchConfig = BranchConfigurationCalculator.GetBranchConfiguration(CurrentCommit, Repository, OnlyEvaluateTrackedBranches, configuration, CurrentBranch);
-
-            // Versioning mode drills down, if top level is specified then it takes priority
-            var versioningMode = configuration.VersioningMode ?? currentBranchConfig.Value.VersioningMode ?? VersioningMode.ContinuousDelivery;
-
+            
+            var versioningMode = currentBranchConfig.Value.VersioningMode ?? configuration.VersioningMode ?? VersioningMode.ContinuousDelivery;
             var tag = currentBranchConfig.Value.Tag ?? "useBranchName";
             var nextVersion = configuration.NextVersion;
             var incrementStrategy = currentBranchConfig.Value.Increment ?? IncrementStrategy.Patch;
diff --git a/GitVersionCore/OutputVariables/VariableProvider.cs b/GitVersionCore/OutputVariables/VariableProvider.cs
@@ -18,9 +18,8 @@ public static VersionVariables GetVariablesFor(
                 }
 
                 // For continuous deployment the commits since tag gets promoted to the pre-release number
-                var oldPreReleaseNumber = semanticVersion.PreReleaseTag.Number;
                 semanticVersion.PreReleaseTag.Number = semanticVersion.BuildMetaData.CommitsSinceTag;
-                semanticVersion.BuildMetaData.CommitsSinceTag = oldPreReleaseNumber;
+                semanticVersion.BuildMetaData.CommitsSinceTag = null;
             }
 
             var variables = new VersionVariables(

Original file line number	Diff line number	Diff line change
`@@ -26,21 +26,7 @@ public void CanChangeDevelopTagViaConfig()`
`26`	`26`	`fixture.Repository.MakeATaggedCommit("1.0.0");`
`27`	`27`	`fixture.Repository.CreateBranch("develop").Checkout();`
`28`	`28`	`fixture.Repository.MakeACommit();`
`29`		`- fixture.AssertFullSemver("1.1.0-alpha.1+1");`
`30`		`- }`
`31`		`- }`
`32`		`-`
`33`		`- [Test]`
`34`		`- public void CanClearDevelopTagViaConfig()`
`35`		`- {`
`36`		`- var config = new Config();`
`37`		`- config.Branches["develop"].Tag = "";`
`38`		`- using (var fixture = new EmptyRepositoryFixture(config))`
`39`		`- {`
`40`		`- fixture.Repository.MakeATaggedCommit("1.0.0");`
`41`		`- fixture.Repository.CreateBranch("develop").Checkout();`
`42`		`- fixture.Repository.MakeACommit();`
`43`		`- fixture.AssertFullSemver("1.1.0+1");`
	`29`	`+ fixture.AssertFullSemver("1.1.0-alpha.1");`
`44`	`30`	`}`
`45`	`31`	`}`
`46`	`32`
`@@ -52,7 +38,7 @@ public void WhenDevelopBranchedFromMaster_MinorIsIncreased()`
`52`	`38`	`fixture.Repository.MakeATaggedCommit("1.0.0");`
`53`	`39`	`fixture.Repository.CreateBranch("develop").Checkout();`
`54`	`40`	`fixture.Repository.MakeACommit();`
`55`		`- fixture.AssertFullSemver("1.1.0-unstable.1+1");`
	`41`	`+ fixture.AssertFullSemver("1.1.0-unstable.1");`
`56`	`42`	`}`
`57`	`43`	`}`
`58`	`44`
`@@ -71,7 +57,7 @@ public void MergingReleaseBranchBackIntoDevelopWithMergingToMaster_DoesBumpDevel`
`71`	`57`
`72`	`58`	`fixture.Repository.Checkout("develop");`
`73`	`59`	`fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());`
`74`		`- fixture.AssertFullSemver("2.1.0-unstable.1+0");`
	`60`	`+ fixture.AssertFullSemver("2.1.0-unstable.0");`
`75`	`61`	`}`
`76`	`62`	`}`
`77`	`63`
`@@ -100,7 +86,7 @@ public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()`
`100`	`86`	`var commit = fixture.Repository.Head.Tip;`
`101`	`87`	`fixture.Repository.MakeACommit();`
`102`	`88`	`fixture.Repository.Checkout(commit);`
`103`		`- fixture.AssertFullSemver("1.1.0-unstable.1+1");`
	`89`	`+ fixture.AssertFullSemver("1.1.0-unstable.1");`
`104`	`90`	`}`
`105`	`91`	`}`
`106`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@ public void PatchLatestReleaseExample()`
`33`	`33`
`34`	`34`	`// Verify develop version`
`35`	`35`	`fixture.Repository.Checkout("develop");`
`36`		`- fixture.AssertFullSemver("1.3.0-unstable.1+1");`
	`36`	`+ fixture.AssertFullSemver("1.3.0-unstable.1");`
`37`	`37`
`38`	`38`	`fixture.Repository.MergeNoFF("hotfix-1.2.1", Constants.SignatureNow());`
`39`		`- fixture.AssertFullSemver("1.3.0-unstable.1+0");`
	`39`	`+ fixture.AssertFullSemver("1.3.0-unstable.0");`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`@@ -84,9 +84,9 @@ public void PatchOlderReleaseExample()`
`84`	`84`
`85`	`85`	`// Verify develop version`
`86`	`86`	`fixture.Repository.Checkout("develop");`
`87`		`- fixture.AssertFullSemver("2.1.0-unstable.1+1");`
	`87`	`+ fixture.AssertFullSemver("2.1.0-unstable.1");`
`88`	`88`	`fixture.Repository.MergeNoFF("support-1.1", Constants.SignatureNow());`
`89`		`- fixture.AssertFullSemver("2.1.0-unstable.1+7");`
	`89`	`+ fixture.AssertFullSemver("2.1.0-unstable.7");`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public void WhenReleaseBranchIsMergedIntoDevelopHighestVersionIsTakenWithIt()`
`129`	`129`	`fixture.Repository.Checkout("develop");`
`130`	`130`	`fixture.Repository.MergeNoFF("release-1.0.0", Constants.SignatureNow());`
`131`	`131`
`132`		`- fixture.AssertFullSemver("2.1.0-unstable.1+5");`
	`132`	`+ fixture.AssertFullSemver("2.1.0-unstable.5");`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public void WhenDevelopBranchedFromMasterWithLegacyVersionTags_DevelopCanUseReac`
`14`	`14`	`fixture.Repository.MakeATaggedCommit("1.0.0.0");`
`15`	`15`	`fixture.Repository.MakeCommits(2);`
`16`	`16`	`fixture.Repository.CreateBranch("develop").Checkout();`
`17`		`- fixture.AssertFullSemver("1.1.0-unstable.1+2");`
	`17`	`+ fixture.AssertFullSemver("1.1.0-unstable.2");`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,8 @@ public static VersionVariables GetVariablesFor(`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`// For continuous deployment the commits since tag gets promoted to the pre-release number`
`21`		`- var oldPreReleaseNumber = semanticVersion.PreReleaseTag.Number;`
`22`	`21`	`semanticVersion.PreReleaseTag.Number = semanticVersion.BuildMetaData.CommitsSinceTag;`
`23`		`- semanticVersion.BuildMetaData.CommitsSinceTag = oldPreReleaseNumber;`
	`22`	`+ semanticVersion.BuildMetaData.CommitsSinceTag = null;`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`var variables = new VersionVariables(`