No reason to derive from FetchOptionsBase and have FetchOptions property

Author: bording

LibGit2Sharp.Tests/CloneFixture.cs

@@ -151,10 +151,14 @@ public void CallsProgressCallbacks(string url)
 
             Repository.Clone(url, scd.DirectoryPath, new CloneOptions()
             {
-                OnTransferProgress = _ => { transferWasCalled = true; return true; },
-                OnProgress = progress => { progressWasCalled = true; return true; },
-                OnUpdateTips = (name, oldId, newId) => { updateTipsWasCalled = true; return true; },
+                FetchOptions =
+                {
+                    OnTransferProgress = _ => { transferWasCalled = true; return true; },
+                    OnProgress = progress => { progressWasCalled = true; return true; },
+                    OnUpdateTips = (name, oldId, newId) => { updateTipsWasCalled = true; return true; }
+                },
                 OnCheckoutProgress = (a, b, c) => checkoutWasCalled = true
+
             });
 
             Assert.True(transferWasCalled);
@@ -174,7 +178,7 @@ public void CanCloneWithCredentials()
             string clonedRepoPath = Repository.Clone(Constants.PrivateRepoUrl, scd.DirectoryPath,
                 new CloneOptions()
                 {
-                    CredentialsProvider = Constants.PrivateRepoCredentials
+                    FetchOptions = { CredentialsProvider = Constants.PrivateRepoCredentials }
                 });
 
 
@@ -249,43 +253,46 @@ public void CanInspectCertificateOnClone(string url, string hostname, Type certT
 
             var options = new CloneOptions
             {
-                CertificateCheck = (cert, valid, host) =>
+                FetchOptions =
                 {
-                    wasCalled = true;
-
-                    Assert.Equal(hostname, host);
-                    Assert.Equal(certType, cert.GetType());
-
-                    if (certType == typeof(CertificateX509))
+                    CertificateCheck = (cert, valid, host) =>
                     {
-                        Assert.True(valid);
-                        var x509 = ((CertificateX509)cert).Certificate;
-                        // we get a string with the different fields instead of a structure, so...
-                        Assert.Contains("CN=github.com,", x509.Subject);
-                        checksHappy = true;
-                        return false;
-                    }
+                        wasCalled = true;
+
+                        Assert.Equal(hostname, host);
+                        Assert.Equal(certType, cert.GetType());
+
+                        if (certType == typeof(CertificateX509))
+                        {
+                            Assert.True(valid);
+                            var x509 = ((CertificateX509)cert).Certificate;
+                            // we get a string with the different fields instead of a structure, so...
+                            Assert.Contains("CN=github.com,", x509.Subject);
+                            checksHappy = true;
+                            return false;
+                        }
+
+                        if (certType == typeof(CertificateSsh))
+                        {
+                            var hostkey = (CertificateSsh)cert;
+                            Assert.True(hostkey.HasMD5);
+                            /*
+                             * Once you've connected and thus your ssh has stored the hostkey,
+                             * you can get the hostkey for a host with
+                             *
+                             *     ssh-keygen -F github.com -l | tail -n 1 | cut -d ' ' -f 2 | tr -d ':'
+                             *
+                             * though GitHub's hostkey won't change anytime soon.
+                             */
+                            Assert.Equal("1627aca576282d36631b564debdfa648",
+                                BitConverter.ToString(hostkey.HashMD5).ToLower().Replace("-", ""));
+                            checksHappy = true;
+                            return false;
+                        }
 
-                    if (certType == typeof(CertificateSsh))
-                    {
-                        var hostkey = (CertificateSsh)cert;
-                        Assert.True(hostkey.HasMD5);
-                        /*
-                         * Once you've connected and thus your ssh has stored the hostkey,
-                         * you can get the hostkey for a host with
-                         *
-                         *     ssh-keygen -F github.com -l | tail -n 1 | cut -d ' ' -f 2 | tr -d ':'
-                         *
-                         * though GitHub's hostkey won't change anytime soon.
-                         */
-                        Assert.Equal("1627aca576282d36631b564debdfa648",
-                            BitConverter.ToString(hostkey.HashMD5).ToLower().Replace("-", ""));
-                        checksHappy = true;
                         return false;
                     }
-
-                    return false;
-                },
+                }
             };
 
             Assert.Throws<UserCancelledException>(() =>
@@ -432,9 +439,12 @@ public void CanRecursivelyCloneSubmodules()
             {
                 RecurseSubmodules = true,
                 OnCheckoutProgress = checkoutProgressHandler,
-                OnUpdateTips = remoteRefUpdated,
-                RepositoryOperationStarting = repositoryOperationStarting,
-                RepositoryOperationCompleted = repositoryOperationCompleted,
+                FetchOptions =
+                {
+                    OnUpdateTips = remoteRefUpdated,
+                    RepositoryOperationStarting = repositoryOperationStarting,
+                    RepositoryOperationCompleted = repositoryOperationCompleted
+                }
             };
 
             string clonedRepoPath = Repository.Clone(uri.AbsolutePath, scd.DirectoryPath, options);
@@ -517,7 +527,7 @@ public void CanCancelRecursiveClone()
             CloneOptions options = new CloneOptions()
             {
                 RecurseSubmodules = true,
-                RepositoryOperationStarting = repositoryOperationStarting,
+                FetchOptions = { RepositoryOperationStarting = repositoryOperationStarting }
             };
 
             Assert.Throws<UserCancelledException>(() =>

LibGit2Sharp/CloneOptions.cs

@@ -6,7 +6,7 @@ namespace LibGit2Sharp
     /// <summary>
     /// Options to define clone behaviour
     /// </summary>
-    public sealed class CloneOptions : FetchOptionsBase, IConvertableToGitCheckoutOpts
+    public sealed class CloneOptions : IConvertableToGitCheckoutOpts
     {
         /// <summary>
         /// Creates default <see cref="CloneOptions"/> for a non-bare clone