Base versions can specify whether the tag should be updated

JakeGinnivan · JakeGinnivan · commit 558aeb6c54c8 · 2015-01-12T07:55:57.000Z
diff --git a/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs b/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs
@@ -64,7 +64,7 @@ public V1Strategy(DateTimeOffset? when)
 
             public override BaseVersion GetVersion(GitVersionContext context)
             {
-                return new BaseVersion(false, new SemanticVersion(1), when);
+                return new BaseVersion(false, true, new SemanticVersion(1), when);
             }
         }
 
@@ -79,7 +79,7 @@ public V2Strategy(DateTimeOffset? when)
 
             public override BaseVersion GetVersion(GitVersionContext context)
             {
-                return new BaseVersion(true, new SemanticVersion(2), when);
+                return new BaseVersion(true, true, new SemanticVersion(2), when);
             }
         }
     }
diff --git a/GitVersionCore.Tests/VersionCalculation/NewNextVersionCalculatorTests.cs b/GitVersionCore.Tests/VersionCalculation/NewNextVersionCalculatorTests.cs
@@ -11,7 +11,7 @@ public class NewNextVersionCalculatorTests
         [Test]
         public void ShouldIncrementVersionBasedOnConfig()
         {
-            var baseCalculator = new TestBaseVersionCalculator(true, new SemanticVersion(1), new MockCommit());
+            var baseCalculator = new TestBaseVersionCalculator(true, true, new SemanticVersion(1), new MockCommit());
             var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData(1, "master", "b1a34e", DateTimeOffset.Now);
             var sut = new NewNextVersionCalculator(baseCalculator, new TestMetaDataCalculator(semanticVersionBuildMetaData));
             var config = new Config();
@@ -29,7 +29,7 @@ public void ShouldIncrementVersionBasedOnConfig()
         [Test]
         public void DoesNotIncrementWhenBaseVersionSaysNotTo()
         {
-            var baseCalculator = new TestBaseVersionCalculator(false, new SemanticVersion(1), new MockCommit());
+            var baseCalculator = new TestBaseVersionCalculator(false, true, new SemanticVersion(1), new MockCommit());
             var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData(1, "master", "b1a34e", DateTimeOffset.Now);
             var sut = new NewNextVersionCalculator(baseCalculator, new TestMetaDataCalculator(semanticVersionBuildMetaData));
             var config = new Config();
@@ -47,7 +47,22 @@ public void DoesNotIncrementWhenBaseVersionSaysNotTo()
         [Test]
         public void AppliesBranchPreReleaseTag()
         {
-            var baseCalculator = new TestBaseVersionCalculator(false, new SemanticVersion(1), new MockCommit());
+            var baseCalculator = new TestBaseVersionCalculator(false, true, new SemanticVersion(1), new MockCommit());
+            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData(2, "develop", "b1a34e", DateTimeOffset.Now);
+            var sut = new NewNextVersionCalculator(baseCalculator, new TestMetaDataCalculator(semanticVersionBuildMetaData));
+            var context = new GitVersionContextBuilder()
+                .WithDevelopBranch()
+                .Build();
+
+            var version = sut.FindVersion(context);
+
+            version.ToString("f").ShouldBe("1.0.0-unstable.1+2");
+        }
+
+        [Test]
+        public void DoesNotApplyPreReleaseTagWhenBaseVersionSaysNotTo()
+        {
+            var baseCalculator = new TestBaseVersionCalculator(false, false, new SemanticVersion(1), new MockCommit());
             var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData(1, "develop", "b1a34e", DateTimeOffset.Now);
             var sut = new NewNextVersionCalculator(baseCalculator, new TestMetaDataCalculator(semanticVersionBuildMetaData));
             var context = new GitVersionContextBuilder()
@@ -56,14 +71,14 @@ public void AppliesBranchPreReleaseTag()
 
             var version = sut.FindVersion(context);
 
-            version.ToString().ShouldBe("1.0.0-unstable.1");
+            version.ToString("f").ShouldBe("1.0.0+1");
         }
 
         [Test]
         public void PreReleaseTagCanUseBranchName()
         {
-            var baseCalculator = new TestBaseVersionCalculator(false, new SemanticVersion(1), new MockCommit());
-            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData(1, "develop", "b1a34e", DateTimeOffset.Now);
+            var baseCalculator = new TestBaseVersionCalculator(false, true, new SemanticVersion(1), new MockCommit());
+            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData(2, "develop", "b1a34e", DateTimeOffset.Now);
             var sut = new NewNextVersionCalculator(baseCalculator, new TestMetaDataCalculator(semanticVersionBuildMetaData));
             var config = new Config();
             config.Branches.Add("custom/", new BranchConfig
@@ -78,7 +93,7 @@ public void PreReleaseTagCanUseBranchName()
 
             var version = sut.FindVersion(context);
 
-            version.ToString().ShouldBe("1.0.0-foo.1");
+            version.ToString("f").ShouldBe("1.0.0-foo.1+2");
         }
     }
 }
diff --git a/GitVersionCore.Tests/VersionCalculation/TestBaseVersionCalculator.cs b/GitVersionCore.Tests/VersionCalculation/TestBaseVersionCalculator.cs
@@ -9,18 +9,20 @@ public class TestBaseVersionCalculator : IBaseVersionCalculator
     {
         readonly SemanticVersion semanticVersion;
         bool shouldIncrement;
+        bool shouldUpdateTag;
         Commit source;
 
-        public TestBaseVersionCalculator(bool shouldIncrement, SemanticVersion semanticVersion, Commit source)
+        public TestBaseVersionCalculator(bool shouldIncrement, bool shouldUpdateTag, SemanticVersion semanticVersion, Commit source)
         {
             this.semanticVersion = semanticVersion;
             this.source = source;
+            this.shouldUpdateTag = shouldUpdateTag;
             this.shouldIncrement = shouldIncrement;
         }
 
         public BaseVersion GetBaseVersion(GitVersionContext context)
         {
-            return new BaseVersion(shouldIncrement, semanticVersion, source);
+            return new BaseVersion(shouldIncrement, shouldUpdateTag, semanticVersion, source);
         }
     }
 }
