Merge remote-tracking branch 'upstream/master' into release/3.0.0

JakeGinnivan · JakeGinnivan · commit d796782de498 · 2015-06-20T10:24:34.000+01:00
diff --git a/Docs/configurationOptions.md b/Docs/configurationOptions.md
@@ -1 +1 @@
-# Confiuration options
+# Configuration options
diff --git a/Docs/readme.md b/Docs/readme.md
@@ -4,11 +4,6 @@ GitVersion is a tool to help you achieve Semantic Versioning on your project.
 This influences many of the decisions GitVersion has made, please read and understand this page as it will help you start using GitVersion effectively!
 
 ## Assumptions/Rules
-### You tag releases when you release, not before
-GitVersion assumes that tags are used to *tag a release* and not used to build a release.
-
-This means that the version is calculated pre-emptively, if you currently tag, build then release that tag then GitVersion will probably not work for you.
-
 ### Tags override other rules
 If a commit is tagged, then GitVersion will *always* use that version over any calculated versions. This is so if you rebuild a tag then the same version will be produced.
 
@@ -39,6 +34,6 @@ We recognise that a single formatted version number does not work for all cases.
 You can just run `GitVersion.exe` in your repository to see what variables are available (by default a json object is returned).
 
 ## Exe or MSBuild Task
-There are two ways to consume GitVersion, the first is by running GitVersion.exe. The second is an MSBUild task. The MSBuild task is really easy to get up and running, simply install GitVersionTask from NuGet and it will integrate into your project and write out variables to your build server if it's running on one. The exe offers more options and works for not just .net projects.
+There are two ways to consume GitVersion, the first is by running GitVersion.exe. The second is an MSBuild task. The MSBuild task is really easy to get up and running, simply install GitVersionTask from NuGet and it will integrate into your project and write out variables to your build server if it's running on one. The exe offers more options and works for not just .net projects.
 
 Read more about [using GitVersion](./usage.md)
diff --git a/Docs/versionSources.md b/Docs/versionSources.md
@@ -17,7 +17,7 @@ GitVersion will find all tags on the current branch and return the highest one.
 Will increment: true
 
 ### Version in branch name
-If the branch has a version in it, then that version will be returned
+If the branch has a version in it, then that version will be returned.
 
 Will increment: false
 
@@ -27,7 +27,7 @@ If a branch with a version number in it is merged into the current branch, that
 Will increment: false
 
 ### GitVersionConfig.yaml
-If the next-version property is specified in the config file, it will be used as a version source.
+If the `next-version` property is specified in the config file, it will be used as a version source.
 
 Will increment: false
 
diff --git a/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs b/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs
@@ -86,7 +86,7 @@ public void ReleaseBranchWithNextVersionSetInConfig()
     }
 
     [Test]
-    public void CanTakeVersionFromReleaseBranchWithTagOverriden()
+    public void CanTakeVersionFromReleaseBranchWithTagOverridden()
     {
         var config = new Config();
         config.Branches["release[/-]"].Tag = "rc";
diff --git a/GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs b/GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs
@@ -57,7 +57,7 @@ public void GivenARemoteGitRepositoryAheadOfLocalRepository_ThenChangesShouldPul
     }
 
     [Test]
