Fix develop matching developer; add support for dev to be recognized the same way as develop

Author: Oren Novotny

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

@@ -44,7 +44,7 @@ branches:
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-  develop:
+  dev(elop)?(ment)?$:
     mode: ContinuousDeployment
     tag: unstable
     increment: Minor

src/GitVersionCore.Tests/ConfigProviderTests.cs

@@ -75,16 +75,16 @@ public void OverwritesDefaultsWithProvidedConfig()
         const string text = @"
 next-version: 2.0.0
 branches:
-    develop:
+    dev(elop)?(ment)?$:
         mode: ContinuousDeployment
         tag: dev";
         SetupConfigFileContent(text);
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
 
         config.NextVersion.ShouldBe("2.0.0");
-        config.Branches["develop"].Increment.ShouldBe(defaultConfig.Branches["develop"].Increment);
-        config.Branches["develop"].VersioningMode.ShouldBe(defaultConfig.Branches["develop"].VersioningMode);
-        config.Branches["develop"].Tag.ShouldBe("dev");
+        config.Branches["dev(elop)?(ment)?$"].Increment.ShouldBe(defaultConfig.Branches["dev(elop)?(ment)?$"].Increment);
+        config.Branches["dev(elop)?(ment)?$"].VersioningMode.ShouldBe(defaultConfig.Branches["dev(elop)?(ment)?$"].VersioningMode);
+        config.Branches["dev(elop)?(ment)?$"].Tag.ShouldBe("dev");
     }
 
     [Test]
@@ -117,7 +117,7 @@ public void CanReadDefaultDocument()
         SetupConfigFileContent(text);
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
-        config.Branches["develop"].Tag.ShouldBe("unstable");
+        config.Branches["dev(elop)?(ment)?$"].Tag.ShouldBe("unstable");
         config.Branches["release[/-]"].Tag.ShouldBe("beta");
         config.TagPrefix.ShouldBe(ConfigurationProvider.DefaultTagPrefix);
         config.NextVersion.ShouldBe(null);

src/GitVersionCore.Tests/GitVersionContextTests.cs

@@ -39,7 +39,7 @@ public void UsesBranchSpecificConfigOverTopLevelDefaults()
                 Branches =
                 {
                     {
-                        "develop", new BranchConfig
+                        "dev(elop)?(ment)?$", new BranchConfig
                         {
                             VersioningMode = VersioningMode.ContinuousDeployment,
                             Tag = "alpha"
@@ -68,7 +68,7 @@ public void CanFindParentBranchForInheritingIncrementStrategy()
             {
                 Branches =
                 {
-                    { "develop", new BranchConfig { Increment = IncrementStrategy.Major} },
+                    { "dev(elop)?(ment)?$", new BranchConfig { Increment = IncrementStrategy.Major} },
                     { "feature[/-]", new BranchConfig { Increment = IncrementStrategy.Inherit} }
                 }
             };

src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

@@ -59,7 +59,7 @@ public void CanChangeDevelopTagViaConfig()
         {
             Branches =
             {
-                {"develop", new BranchConfig
+                {"dev(elop)?(ment)?$", new BranchConfig
                 {
                     Tag = "alpha"
                 }
@@ -75,6 +75,18 @@ public void CanChangeDevelopTagViaConfig()
         }
     }
 
+    [Test]
+    public void WhenDeveloperBranchExistsDontTreatAsDevelop()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.Checkout(fixture.Repository.CreateBranch("developer"));
+            fixture.Repository.MakeACommit();
+            fixture.AssertFullSemver("1.0.1-developer.1+1"); // this tag should be the branch name by default, not unstable
+        }
+    }
+
     [Test]
     public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
     {
@@ -113,7 +125,7 @@ public void CanHandleContinuousDelivery()
         {
             Branches =
             {
-                {"develop", new BranchConfig
+                {"dev(elop)?(ment)?$", new BranchConfig
                 {
                     VersioningMode = VersioningMode.ContinuousDelivery
                 }

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -39,7 +39,7 @@ public static void ApplyDefaultsTo(Config config)
                 defaultIncrementStrategy: IncrementStrategy.Inherit);
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "hotfix[/-]"), defaultTag: "beta");
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "support[/-]"), defaultTag: string.Empty, defaultPreventIncrement: true);
-            ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "develop"), 
+            ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "dev(elop)?(ment)?$"), 
                 defaultTag: "unstable",
                 defaultIncrementStrategy: IncrementStrategy.Minor,
                 defaultVersioningMode: VersioningMode.ContinuousDeployment,