Fixed rebase issues, todo about regex and made dynamic repository test run against temporary local git repo

JakeGinnivan · JakeGinnivan · commit dd368aa94733 · 2015-01-15T21:55:20.000Z
diff --git a/GitVersionCore/BuildServers/GitHelper.cs b/GitVersionCore/BuildServers/GitHelper.cs
@@ -7,7 +7,7 @@ namespace GitVersion
 
     public static class GitHelper
     {
-        const string MergeMessageRegexPattern = "refs/heads/pull(-requests)?/(?<issuenumber>[0-9]*)/merge";
+        const string MergeMessageRegexPattern = "refs/heads/(pr|pull(-requests)?/(?<issuenumber>[0-9]*)/merge)";
 
         public static void NormalizeGitDirectory(string gitDirectory, Authentication authentication)
         {
@@ -32,14 +32,14 @@ public static void NormalizeGitDirectory(string gitDirectory, Authentication aut
                     Logger.WriteInfo(string.Format("HEAD points at branch '{0}'.", headSha));
                     return;
                 }
-                
+
                 Logger.WriteInfo(string.Format("HEAD is detached and points at commit '{0}'.", headSha));
-                
+
                 // In order to decide whether a fake branch is required or not, first check to see if any local branches have the same commit SHA of the head SHA.
                 // If they do, go ahead and checkout that branch
                 // If no, go ahead and check out a new branch, using the known commit SHA as the pointer
                 var localBranchesWhereCommitShaIsHead = repo.Branches.Where(b => !b.IsRemote && b.Tip.Sha == headSha).ToList();
-                
+
                 if (localBranchesWhereCommitShaIsHead.Count > 1)
                 {
                     var names = string.Join(", ", localBranchesWhereCommitShaIsHead.Select(r => r.CanonicalName));
@@ -55,7 +55,7 @@ public static void NormalizeGitDirectory(string gitDirectory, Authentication aut
                 else
                 {
                     Logger.WriteInfo(string.Format("Checking out local branch 'refs/heads/{0}'.", localBranchesWhereCommitShaIsHead[0].Name));
-                    repo.Branches[localBranchesWhereCommitShaIsHead[0].Name].Checkout();   
+                    repo.Branches[localBranchesWhereCommitShaIsHead[0].Name].Checkout();
                 }
             }
         }
@@ -76,22 +76,12 @@ public static string ExtractIssueNumber(string mergeMessage)
             // Dynamic: refs/heads/pr/5
             // Github Message: refs/heads/pull/5/merge
             // Stash Message:  refs/heads/pull-requests/5/merge
+            var regex = new Regex(MergeMessageRegexPattern);
+            var match = regex.Match(mergeMessage);
 
-            // Note by @GeertvanHorrik: sorry, I suck at regex so did a quick hack, feel free to replace by regex
-            if (mergeMessage.Contains("refs/heads/pr/"))
-            {
-                var issueNumber = mergeMessage.Replace("refs/heads/pr/", string.Empty);
-                return issueNumber;
-            }
-            else
-            {
-                var regex = new Regex(MergeMessageRegexPattern);
-                var match = regex.Match(mergeMessage);
-
-                var issueNumber = match.Groups["issuenumber"].Value;
+            var issueNumber = match.Groups["issuenumber"].Value;
 
-                return issueNumber;
-            }
+            return issueNumber;
         }
 
         static void AddMissingRefSpecs(Repository repo, Remote remote)
@@ -113,7 +103,7 @@ static FetchOptions BuildFetchOptions(string username, string password)
 
             if (!string.IsNullOrEmpty(username))
             {
-                fetchOptions.CredentialsProvider = (url, user, types) =>  new UsernamePasswordCredentials
+                fetchOptions.CredentialsProvider = (url, user, types) => new UsernamePasswordCredentials
                 {
                     Username = username,
                     Password = password
diff --git a/GitVersionCore/Extensions/ExtensionMethods.git.cs b/GitVersionCore/Extensions/ExtensionMethods.git.cs
@@ -80,7 +80,7 @@ public static bool IsPullRequest(this string branchName)
 
         public static bool IsSupport(this string branchName)
         {
-            return branchName.ToLower().StartsWith("support-");
+            return branchName.ToLower().StartsWith("support-") || branchName.ToLower().StartsWith("support/");
         }
     }
 }
diff --git a/GitVersionCore/GitVersionCore.csproj b/GitVersionCore/GitVersionCore.csproj
@@ -73,17 +73,12 @@
     <Compile Include="Configuration\Config.cs" />
     <Compile Include="Configuration\ConfigReader.cs" />
     <Compile Include="Configuration\ConfigurationProvider.cs" />
-    <Compile Include="GitFlow\BranchFinders\BranchCommitDifferenceFinder.cs" />
     <Compile Include="GitFlow\BranchFinders\RecentTagVersionExtractor.cs" />
     <Compile Include="Helpers\FileSystem.cs" />
     <Compile Include="Helpers\IFileSystem.cs" />
     <Compile Include="LastMinorVersionFinder.cs" />
     <Compile Include="Extensions\ExtensionMethods.git.cs" />
     <Compile Include="GitFlow\BranchFinders\BranchCommitDifferenceFinder.cs" />
-    <Compile Include="GitFlow\BranchFinders\RecentTagVersionExtractor.cs" />
-    <Compile Include="GitFlow\BranchFinders\VersionOnMasterFinder.cs" />
-    <Compile Include="LastVersionOnMasterFinder.cs" />
-    <Compile Include="ShortVersion.cs" />
     <Compile Include="SemanticVersionExtensions.cs" />
     <Compile Include="WarningException.cs" />
     <Compile Include="Extensions\ExtensionMethods.cs" />
@@ -127,7 +122,6 @@
     <Compile Include="SemanticVersionBuildMetaData.cs" />
     <Compile Include="SemanticVersionPreReleaseTag.cs" />
     <Compile Include="GitFlow\BranchFinders\VersionOnMasterFinder.cs" />
-    <Compile Include="ShortVersionParser.cs" />
     <Compile Include="VersionPoint.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/GitVersionExe.Tests/GitPreparerTests.cs b/GitVersionExe.Tests/GitPreparerTests.cs
@@ -15,39 +15,43 @@ public GitPreparerTests()
             Logger.WriteError = s => { };
         }
 