-    public void GivenARemoteGitRepositoryWhenCheckingOutDetachedhead_UsingExistingImplemenationThrowsException()
+    public void GivenARemoteGitRepositoryWhenCheckingOutDetachedhead_UsingExistingImplementationThrowsException()
     {
 
         using (var fixture = new RemoteRepositoryFixture(new Config()))
diff --git a/GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs b/GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
@@ -81,7 +81,7 @@ Another commit message
   A commit message")]
         [TestCase(@"Merge branch 'release/Sprint_2.0_Holdings_Computed_Balances'")]
         [TestCase(@"Merge branch 'feature/fix-for-08.14-push'")]
-        public void MergeMessagesThatsNotRelatedToGitVersion(string commitMessage)
+        public void MergeMessagesThatIsNotRelatedToGitVersion(string commitMessage)
         {
 
             var parents = GetParents(true);
diff --git a/GitVersionCore/BuildServers/GitHelper.cs b/GitVersionCore/BuildServers/GitHelper.cs
@@ -1,5 +1,6 @@
 namespace GitVersion
 {
+    using System;
     using LibGit2Sharp;
     using System.Collections.Generic;
     using System.Linq;
@@ -164,6 +165,20 @@ static void CreateFakeBranchPointingAtThePullRequestTip(Repository repo, Authent
             repo.Checkout(fakeBranchName);
         }
 
+        internal static IEnumerable<DirectReference> GetRemoteTipsUsingUsernamePasswordCredentials(Repository repo, string repoUrl, string username, string password)
+        {
+            // This is a work-around as long as https://github.com/libgit2/libgit2sharp/issues/1099 is not fixed
+            var remote = repo.Network.Remotes.Add(Guid.NewGuid().ToString(), repoUrl);
+            try
+            {
+                return GetRemoteTipsUsingUsernamePasswordCredentials(repo, remote, username, password);
+            }
+            finally
+            {
+                repo.Network.Remotes.Remove(remote.Name);
+            }
+        }
+
         static IEnumerable<DirectReference> GetRemoteTipsUsingUsernamePasswordCredentials(Repository repo, Remote remote, string username, string password)
         {
             return repo.Network.ListReferences(remote, (url, fromUrl, types) => new UsernamePasswordCredentials
@@ -185,7 +200,9 @@ static void CreateMissingLocalBranchesFromRemoteTrackingOnes(Repository repo, st
 
             foreach (var remoteTrackingReference in repo.Refs.FromGlob(prefix + "*").Where(r => r.CanonicalName != remoteHeadCanonicalName))
             {
-                var localCanonicalName = "refs/heads/" + remoteTrackingReference.CanonicalName.Substring(prefix.Length);
+                var remoteTrackingReferenceName = remoteTrackingReference.CanonicalName;
+                var branchName = remoteTrackingReferenceName.Substring(prefix.Length);
+                var localCanonicalName = "refs/heads/" + branchName;
 
                 if (repo.Refs.Any(x => x.CanonicalName == localCanonicalName))
                 {
@@ -203,6 +220,9 @@ static void CreateMissingLocalBranchesFromRemoteTrackingOnes(Repository repo, st
                 {
                     repo.Refs.Add(localCanonicalName, new ObjectId(symbolicReference.ResolveToDirectReference().TargetIdentifier), true);
                 }
+
+                var branch = repo.Branches[branchName];
+                repo.Branches.Update(branch, b => b.TrackedBranch = remoteTrackingReferenceName);
             }
         }
 
diff --git a/GitVersionCore/Configuration/Wizard/EditConfigStep.cs b/GitVersionCore/Configuration/Wizard/EditConfigStep.cs
@@ -30,7 +30,7 @@ protected override string GetPrompt(Config config)
         {
             return string.Format(@"Which would you like to change?
 
-0) Save changes
+0) Save changes and exit
 1) Exit without saving
 2) Branch specific configuration
 3) Branch Increment mode (per commit/after tag) (Current: {0})
diff --git a/GitVersionCore/Configuration/Wizard/PickBranchingStrategy1Step.cs b/GitVersionCore/Configuration/Wizard/PickBranchingStrategy1Step.cs
@@ -27,7 +27,7 @@ protected override string GetPrompt(Config config)
         {
             return @"GitVersion can try to recommend you a branching strategy based on a few questions. 
 
-Do you need to maintain mutliple versions of your application simultanously in production? (y/n)";
+Do you need to maintain multiple versions of your application simultaneously in production? (y/n)";
         }
 
         protected override string DefaultResult
diff --git a/GitVersionCore/Configuration/Wizard/PickBranchingStrategy2Step.cs b/GitVersionCore/Configuration/Wizard/PickBranchingStrategy2Step.cs
@@ -13,9 +13,9 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                     Console.WriteLine("GitFlow is likely a good fit, the 'develop' branch can be used " +
                                       "for active development while stabilising the next release.");
                     Console.WriteLine();
-                    Console.WriteLine("GitHubFlow is designed for a lightwieght workflow where master is always " +
+                    Console.WriteLine("GitHubFlow is designed for a lightweight workflow where master is always " +
                                       "good to deploy to production and feature branches are used to stabilise " +
-                                      "features, once stable they can be released in the next release");
+                                      "features, once stable they are merged to master and made available in the next release");
                     steps.Enqueue(new PickBranchingStrategyStep());
                     return StepResult.Ok();
                 case "n":
diff --git a/GitVersionCore/Configuration/Wizard/PickBranchingStrategy3Step.cs b/GitVersionCore/Configuration/Wizard/PickBranchingStrategy3Step.cs
@@ -13,7 +13,7 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                     Console.WriteLine("GitFlow could be a better fit than GitHubFlow for you.");
                     Console.WriteLine();
                     Console.WriteLine("GitVersion increments the SemVer for each commit on the develop branch by default, " +
-                                      "this means all packages build from develop can be published to a single NuGet feed.");
+                                      "this means all packages built from develop can be published to a single NuGet feed.");
                     break;
                 case "n":
                     Console.WriteLine("We recommend the GitHubFlow branching strategy, it sounds like you will " +
diff --git a/GitVersionCore/Configuration/Wizard/SetBranchIncrementMode.cs b/GitVersionCore/Configuration/Wizard/SetBranchIncrementMode.cs
@@ -35,7 +35,7 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
 
         protected override string GetPrompt(Config config)
         {
-            return string.Format(@"What do you want the increment mode for {0} to be
+            return string.Format(@"What do you want the increment mode for {0} to be?
 
 0) Back
 1) Follow SemVer and only increment when a release has been tagged (continuous delivery mode)
diff --git a/GitVersionCore/Configuration/Wizard/SetBranchTag.cs b/GitVersionCore/Configuration/Wizard/SetBranchTag.cs
@@ -9,8 +9,8 @@ public class SetBranchTag : ConfigInitWizardStep
 
         public SetBranchTag(string name, BranchConfig branchConfig)
         {
-            this.branchConfig = branchConfig;
             this.name = name;
+            this.branchConfig = branchConfig;
         }
 
         protected override StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config)
diff --git a/GitVersionCore/Configuration/Wizard/SimpleOrTutorialStep.cs b/GitVersionCore/Configuration/Wizard/SimpleOrTutorialStep.cs
@@ -20,7 +20,7 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
 
         protected override string GetPrompt(Config config)
         {
-            return "Would you like to run an extended init (more like a tutorial) (y/n)";
+            return "Would you like to run an extended init? (more like a tutorial) (y/n)";
         }
 
         protected override string DefaultResult
diff --git a/GitVersionCore/GitPreparer.cs b/GitVersionCore/GitPreparer.cs
@@ -172,7 +172,7 @@ static string CreateDynamicRepository(string targetPath, Authentication authenti
 
                 if (newHead == null)
                 {
-                    var remoteReference = GetRemoteReference(repository, targetBranch, repositoryUrl);
+                    var remoteReference = GetRemoteReference(repository, targetBranch, repositoryUrl, authentication);
                     if (remoteReference != null)
                     {
                         repository.Network.Fetch(repositoryUrl, new[]
@@ -202,11 +202,11 @@ private static Reference GetLocalReference(Repository repository, string branchN
             return repository.Refs.FirstOrDefault(localRef => string.Equals(localRef.CanonicalName, targetBranchName));
         }
 
-        private static DirectReference GetRemoteReference(Repository repository, string branchName, string repositoryUrl)
+        private static DirectReference GetRemoteReference(Repository repository, string branchName, string repositoryUrl, Authentication authentication)
         {
             var targetBranchName = branchName.GetCanonicalBranchName();
-            var remoteReferences = repository.Network.ListReferences(repositoryUrl);
 
+            var remoteReferences = GitHelper.GetRemoteTipsUsingUsernamePasswordCredentials(repository, repositoryUrl, authentication.Username, authentication.Password);
             return remoteReferences.FirstOrDefault(remoteRef => string.Equals(remoteRef.CanonicalName, targetBranchName));
         }
     }
diff --git a/GitVersionCore/LibGitExtensions.cs b/GitVersionCore/LibGitExtensions.cs
@@ -121,7 +121,7 @@ public static void CheckoutFilesIfExist(this IRepository repository, params stri
                 return;
             }
 
-            Logger.WriteInfo(string.Format("Checking out files that might be needed later in dynamic repository"));
+            Logger.WriteInfo("Checking out files that might be needed later in dynamic repository");
 
             foreach (var fileName in fileNames)
             {
diff --git a/GitVersionExe.Tests/GitPreparerTests.cs b/GitVersionExe.Tests/GitPreparerTests.cs
@@ -208,5 +208,41 @@ public void UsesGitVersionConfigWhenCreatingDynamicRepository()
         }
     }
 
+    [Test]
+    public void UsingDynamicRepositoryWithFeatureBranchWorks()
+    {
+        var repoName = Guid.NewGuid().ToString();
+        var tempPath = Path.GetTempPath();
+        var tempDir = Path.Combine(tempPath, repoName);
+        Directory.CreateDirectory(tempDir);
+
+        try
+        {
+            using (var mainRepositoryFixture = new EmptyRepositoryFixture(new Config()))
+            {
+                var commitId = mainRepositoryFixture.Repository.MakeACommit().Id.Sha;
+
+                var arguments = new Arguments
+                {
+                    TargetPath = tempDir,
+                    TargetUrl = mainRepositoryFixture.RepositoryPath,
+                    TargetBranch = "feature1",
+                    CommitId = commitId
+                };
+
+                var gitPreparer = new GitPreparer(arguments.TargetUrl, arguments.DynamicRepositoryLocation, arguments.Authentication, arguments.TargetBranch, arguments.NoFetch, arguments.TargetPath);
+                gitPreparer.Initialise(true);
+
+                mainRepositoryFixture.Repository.CreateBranch("feature1").Checkout();
+
+                Assert.DoesNotThrow(() => gitPreparer.Initialise(true));
+            }
+        }
+        finally
+        {
+            Directory.Delete(tempDir, true);
+        }
+    }
+
     // TODO test around normalisation
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# Confiuration options`
	`1`	`+# Configuration options`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public void ReleaseBranchWithNextVersionSetInConfig()`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`[Test]`
`89`		`- public void CanTakeVersionFromReleaseBranchWithTagOverriden()`
	`89`	`+ public void CanTakeVersionFromReleaseBranchWithTagOverridden()`
`90`	`90`	`{`
`91`	`91`	`var config = new Config();`
`92`	`92`	`config.Branches["release[/-]"].Tag = "rc";`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public void GivenARemoteGitRepositoryAheadOfLocalRepository_ThenChangesShouldPul`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`[Test]`
`60`		`- public void GivenARemoteGitRepositoryWhenCheckingOutDetachedhead_UsingExistingImplemenationThrowsException()`
	`60`	`+ public void GivenARemoteGitRepositoryWhenCheckingOutDetachedhead_UsingExistingImplementationThrowsException()`
`61`	`61`	`{`
`62`	`62`
`63`	`63`	`using (var fixture = new RemoteRepositoryFixture(new Config()))`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ Another commit message`
`81`	`81`	`A commit message")]`
`82`	`82`	`[TestCase(@"Merge branch 'release/Sprint_2.0_Holdings_Computed_Balances'")]`
`83`	`83`	`[TestCase(@"Merge branch 'feature/fix-for-08.14-push'")]`
`84`		`- public void MergeMessagesThatsNotRelatedToGitVersion(string commitMessage)`
	`84`	`+ public void MergeMessagesThatIsNotRelatedToGitVersion(string commitMessage)`
`85`	`85`	`{`
`86`	`86`
`87`	`87`	`var parents = GetParents(true);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`namespace GitVersion`
`2`	`2`	`{`
	`3`	`+ using System;`
`3`	`4`	`using LibGit2Sharp;`
`4`	`5`	`using System.Collections.Generic;`
`5`	`6`	`using System.Linq;`
`@@ -164,6 +165,20 @@ static void CreateFakeBranchPointingAtThePullRequestTip(Repository repo, Authent`
`164`	`165`	`repo.Checkout(fakeBranchName);`
`165`	`166`	`}`
`166`	`167`
	`168`	`+ internal static IEnumerable<DirectReference> GetRemoteTipsUsingUsernamePasswordCredentials(Repository repo, string repoUrl, string username, string password)`
	`169`	`+ {`
	`170`	`+ // This is a work-around as long as https://github.com/libgit2/libgit2sharp/issues/1099 is not fixed`
	`171`	`+ var remote = repo.Network.Remotes.Add(Guid.NewGuid().ToString(), repoUrl);`
	`172`	`+ try`
	`173`	`+ {`
	`174`	`+ return GetRemoteTipsUsingUsernamePasswordCredentials(repo, remote, username, password);`
	`175`	`+ }`
	`176`	`+ finally`
	`177`	`+ {`
	`178`	`+ repo.Network.Remotes.Remove(remote.Name);`
	`179`	`+ }`
	`180`	`+ }`
	`181`	`+`
`167`	`182`	`static IEnumerable<DirectReference> GetRemoteTipsUsingUsernamePasswordCredentials(Repository repo, Remote remote, string username, string password)`
`168`	`183`	`{`
`169`	`184`	`return repo.Network.ListReferences(remote, (url, fromUrl, types) => new UsernamePasswordCredentials`
`@@ -185,7 +200,9 @@ static void CreateMissingLocalBranchesFromRemoteTrackingOnes(Repository repo, st`
`185`	`200`
`186`	`201`	`foreach (var remoteTrackingReference in repo.Refs.FromGlob(prefix + "*").Where(r => r.CanonicalName != remoteHeadCanonicalName))`
`187`	`202`	`{`
`188`		`- var localCanonicalName = "refs/heads/" + remoteTrackingReference.CanonicalName.Substring(prefix.Length);`
	`203`	`+ var remoteTrackingReferenceName = remoteTrackingReference.CanonicalName;`
	`204`	`+ var branchName = remoteTrackingReferenceName.Substring(prefix.Length);`
	`205`	`+ var localCanonicalName = "refs/heads/" + branchName;`
`189`	`206`
`190`	`207`	`if (repo.Refs.Any(x => x.CanonicalName == localCanonicalName))`
`191`	`208`	`{`
`@@ -203,6 +220,9 @@ static void CreateMissingLocalBranchesFromRemoteTrackingOnes(Repository repo, st`
`203`	`220`	`{`
`204`	`221`	`repo.Refs.Add(localCanonicalName, new ObjectId(symbolicReference.ResolveToDirectReference().TargetIdentifier), true);`
`205`	`222`	`}`
	`223`	`+`
	`224`	`+ var branch = repo.Branches[branchName];`
	`225`	`+ repo.Branches.Update(branch, b => b.TrackedBranch = remoteTrackingReferenceName);`
`206`	`226`	`}`
`207`	`227`	`}`
`208`	`228`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ protected override string GetPrompt(Config config)`
`30`	`30`	`{`
`31`	`31`	`return string.Format(@"Which would you like to change?`
`32`	`32`
`33`		`-0) Save changes`
	`33`	`+0) Save changes and exit`
`34`	`34`	`1) Exit without saving`
`35`	`35`	`2) Branch specific configuration`
`36`	`36`	`3) Branch Increment mode (per commit/after tag) (Current: {0})`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ protected override string GetPrompt(Config config)`
`27`	`27`	`{`
`28`	`28`	`return @"GitVersion can try to recommend you a branching strategy based on a few questions.`
`29`	`29`
`30`		`-Do you need to maintain mutliple versions of your application simultanously in production? (y/n)";`
	`30`	`+Do you need to maintain multiple versions of your application simultaneously in production? (y/n)";`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`protected override string DefaultResult`