Allow develop branch name to be configured. Fixes GitTools#292

Author: JakeGinnivan

GitVersionCore/Configuration/Config.cs

@@ -8,6 +8,7 @@ public Config()
         {
             AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch;
             DevelopBranchTag = "unstable";
+            DevelopBranchName = "develop";
             ReleaseBranchTag = "beta";
             TagPrefix = "v";
         }
@@ -17,6 +18,9 @@ public Config()
         [YamlAlias("develop-branch-tag")]
         public string DevelopBranchTag { get; set; }
 
+        [YamlAlias("develop-branch-name")]
+        public string DevelopBranchName { get; set; }
+
         [YamlAlias("release-branch-tag")]
         public string ReleaseBranchTag { get; set; }
 

GitVersionCore/GitFlow/BranchClassifier.cs

@@ -15,9 +15,9 @@ public static bool IsRelease(this Branch branch)
             return branch.Name.StartsWith("release-") || branch.Name.StartsWith("release/");
         }
 
-        public static bool IsDevelop(this Branch branch)
+        public static bool IsDevelop(this Branch branch, Config config)
         {
-            return branch.Name == "develop";
+            return branch.Name == config.DevelopBranchName;
         }
 
         public static bool IsMaster(this Branch branch)

GitVersionCore/GitFlow/BranchFinders/DevelopBasedVersionFinderBase.cs

@@ -9,9 +9,9 @@ protected SemanticVersion FindVersion(
             GitVersionContext context,
             BranchType branchType)
         {
-            var ancestor = FindCommonAncestorWithDevelop(context.Repository, context.CurrentBranch, branchType);
+            var ancestor = FindCommonAncestorWithDevelop(context.Repository, context.CurrentBranch, branchType, context.Configuration);
 
-            if (!IsThereAnyCommitOnTheBranch(context.Repository, context.CurrentBranch))
+            if (!IsThereAnyCommitOnTheBranch(context.Repository, context.CurrentBranch, context.Configuration))
             {
                 var developVersionFinder = new DevelopVersionFinder();
                 return developVersionFinder.FindVersion(context);
@@ -54,10 +54,10 @@ int NumberOfCommitsOnBranchSinceCommit(GitVersionContext context, Commit commit)
                 .Count();
         }
 
-        Commit FindCommonAncestorWithDevelop(IRepository repo, Branch branch, BranchType branchType)
+        Commit FindCommonAncestorWithDevelop(IRepository repo, Branch branch, BranchType branchType, Config configuration)
         {
             var ancestor = repo.Commits.FindMergeBase(
-                repo.FindBranch("develop").Tip,
+                repo.FindBranch(configuration.DevelopBranchName).Tip,
                 branch.Tip);
 
             if (ancestor != null)
@@ -71,12 +71,12 @@ Commit FindCommonAncestorWithDevelop(IRepository repo, Branch branch, BranchType
                     , branchType, branch.Name));
         }
 
-        public bool IsThereAnyCommitOnTheBranch(IRepository repo, Branch branch)
+        public bool IsThereAnyCommitOnTheBranch(IRepository repo, Branch branch, Config config)
         {
             var filter = new CommitFilter
             {
                 Since = branch,
-                Until = repo.FindBranch("develop")
+                Until = repo.FindBranch(config.DevelopBranchName)
             };
 
             var commits = repo.Commits.QueryBy(filter);

GitVersionCore/GitFlow/GitFlowVersionFinder.cs

@@ -19,7 +19,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
                 return new ReleaseVersionFinder().FindVersion(context);
             }
 
-            if (context.CurrentBranch.IsDevelop())
+            if (context.CurrentBranch.IsDevelop(context.Configuration))
             {
                 return new DevelopVersionFinder().FindVersion(context);
             }

GitVersionCore/GitVersionFinder.cs

@@ -10,7 +10,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
             Logger.WriteInfo("Running against branch: " + context.CurrentBranch.Name);
             EnsureMainTopologyConstraints(context);
 
-            if (ShouldGitHubFlowVersioningSchemeApply(context.Repository))
+            if (ShouldGitHubFlowVersioningSchemeApply(context.Repository, context.Configuration))
             {
                 Logger.WriteInfo("GitHubFlow version strategy will be used");
                 return new GitHubFlowVersionFinder().FindVersion(context);
@@ -20,9 +20,9 @@ public SemanticVersion FindVersion(GitVersionContext context)
             return new GitFlowVersionFinder().FindVersion(context);
         }
 
-        static bool ShouldGitHubFlowVersioningSchemeApply(IRepository repo)
+        static bool ShouldGitHubFlowVersioningSchemeApply(IRepository repo, Config configuration)
         {
-            return repo.FindBranch("develop") == null;
+            return repo.FindBranch(configuration.DevelopBranchName) == null;
         }
 
         void EnsureMainTopologyConstraints(GitVersionContext context)

GitVersionCore/OutputVariables/VariableProvider.cs

@@ -34,7 +34,7 @@ public static class VariableProvider
         public static Dictionary<string, string> GetVariablesFor(SemanticVersion semanticVersion, Config configuration)
         {
             var bmd = semanticVersion.BuildMetaData;
-            var formatter = bmd.Branch == "develop" ? new CiFeedFormatter() : null;
+            var formatter = bmd.Branch == configuration.DevelopBranchName ? new CiFeedFormatter() : null;
 
             var variables = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase)
             {

GitVersionTask.Tests/BranchClassifierTests.cs

@@ -35,9 +35,9 @@ public void IsSupport()
     [Test]
     public void IsDevelop()
     {
-        Assert.IsTrue(new MockBranch("develop").IsDevelop());
-        Assert.IsTrue(new MockBranch("Develop").IsDevelop());
-        Assert.IsFalse(new MockBranch("hotfix1").IsDevelop());
+        Assert.IsTrue(new MockBranch("develop").IsDevelop(new Config()));
+        Assert.IsTrue(new MockBranch("Develop").IsDevelop(new Config()));
+        Assert.IsFalse(new MockBranch("hotfix1").IsDevelop(new Config()));
     }
     [Test]
     public void IsMaster()