-        const string RemoteRepositoryUrl = "https://github.com/ParticularLabs/GitVersion.git";
         const string DefaultBranchName = "master";
-        const string SpecificBranchName = "gh-pages";
+        const string SpecificBranchName = "feature/foo";
 
-        [Explicit]
+        [Test]
         [TestCase(null, DefaultBranchName)]
         [TestCase(SpecificBranchName, SpecificBranchName)]
         public void WorksCorrectlyWithRemoteRepository(string branchName, string expectedBranchName)
         {
             var tempDir = Path.GetTempPath();
 
-            var arguments = new Arguments
+            using (var fixture = new EmptyRepositoryFixture(new Config()))
             {
-                TargetPath = tempDir,
-                TargetUrl = RemoteRepositoryUrl
-            };
+                fixture.Repository.MakeCommits(5);
+                fixture.Repository.CreateBranch("feature/foo");
+                var arguments = new Arguments
+                {
+                    TargetPath = tempDir,
+                    TargetUrl = fixture.RepositoryPath
+                };
 
-            if (!string.IsNullOrWhiteSpace(branchName))
-            {
-                arguments.TargetBranch = branchName;
-            }
+                if (!string.IsNullOrWhiteSpace(branchName))
+                {
+                    arguments.TargetBranch = branchName;
+                }
 
-            var gitPreparer = new GitPreparer(arguments);
-            var dynamicRepositoryPath = gitPreparer.Prepare();
+                var gitPreparer = new GitPreparer(arguments);
+                var dynamicRepositoryPath = gitPreparer.Prepare();
 
-            Assert.AreEqual(Path.Combine(tempDir, "_dynamicrepository", ".git"), dynamicRepositoryPath);
-            Assert.IsTrue(gitPreparer.IsDynamicGitRepository);
+                Assert.AreEqual(Path.Combine(tempDir, "_dynamicrepository", ".git"), dynamicRepositoryPath);
+                Assert.IsTrue(gitPreparer.IsDynamicGitRepository);
 
-            using (var repository = new Repository(dynamicRepositoryPath))
-            {
-                var currentBranch = repository.Head.CanonicalName;
+                using (var repository = new Repository(dynamicRepositoryPath))
+                {
+                    var currentBranch = repository.Head.CanonicalName;
 
-                Assert.IsTrue(currentBranch.EndsWith(expectedBranchName));
+                    Assert.IsTrue(currentBranch.EndsWith(expectedBranchName));
+                }
             }
         }
 
diff --git a/GitVersionTask.Tests/GitVersionTask.Tests.v2.ncrunchproject b/GitVersionTask.Tests/GitVersionTask.Tests.v2.ncrunchproject
@@ -22,6 +22,11 @@
   <UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
   <MSTestThreadApartmentState>STA</MSTestThreadApartmentState>
   <BuildProcessArchitecture>x86</BuildProcessArchitecture>
+  <IgnoredTests>
+    <FixtureTestSelector>
+      <FixtureName>IntegrationTests</FixtureName>
+    </FixtureTestSelector>
+  </IgnoredTests>
   <AdditionalFilesToInclude>..\Packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\**.*</AdditionalFilesToInclude>
   <HiddenWarnings>PostBuildEventDisabled</HiddenWarnings>
 </ProjectConfiguration>

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public static bool IsPullRequest(this string branchName)`
`80`	`80`
`81`	`81`	`public static bool IsSupport(this string branchName)`
`82`	`82`	`{`
`83`		`- return branchName.ToLower().StartsWith("support-");`
	`83`	`+ return branchName.ToLower().StartsWith("support-") \|\| branchName.ToLower().StartsWith("support/");`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`}`