diff --git a/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs b/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs
@@ -21,10 +21,10 @@ public BaseVersion GetBaseVersion(GitVersionContext context)
                 {
                     if (v1.SemanticVersion > v2.SemanticVersion)
                     {
-                        return new BaseVersion(v1.ShouldIncrement, v1.SemanticVersion, v1.BaseVersionSource ?? v2.BaseVersionSource);
+                        return new BaseVersion(v1.ShouldIncrement, v1.ShouldUpdateTag, v1.SemanticVersion, v1.BaseVersionSource ?? v2.BaseVersionSource);
                     }
 
-                    return new BaseVersion(v2.ShouldIncrement, v2.SemanticVersion, v2.BaseVersionSource ?? v1.BaseVersionSource);
+                    return new BaseVersion(v2.ShouldIncrement, v2.ShouldUpdateTag, v2.SemanticVersion, v2.BaseVersionSource ?? v1.BaseVersionSource);
                 });
         }
     }
diff --git a/GitVersionCore/VersionCalculation/BaseVersionCalculators/BaseVersion.cs b/GitVersionCore/VersionCalculation/BaseVersionCalculators/BaseVersion.cs
@@ -4,15 +4,18 @@
 
     public class BaseVersion
     {
-        public BaseVersion(bool shouldIncrement, SemanticVersion semanticVersion, Commit baseVersionSource)
+        public BaseVersion(bool shouldIncrement, bool shouldUpdateTag, SemanticVersion semanticVersion, Commit baseVersionSource)
         {
             ShouldIncrement = shouldIncrement;
+            ShouldUpdateTag = shouldUpdateTag;
             SemanticVersion = semanticVersion;
             BaseVersionSource = baseVersionSource;
         }
 
         public bool ShouldIncrement { get; private set; }
 
+        public bool ShouldUpdateTag { get; private set; }
+
         public SemanticVersion SemanticVersion { get; private set; }
 
         public Commit BaseVersionSource { get; private set; }
diff --git a/GitVersionCore/VersionCalculation/BaseVersionCalculators/ConfigNextVersionBaseVersionStrategy.cs b/GitVersionCore/VersionCalculation/BaseVersionCalculators/ConfigNextVersionBaseVersionStrategy.cs
@@ -6,7 +6,7 @@ public override BaseVersion GetVersion(GitVersionContext context)
         {
             if (string.IsNullOrEmpty(context.Configuration.NextVersion))
                 return null;
-            return new BaseVersion(false, SemanticVersion.Parse(context.Configuration.NextVersion, context.Configuration.GitTagPrefix), null);
+            return new BaseVersion(false, true, SemanticVersion.Parse(context.Configuration.NextVersion, context.Configuration.GitTagPrefix), null);
         }
     }
 }
