cleanup

Author: arturcic

src/GitVersionCore/Core/GitModel.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using GitVersion.Helpers;
 using LibGit2Sharp;
-using LibGit2Sharp.Handlers;
 
 namespace GitVersion
 {
@@ -13,37 +12,6 @@ public class AuthenticationInfo
         public string Username { get; set; }
         public string Password { get; set; }
         public string Token { get; set; }
-        public CredentialsHandler CredentialsProvider()
-        {
-            if (!string.IsNullOrWhiteSpace(Username))
-            {
-                return (url, user, types) => new UsernamePasswordCredentials
-                {
-                    Username = Username,
-                    Password = Password ?? string.Empty
-                };
-            }
-            return null;
-        }
-        public FetchOptions ToFetchOptions()
-        {
-            var fetchOptions = new FetchOptions
-            {
-                CredentialsProvider = CredentialsProvider()
-            };
-
-            return fetchOptions;
-        }
-        public CloneOptions ToCloneOptions()
-        {
-            var cloneOptions = new CloneOptions
-            {
-                Checkout = false,
-                CredentialsProvider = CredentialsProvider()
-            };
-
-            return cloneOptions;
-        }
     }
 
     public class ObjectId
@@ -369,9 +337,6 @@ public class CommitFilter
         public CommitSortStrategies SortBy { get; set; }
     }
 
-    /// <summary>
-    /// Determines the sorting strategy when iterating through the commits of the repository
-    /// </summary>
     [Flags]
     public enum CommitSortStrategies
     {

src/GitVersionCore/Core/GitRepository.cs

@@ -40,7 +40,7 @@ public static string Clone(string sourceUrl, string workdirPath, AuthenticationI
         {
             try
             {
-                return Repository.Clone(sourceUrl, workdirPath, auth.ToCloneOptions());
+                return Repository.Clone(sourceUrl, workdirPath, GetCloneOptions(auth));
             }
             catch (LibGit2SharpException ex)
             {
@@ -124,7 +124,7 @@ public void CreateBranchForPullRequestBranch(ILog log, AuthenticationInfo auth)
             var remote = network.Remotes.Single();
 
             log.Info("Fetching remote refs to see if there is a pull request ref");
-            var credentialsProvider = auth.CredentialsProvider();
+            var credentialsProvider = GetCredentialsProvider(auth);
             var remoteTips = (credentialsProvider != null
                     ? network.ListReferences(remote, credentialsProvider)
                     : network.ListReferences(remote))
@@ -225,6 +225,34 @@ private void AddMissingRefSpecs(ILog log, LibGit2Sharp.Remote remote)
             repositoryInstance.Network.Remotes.Update(remote.Name, r => r.FetchRefSpecs.Add(allBranchesFetchRefSpec));
         }
 
+        public static FetchOptions GetFetchOptions(AuthenticationInfo auth)
+        {
+            return new FetchOptions
+            {
+                CredentialsProvider = GetCredentialsProvider(auth)
+            };
+        }
+        private static CloneOptions GetCloneOptions(AuthenticationInfo auth)
+        {
+            return new CloneOptions
+            {
+                Checkout = false,
+                CredentialsProvider = GetCredentialsProvider(auth)
+            };
+        }
+        private static CredentialsHandler GetCredentialsProvider(AuthenticationInfo auth)
+        {
+            if (!string.IsNullOrWhiteSpace(auth.Username))
+            {
+                return (url, user, types) => new UsernamePasswordCredentials
+                {
+                    Username = auth.Username,
+                    Password = auth.Password ?? string.Empty
+                };
+            }
+            return null;
+        }
+
         public bool GetMatchingCommitBranch(Commit baseVersionSource, Branch branch, Commit firstMatchingCommit)
         {
             var filter = new CommitFilter

src/GitVersionCore/Core/GitRepositoryCommands.cs

@@ -30,7 +30,7 @@ public void Checkout(Branch branch)
 
         public void Fetch(string remote, IEnumerable<string> refspecs, AuthenticationInfo auth, string logMessage)
         {
-            Commands.Fetch((Repository)repository, remote, refspecs, auth.ToFetchOptions(), logMessage);
+            Commands.Fetch((Repository)repository, remote, refspecs, GitRepository.GetFetchOptions(auth), logMessage);
         }
     }
 }