Cleanup.

Fix typos, remove unused usings, invoke extension methods properly.

Author: DanielRose

src/GitVersionCore.Tests/ConfigProviderTests.cs

@@ -322,7 +322,7 @@ public void WarnOnObsoleteIsDevelopBranchConfigurationSetting()
             LegacyConfigNotifier.Notify(new StringReader(text));
         });
 
-        var expecedMessage = string.Format("'is-develop' is deprecated, use 'track-release-branches' instead.");
-        exception.Message.ShouldContain(expecedMessage);
+        const string expectedMessage = @"'is-develop' is deprecated, use 'track-release-branches' instead.";
+        exception.Message.ShouldContain(expectedMessage);
     }
 }

src/GitVersionCore/BranchConfigurationCalculator.cs

@@ -92,25 +92,25 @@ static BranchConfig InheritBranchConfiguration(GitVersionContext context, Branch
                 }
                 var branchesToEvaluate = repository.Branches.Except(excludedInheritBranches).ToList();
 
-                var branchPoint = context.RepostioryMetadataProvider
-                    .FindCommitBranchWasBranchedFrom(targetBranch, repository, excludedInheritBranches.ToArray());
+                var branchPoint = context.RepositoryMetadataProvider
+                    .FindCommitBranchWasBranchedFrom(targetBranch, excludedInheritBranches.ToArray());
                 List<Branch> possibleParents;
                 if (branchPoint == BranchCommit.Empty)
                 {
-                    possibleParents = context.RepostioryMetadataProvider.GetBranchesContainingCommit(context.CurrentCommit, repository, branchesToEvaluate, true)
+                    possibleParents = context.RepositoryMetadataProvider.GetBranchesContainingCommit(context.CurrentCommit, branchesToEvaluate, true)
                         // It fails to inherit Increment branch configuration if more than 1 parent;
                         // therefore no point to get more than 2 parents
                         .Take(2)
                         .ToList();
                 }
                 else
                 {
-                    var branches = context.RepostioryMetadataProvider
-                        .GetBranchesContainingCommit(branchPoint.Commit, repository, branchesToEvaluate, true).ToList();
+                    var branches = context.RepositoryMetadataProvider
+                        .GetBranchesContainingCommit(branchPoint.Commit, branchesToEvaluate, true).ToList();
                     if (branches.Count > 1)
                     {
-                        var currentTipBranches = context.RepostioryMetadataProvider
-                            .GetBranchesContainingCommit(context.CurrentCommit, repository, branchesToEvaluate, true).ToList();
+                        var currentTipBranches = context.RepositoryMetadataProvider
+                            .GetBranchesContainingCommit(context.CurrentCommit, branchesToEvaluate, true).ToList();
                         possibleParents = branches.Except(currentTipBranches).ToList();
                     }
                     else
@@ -154,7 +154,7 @@ static BranchConfig InheritBranchConfiguration(GitVersionContext context, Branch
                 Logger.WriteWarning(errorMessage + Environment.NewLine + Environment.NewLine + "Falling back to " + branchName + " branch config");
 
                 // To prevent infinite loops, make sure that a new branch was chosen.
-                if (LibGitExtensions.IsSameBranch(targetBranch, chosenBranch))
+                if (targetBranch.IsSameBranch(chosenBranch))
                 {
                     Logger.WriteWarning("Fallback branch wants to inherit Increment branch configuration from itself. Using patch increment instead.");
                     return new BranchConfig(branchConfiguration)

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -2,7 +2,6 @@ namespace GitVersion
 {
     using Configuration.Init.Wizard;
     using GitVersion.Helpers;
-    using System;
     using System.IO;
     using System.Linq;
     using System.Text;

src/GitVersionCore/GitRepoMetadataProvider.cs

@@ -11,19 +11,18 @@ public class GitRepoMetadataProvider
         private Dictionary<Branch, List<BranchCommit>> mergeBaseCommitsCache;
         private Dictionary<Tuple<Branch, Branch>, MergeBaseData> mergeBaseCache;
         private Dictionary<Branch, List<SemanticVersion>> semanticVersionTagsOnBranchCache;
-        private IRepository repository;
+        private IRepository Repository { get; set; }
         const string missingTipFormat = "{0} has no tip. Please see http://example.com/docs for information on how to fix this.";
 
-
         public GitRepoMetadataProvider(IRepository repository)
         {
             mergeBaseCache = new Dictionary<Tuple<Branch, Branch>, MergeBaseData>();
             mergeBaseCommitsCache = new Dictionary<Branch, List<BranchCommit>>();
             semanticVersionTagsOnBranchCache = new Dictionary<Branch, List<SemanticVersion>>();
-            this.repository = repository;
+            this.Repository = repository;
         }
 
-        public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, IRepository repository, string tagPrefixRegex)
+        public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string tagPrefixRegex)
         {
             if (semanticVersionTagsOnBranchCache.ContainsKey(branch))
             {
@@ -33,9 +32,9 @@ public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, IRepos
 
             using (Logger.IndentLog(string.Format("Getting version tags from branch '{0}'.", branch.CanonicalName)))
             {
-                var tags = repository.Tags.Select(t => t).ToList();
+                var tags = this.Repository.Tags.Select(t => t).ToList();
 
-                var versionTags = repository.Commits.QueryBy(new CommitFilter
+                var versionTags = this.Repository.Commits.QueryBy(new CommitFilter
                 {
                     IncludeReachableFrom = branch.Tip
                 })
@@ -53,13 +52,13 @@ public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, IRepos
         }
 
         // TODO Should we cache this?
-        public IEnumerable<Branch> GetBranchesContainingCommit([NotNull] Commit commit, IRepository repository, IList<Branch> branches, bool onlyTrackedBranches)
+        public IEnumerable<Branch> GetBranchesContainingCommit([NotNull] Commit commit, IList<Branch> branches, bool onlyTrackedBranches)
         {
             if (commit == null)
             {
                 throw new ArgumentNullException("commit");
             }
-            Logger.WriteDebug("Heh");
+
             using (Logger.IndentLog(string.Format("Getting branches containing the commit '{0}'.", commit.Id)))
             {
                 var directBranchHasBeenFound = false;
@@ -87,7 +86,7 @@ public IEnumerable<Branch> GetBranchesContainingCommit([NotNull] Commit commit,
                 {
                     Logger.WriteInfo(string.Format("Searching for commits reachable from '{0}'.", branch.FriendlyName));
 
-                    var commits = repository.Commits.QueryBy(new CommitFilter
+                    var commits = this.Repository.Commits.QueryBy(new CommitFilter
                     {
                         IncludeReachableFrom = branch
                     }).Where(c => c.Sha == commit.Sha);
@@ -107,7 +106,7 @@ public IEnumerable<Branch> GetBranchesContainingCommit([NotNull] Commit commit,
         /// <summary>
         /// Find the merge base of the two branches, i.e. the best common ancestor of the two branches' tips.
         /// </summary>
-        public Commit FindMergeBase(Branch branch, Branch otherBranch, IRepository repository)
+        public Commit FindMergeBase(Branch branch, Branch otherBranch)
         {
             var key = Tuple.Create(branch, otherBranch);
 
@@ -129,7 +128,7 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch, IRepository repos
                     commitToFindCommonBase = otherBranch.Tip.Parents.First();
                 }
 
-                var findMergeBase = repository.ObjectDatabase.FindMergeBase(commit, commitToFindCommonBase);
+                var findMergeBase = this.Repository.ObjectDatabase.FindMergeBase(commit, commitToFindCommonBase);
                 if (findMergeBase != null)
                 {
                     Logger.WriteInfo(string.Format("Found merge base of {0}", findMergeBase.Sha));
@@ -145,7 +144,7 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch, IRepository repos
                         if (mergeBaseWasForwardMerge)
                         {
                             var second = commitToFindCommonBase.Parents.First();
-                            var mergeBase = repository.ObjectDatabase.FindMergeBase(commit, second);
+                            var mergeBase = this.Repository.ObjectDatabase.FindMergeBase(commit, second);
                             if (mergeBase == findMergeBase)
                             {
                                 break;
@@ -157,7 +156,7 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch, IRepository repos
                 }
 
                 // Store in cache.
-                mergeBaseCache.Add(key, new MergeBaseData(branch, otherBranch, repository, findMergeBase));
+                mergeBaseCache.Add(key, new MergeBaseData(branch, otherBranch, this.Repository, findMergeBase));
 
                 return findMergeBase;
             }
@@ -167,7 +166,7 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch, IRepository repos
         /// Find the commit where the given branch was branched from another branch.
         /// If there are multiple such commits and branches, returns the newest commit.
         /// </summary>
-        public BranchCommit FindCommitBranchWasBranchedFrom([NotNull] Branch branch, IRepository repository, params Branch[] excludedBranches)
+        public BranchCommit FindCommitBranchWasBranchedFrom([NotNull] Branch branch, params Branch[] excludedBranches)
         {
             if (branch == null)
             {
@@ -186,7 +185,6 @@ public BranchCommit FindCommitBranchWasBranchedFrom([NotNull] Branch branch, IRe
             }
         }
 
-
         List<BranchCommit> GetMergeCommitsForBranch(Branch branch)
         {
             if (mergeBaseCommitsCache.ContainsKey(branch))
@@ -197,15 +195,15 @@ List<BranchCommit> GetMergeCommitsForBranch(Branch branch)
                 return mergeBaseCommitsCache[branch];
             }
 
-            var branchMergeBases = repository.Branches.Select(otherBranch =>
+            var branchMergeBases = Repository.Branches.Select(otherBranch =>
             {
                 if (otherBranch.Tip == null)
                 {
                     Logger.WriteWarning(string.Format(missingTipFormat, otherBranch.FriendlyName));
                     return BranchCommit.Empty;
                 }
 
-                var findMergeBase = FindMergeBase(branch, otherBranch, repository);
+                var findMergeBase = FindMergeBase(branch, otherBranch);
                 return new BranchCommit(findMergeBase, otherBranch);
             }).Where(b => b.Commit != null).OrderByDescending(b => b.Commit.Committer.When).ToList();
             mergeBaseCommitsCache.Add(branch, branchMergeBases);

src/GitVersionCore/GitVersionContext.cs

@@ -17,7 +17,7 @@ public GitVersionContext(IRepository repository, Config configuration, bool isFo
         public GitVersionContext(IRepository repository, Branch currentBranch, Config configuration, bool onlyEvaluateTrackedBranches = true, string commitId = null)
         {
             Repository = repository;
-            RepostioryMetadataProvider = new GitRepoMetadataProvider(repository);
+            RepositoryMetadataProvider = new GitRepoMetadataProvider(repository);
             FullConfiguration = configuration;
             OnlyEvaluateTrackedBranches = onlyEvaluateTrackedBranches;
 
@@ -47,7 +47,7 @@ public GitVersionContext(IRepository repository, Branch currentBranch, Config co
 
             if (currentBranch.IsDetachedHead())
             {
-                CurrentBranch = RepostioryMetadataProvider.GetBranchesContainingCommit(CurrentCommit, repository, repository.Branches.ToList(), OnlyEvaluateTrackedBranches).OnlyOrDefault() ?? currentBranch;
+                CurrentBranch = RepositoryMetadataProvider.GetBranchesContainingCommit(CurrentCommit, repository.Branches.ToList(), OnlyEvaluateTrackedBranches).OnlyOrDefault() ?? currentBranch;
             }
             else
             {
@@ -79,7 +79,7 @@ public GitVersionContext(IRepository repository, Branch currentBranch, Config co
         public Branch CurrentBranch { get; private set; }
         public Commit CurrentCommit { get; private set; }
         public bool IsCurrentCommitTagged { get; private set; }
-        public GitRepoMetadataProvider RepostioryMetadataProvider { get; private set; }
+        public GitRepoMetadataProvider RepositoryMetadataProvider { get; private set; }
 
         void CalculateEffectiveConfiguration()
         {

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchNameBaseVersionStrategy.cs

@@ -25,7 +25,7 @@ public IEnumerable<BaseVersion> GetVersions(GitVersionContext context, string ta
             var versionInBranch = GetVersionInBranch(branchName, tagPrefixRegex);
             if (versionInBranch != null)
             {
-                var commitBranchWasBranchedFrom = context.RepostioryMetadataProvider.FindCommitBranchWasBranchedFrom(currentBranch, repository);
+                var commitBranchWasBranchedFrom = context.RepositoryMetadataProvider.FindCommitBranchWasBranchedFrom(currentBranch);
                 var branchNameOverride = branchName.RegexReplace("[-/]" + versionInBranch.Item1, string.Empty);
                 yield return new BaseVersion(context, "Version in branch name", false, versionInBranch.Item2, commitBranchWasBranchedFrom.Commit, branchNameOverride);
             }

src/GitVersionCore/VersionCalculation/DevelopVersionStrategy.cs

@@ -66,7 +66,7 @@ private IEnumerable<BaseVersion> ReleaseBranchBaseVersions(GitVersionContext con
                         // Need to drop branch overrides and give a bit more context about
                         // where this version came from
                         var source1 = "Release branch exists -> " + baseVersion.Source;
-                        return new BaseVersion(context, 
+                        return new BaseVersion(context,
                             source1,
                             baseVersion.ShouldIncrement,
                             baseVersion.SemanticVersion,
@@ -84,7 +84,7 @@ IEnumerable<BaseVersion> GetReleaseVersion(GitVersionContext context, Branch rel
             var repository = context.Repository;
 
             // Find the commit where the child branch was created.
-            var baseSource = context.RepostioryMetadataProvider.FindMergeBase(releaseBranch, context.CurrentBranch, repository);
+            var baseSource = context.RepositoryMetadataProvider.FindMergeBase(releaseBranch, context.CurrentBranch);
             if (baseSource == context.CurrentCommit)
             {
                 // Ignore the branch if it has no commits.

src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

@@ -258,8 +258,8 @@ void UpdatePreReleaseTag(GitVersionContext context, SemanticVersion semanticVers
 
             int? number = null;
 
-            var lastTag = context.RepostioryMetadataProvider
-                .GetVersionTagsOnBranch(context.CurrentBranch, context.Repository, context.Configuration.GitTagPrefix)
+            var lastTag = context.RepositoryMetadataProvider
+                .GetVersionTagsOnBranch(context.CurrentBranch, context.Configuration.GitTagPrefix)
                 .FirstOrDefault(v => v.PreReleaseTag.Name == tagToUse);
 
             if (lastTag != null &&