diff --git a/GitVersionCore/VersionCalculation/BaseVersionCalculators/LastTagBaseVersionStrategy.cs b/GitVersionCore/VersionCalculation/BaseVersionCalculators/LastTagBaseVersionStrategy.cs
@@ -7,8 +7,8 @@ public override BaseVersion GetVersion(GitVersionContext context)
             VersionTaggedCommit version;
             if (new LastTaggedReleaseFinder(context).GetVersion(out version))
             {
-                var shouldIncrement = version.Commit != context.CurrentCommit;
-                return new BaseVersion(shouldIncrement, version.SemVer, version.Commit);
+                var shouldUpdateVersion = version.Commit != context.CurrentCommit;
+                return new BaseVersion(shouldUpdateVersion, shouldUpdateVersion, version.SemVer, version.Commit);
             }
 
             return null;
diff --git a/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs b/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs
@@ -9,7 +9,7 @@ public override BaseVersion GetVersion(GitVersionContext context)
                 SemanticVersion semanticVersion;
                 // TODO when this approach works, inline the other class into here
                 if (MergeMessageParser.TryParse(context.CurrentCommit, context.Configuration, out semanticVersion))
-                    return new BaseVersion(true, semanticVersion, commit);
+                    return new BaseVersion(true, true, semanticVersion, commit);
             }
             return null;
         }
diff --git a/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchBaseVersionStrategy.cs b/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchBaseVersionStrategy.cs
@@ -11,7 +11,7 @@ public override BaseVersion GetVersion(GitVersionContext context)
             if (versionInBranch != null)
             {
                 var firstCommitOfBranch = context.CurrentBranch.Commits.Last();
-                return new BaseVersion(false, versionInBranch.Item2, firstCommitOfBranch);
+                return new BaseVersion(false, true, versionInBranch.Item2, firstCommitOfBranch);
             }
 
             return null;
diff --git a/GitVersionCore/VersionCalculation/NewNextVersionCalculator.cs b/GitVersionCore/VersionCalculation/NewNextVersionCalculator.cs
@@ -26,7 +26,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
 
             if (baseVersion.ShouldIncrement) IncrementVersion(context, baseVersion);
 
-            if (!baseVersion.SemanticVersion.PreReleaseTag.HasTag() && !string.IsNullOrEmpty(context.Configuration.Tag))
+            if (baseVersion.ShouldUpdateTag && !baseVersion.SemanticVersion.PreReleaseTag.HasTag() && !string.IsNullOrEmpty(context.Configuration.Tag))
             {
                 var tagToUse = context.Configuration.Tag;
                 if (tagToUse == "useBranchName")

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public V1Strategy(DateTimeOffset? when)`
`64`	`64`
`65`	`65`	`public override BaseVersion GetVersion(GitVersionContext context)`
`66`	`66`	`{`
`67`		`- return new BaseVersion(false, new SemanticVersion(1), when);`
	`67`	`+ return new BaseVersion(false, true, new SemanticVersion(1), when);`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`@@ -79,7 +79,7 @@ public V2Strategy(DateTimeOffset? when)`
`79`	`79`
`80`	`80`	`public override BaseVersion GetVersion(GitVersionContext context)`
`81`	`81`	`{`
`82`		`- return new BaseVersion(true, new SemanticVersion(2), when);`
	`82`	`+ return new BaseVersion(true, true, new SemanticVersion(2), when);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,20 @@ public class TestBaseVersionCalculator : IBaseVersionCalculator`
`9`	`9`	`{`
`10`	`10`	`readonly SemanticVersion semanticVersion;`
`11`	`11`	`bool shouldIncrement;`
	`12`	`+ bool shouldUpdateTag;`
`12`	`13`	`Commit source;`
`13`	`14`
`14`		`- public TestBaseVersionCalculator(bool shouldIncrement, SemanticVersion semanticVersion, Commit source)`
	`15`	`+ public TestBaseVersionCalculator(bool shouldIncrement, bool shouldUpdateTag, SemanticVersion semanticVersion, Commit source)`
`15`	`16`	`{`
`16`	`17`	`this.semanticVersion = semanticVersion;`
`17`	`18`	`this.source = source;`
	`19`	`+ this.shouldUpdateTag = shouldUpdateTag;`
`18`	`20`	`this.shouldIncrement = shouldIncrement;`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`public BaseVersion GetBaseVersion(GitVersionContext context)`
`22`	`24`	`{`
`23`		`- return new BaseVersion(shouldIncrement, semanticVersion, source);`
	`25`	`+ return new BaseVersion(shouldIncrement, shouldUpdateTag, semanticVersion, source);`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ public BaseVersion GetBaseVersion(GitVersionContext context)`
`21`	`21`	`{`
`22`	`22`	`if (v1.SemanticVersion > v2.SemanticVersion)`
`23`	`23`	`{`
`24`		`- return new BaseVersion(v1.ShouldIncrement, v1.SemanticVersion, v1.BaseVersionSource ?? v2.BaseVersionSource);`
	`24`	`+ return new BaseVersion(v1.ShouldIncrement, v1.ShouldUpdateTag, v1.SemanticVersion, v1.BaseVersionSource ?? v2.BaseVersionSource);`
`25`	`25`	`}`
`26`	`26`
`27`		`- return new BaseVersion(v2.ShouldIncrement, v2.SemanticVersion, v2.BaseVersionSource ?? v1.BaseVersionSource);`
	`27`	`+ return new BaseVersion(v2.ShouldIncrement, v2.ShouldUpdateTag, v2.SemanticVersion, v2.BaseVersionSource ?? v1.BaseVersionSource);`
`28`	`28`	`});`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,18 @@`
`4`	`4`
`5`	`5`	`public class BaseVersion`
`6`	`6`	`{`
`7`		`- public BaseVersion(bool shouldIncrement, SemanticVersion semanticVersion, Commit baseVersionSource)`
	`7`	`+ public BaseVersion(bool shouldIncrement, bool shouldUpdateTag, SemanticVersion semanticVersion, Commit baseVersionSource)`
`8`	`8`	`{`
`9`	`9`	`ShouldIncrement = shouldIncrement;`
	`10`	`+ ShouldUpdateTag = shouldUpdateTag;`
`10`	`11`	`SemanticVersion = semanticVersion;`
`11`	`12`	`BaseVersionSource = baseVersionSource;`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`public bool ShouldIncrement { get; private set; }`
`15`	`16`
	`17`	`+ public bool ShouldUpdateTag { get; private set; }`
	`18`	`+`
`16`	`19`	`public SemanticVersion SemanticVersion { get; private set; }`
`17`	`20`
`18`	`21`	`public Commit BaseVersionSource { get; private set; }`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public override BaseVersion GetVersion(GitVersionContext context)`
`6`	`6`	`{`
`7`	`7`	`if (string.IsNullOrEmpty(context.Configuration.NextVersion))`
`8`	`8`	`return null;`
`9`		`- return new BaseVersion(false, SemanticVersion.Parse(context.Configuration.NextVersion, context.Configuration.GitTagPrefix), null);`
	`9`	`+ return new BaseVersion(false, true, SemanticVersion.Parse(context.Configuration.NextVersion, context.Configuration.GitTagPrefix), null);`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ public override BaseVersion GetVersion(GitVersionContext context)`
`7`	`7`	`VersionTaggedCommit version;`
`8`	`8`	`if (new LastTaggedReleaseFinder(context).GetVersion(out version))`
`9`	`9`	`{`
`10`		`- var shouldIncrement = version.Commit != context.CurrentCommit;`
`11`		`- return new BaseVersion(shouldIncrement, version.SemVer, version.Commit);`
	`10`	`+ var shouldUpdateVersion = version.Commit != context.CurrentCommit;`
	`11`	`+ return new BaseVersion(shouldUpdateVersion, shouldUpdateVersion, version.SemVer, version.Commit);`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public override BaseVersion GetVersion(GitVersionContext context)`
`9`	`9`	`SemanticVersion semanticVersion;`
`10`	`10`	`// TODO when this approach works, inline the other class into here`
`11`	`11`	`if (MergeMessageParser.TryParse(context.CurrentCommit, context.Configuration, out semanticVersion))`
`12`		`- return new BaseVersion(true, semanticVersion, commit);`
	`12`	`+ return new BaseVersion(true, true, semanticVersion, commit);`
`13`	`13`	`}`
`14`	`14`	`return null;`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public override BaseVersion GetVersion(GitVersionContext context)`
`11`	`11`	`if (versionInBranch != null)`
`12`	`12`	`{`
`13`	`13`	`var firstCommitOfBranch = context.CurrentBranch.Commits.Last();`
`14`		`- return new BaseVersion(false, versionInBranch.Item2, firstCommitOfBranch);`
	`14`	`+ return new BaseVersion(false, true, versionInBranch.Item2, firstCommitOfBranch);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public SemanticVersion FindVersion(GitVersionContext context)`
`26`	`26`
`27`	`27`	`if (baseVersion.ShouldIncrement) IncrementVersion(context, baseVersion);`
`28`	`28`
`29`		`- if (!baseVersion.SemanticVersion.PreReleaseTag.HasTag() && !string.IsNullOrEmpty(context.Configuration.Tag))`
	`29`	`+ if (baseVersion.ShouldUpdateTag && !baseVersion.SemanticVersion.PreReleaseTag.HasTag() && !string.IsNullOrEmpty(context.Configuration.Tag))`
`30`	`30`	`{`
`31`	`31`	`var tagToUse = context.Configuration.Tag;`
`32`	`32`	`if (tagToUse == "useBranchName")`