Move Fetch and Pull to be static methods

Since we make no use of these commands being classes. Make them static
methods of a static class to give them some namespacing.

Author: carlosmn

LibGit2Sharp.Tests/FetchFixture.cs

@@ -44,7 +44,7 @@ public void CanFetchIntoAnEmptyRepository(string url)
                 }
 
                 // Perform the actual fetch
-                new Commands.Fetch(repo, remoteName, new string[0], new FetchOptions { OnUpdateTips = expectedFetchState.RemoteUpdateTipsHandler }, null).Run();
+                Commands.Fetch(repo, remoteName, new string[0], new FetchOptions { OnUpdateTips = expectedFetchState.RemoteUpdateTipsHandler }, null);
 
                 // Verify the expected
                 expectedFetchState.CheckUpdatedReferences(repo);
@@ -64,10 +64,10 @@ public void CanFetchIntoAnEmptyRepositoryWithCredentials()
                 repo.Network.Remotes.Add(remoteName, Constants.PrivateRepoUrl);
 
                 // Perform the actual fetch
-                new Commands.Fetch(repo, remoteName, new string[0], new FetchOptions
+                Commands.Fetch(repo, remoteName, new string[0], new FetchOptions
                 {
                     CredentialsProvider = Constants.PrivateRepoCredentials
-                }, null).Run();
+                }, null);
             }
         }
 
@@ -101,10 +101,10 @@ public void CanFetchAllTagsIntoAnEmptyRepository(string url)
                 }
 
                 // Perform the actual fetch
-                new Commands.Fetch(repo, remoteName, new string[0], new FetchOptions {
+                Commands.Fetch(repo, remoteName, new string[0], new FetchOptions {
                     TagFetchMode = TagFetchMode.All,
                     OnUpdateTips = expectedFetchState.RemoteUpdateTipsHandler
-                }, null).Run();
+                }, null);
 
                 // Verify the expected
                 expectedFetchState.CheckUpdatedReferences(repo);
@@ -147,10 +147,10 @@ public void CanFetchCustomRefSpecsIntoAnEmptyRepository(string url, string local
                 }
 
                 // Perform the actual fetch
-                new Commands.Fetch(repo, remoteName, new string[] { refSpec }, new FetchOptions {
+                Commands.Fetch(repo, remoteName, new string[] { refSpec }, new FetchOptions {
                     TagFetchMode = TagFetchMode.None,
                     OnUpdateTips = expectedFetchState.RemoteUpdateTipsHandler
-                }, null).Run();
+                }, null);
 
                 // Verify the expected
                 expectedFetchState.CheckUpdatedReferences(repo);
@@ -181,7 +181,7 @@ public void FetchRespectsConfiguredAutoTagSetting(TagFetchMode tagFetchMode, int
                     r => r.TagFetchMode = tagFetchMode);
 
                 // Perform the actual fetch.
-                new Commands.Fetch(repo, remoteName, new string[0], null, null).Run();
+                Commands.Fetch(repo, remoteName, new string[0], null, null);
 
                 // Verify the number of fetched tags.
                 Assert.Equal(expectedTagCount, repo.Tags.Count());
@@ -199,7 +199,7 @@ public void CanFetchAllTagsAfterAnInitialClone()
 
             using (var repo = new Repository(clonedRepoPath))
             {
-                new Commands.Fetch(repo, "origin", new string[0], new FetchOptions { TagFetchMode = TagFetchMode.All }, null).Run();
+                Commands.Fetch(repo, "origin", new string[0], new FetchOptions { TagFetchMode = TagFetchMode.All }, null);
             }
         }
 
@@ -225,17 +225,17 @@ public void FetchHonorsTheFetchPruneConfigurationEntry()
 
                 // No pruning when the configuration entry isn't defined
                 Assert.Null(clonedRepo.Config.Get<bool>("fetch.prune"));
-                new Commands.Fetch(clonedRepo, "origin", new string[0], null, null).Run();
+                Commands.Fetch(clonedRepo, "origin", new string[0], null, null);
                 Assert.Equal(5, clonedRepo.Branches.Count(b => b.IsRemote));
 
                 // No pruning when the configuration entry is set to false
                 clonedRepo.Config.Set<bool>("fetch.prune", false);
-                new Commands.Fetch(clonedRepo, "origin", new string[0], null, null).Run();
+                Commands.Fetch(clonedRepo, "origin", new string[0], null, null);
                 Assert.Equal(5, clonedRepo.Branches.Count(b => b.IsRemote));
 
                 // Auto pruning when the configuration entry is set to true
                 clonedRepo.Config.Set<bool>("fetch.prune", true);
-                new Commands.Fetch(clonedRepo, "origin", new string[0], null, null).Run();
+                Commands.Fetch(clonedRepo, "origin", new string[0], null, null);
                 Assert.Equal(4, clonedRepo.Branches.Count(b => b.IsRemote));
             }
         }

LibGit2Sharp.Tests/NetworkFixture.cs

@@ -164,7 +164,7 @@ public void CanPull(FastForwardStrategy fastForwardStrategy)
                     }
                 };
 
-                MergeResult mergeResult = new Commands.Pull(repo, Constants.Signature, pullOptions).Run();
+                MergeResult mergeResult = Commands.Pull(repo, Constants.Signature, pullOptions);
 
                 if(fastForwardStrategy == FastForwardStrategy.Default || fastForwardStrategy == FastForwardStrategy.FastForwardOnly)
                 {
@@ -197,7 +197,7 @@ public void CanPullIntoEmptyRepo()
                     b => b.UpstreamBranch = "refs/heads/master");
 
                 // Pull!
-                MergeResult mergeResult = new Commands.Pull(repo, Constants.Signature, new PullOptions()).Run();
+                MergeResult mergeResult = Commands.Pull(repo, Constants.Signature, new PullOptions());
 
                 Assert.Equal(mergeResult.Status, MergeStatus.FastForward);
                 Assert.Equal(mergeResult.Commit, repo.Branches["refs/remotes/origin/master"].Tip);
@@ -224,7 +224,7 @@ public void PullWithoutMergeBranchThrows()
 
                 try
                 {
-                    new Commands.Pull(repo, Constants.Signature, new PullOptions()).Run();
+                    Commands.Pull(repo, Constants.Signature, new PullOptions());
                 }
                 catch(MergeFetchHeadNotFoundException ex)
                 {
@@ -252,7 +252,7 @@ public void CanMergeFetchedRefs()
                 Assert.False(repo.RetrieveStatus().Any());
                 Assert.Equal(repo.Lookup<Commit>("refs/remotes/origin/master~1"), repo.Head.Tip);
 
-                new Commands.Fetch(repo, repo.Head.RemoteName, new string[0], null, null).Run();
+                Commands.Fetch(repo, repo.Head.RemoteName, new string[0], null, null);
 
                 MergeOptions mergeOptions = new MergeOptions()
                 {
@@ -279,7 +279,7 @@ public void CanPruneRefs()
             using (var repo = new Repository(clonedRepoPath))
             {
                 repo.Network.Remotes.Add("pruner", clonedRepoPath2);
-                new Commands.Fetch(repo, "pruner", new string[0], null, null).Run();
+                Commands.Fetch(repo, "pruner", new string[0], null, null);
                 Assert.NotNull(repo.Refs["refs/remotes/pruner/master"]);
 
                 // Remove the branch from the source repository
@@ -289,11 +289,11 @@ public void CanPruneRefs()
                 }
 
                 // and by default we don't prune it
-                new Commands.Fetch(repo, "pruner", new string[0], null, null).Run();
+                Commands.Fetch(repo, "pruner", new string[0], null, null);
                 Assert.NotNull(repo.Refs["refs/remotes/pruner/master"]);
 
                 // but we do when asked by the user
-                new Commands.Fetch(repo, "pruner", new string[0], new FetchOptions { Prune = true}, null).Run();
+                Commands.Fetch(repo, "pruner", new string[0], new FetchOptions { Prune = true}, null);
                 Assert.Null(repo.Refs["refs/remotes/pruner/master"]);
             }
         }

LibGit2Sharp.Tests/RepositoryFixture.cs

@@ -208,13 +208,13 @@ public void CanFetchFromRemoteByName()
                 }
 
                 // Perform the actual fetch
-                new Commands.Fetch(repo, remoteName, new string[0], new FetchOptions { OnUpdateTips = expectedFetchState.RemoteUpdateTipsHandler }, null).Run();
+                Commands.Fetch(repo, remoteName, new string[0], new FetchOptions { OnUpdateTips = expectedFetchState.RemoteUpdateTipsHandler }, null);
 
                 // Verify the expected state
                 expectedFetchState.CheckUpdatedReferences(repo);
 
                 // Now fetch the rest of the tags
-                new Commands.Fetch(repo, remoteName, new string[0], new FetchOptions { TagFetchMode = TagFetchMode.All }, null).Run();
+                Commands.Fetch(repo, remoteName, new string[0], new FetchOptions { TagFetchMode = TagFetchMode.All }, null);
 
                 // Verify that the "nearly-dangling" tag is now in the repo.
                 Tag nearlyDanglingTag = repo.Tags["nearly-dangling"];

LibGit2Sharp.Tests/SmartSubtransportFixture.cs

@@ -63,9 +63,9 @@ public void CustomSmartSubtransportTest(string scheme, string url)
                     }
 
                     // Perform the actual fetch
-                    new Commands.Fetch(repo, remoteName, new string[0],
+                    Commands.Fetch(repo, remoteName, new string[0],
                         new FetchOptions { OnUpdateTips = expectedFetchState.RemoteUpdateTipsHandler, TagFetchMode = TagFetchMode.Auto },
-                    null).Run();
+                    null);
 
                     // Verify the expected
                     expectedFetchState.CheckUpdatedReferences(repo);
@@ -115,10 +115,10 @@ public void CanUseCredentials(string scheme, string url, string user, string pas
                     }
 
                     // Perform the actual fetch
-                    new Commands.Fetch(repo, remoteName, new string[0], new FetchOptions {
+                    Commands.Fetch(repo, remoteName, new string[0], new FetchOptions {
                         OnUpdateTips = expectedFetchState.RemoteUpdateTipsHandler, TagFetchMode = TagFetchMode.Auto,
                         CredentialsProvider = (_user, _valid, _hostname) => new UsernamePasswordCredentials() { Username = "libgit3", Password = "libgit3" },
-                    }, null).Run();
+                    }, null);
 
                     // Verify the expected
                     expectedFetchState.CheckUpdatedReferences(repo);

LibGit2Sharp/Commands/Fetch.cs

@@ -3,58 +3,41 @@
 using LibGit2Sharp.Core;
 using LibGit2Sharp.Core.Handles;
 
-namespace LibGit2Sharp.Commands
+namespace LibGit2Sharp
 {
     /// <summary>
-    /// Fetch from a particular remote or the default
+    /// Class to serve as namespacing for the command-emulating methods
     /// </summary>
-    public class Fetch
+    public static partial class Commands
     {
-        private readonly Repository repository;
-        private readonly string remote;
-        private readonly FetchOptions options;
-        private readonly string logMessage;
-        private readonly IEnumerable<string> refspecs;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LibGit2Sharp.Commands.Fetch"/> class.
-        /// </summary>
-        /// <param name="repository">The repository in which to fetch.</param>
-        /// <param name="remote">The remote to fetch from</param>
-        /// <param name="options">Fetch options.</param>
-        /// <param name="logMessage">Log message for any ref updates.</param>
-        /// <param name="refspecs">List of refspecs to apply as active.</param>
-        public Fetch(Repository repository, string remote, IEnumerable<string> refspecs, FetchOptions options, string logMessage)
-        {
-            Ensure.ArgumentNotNull(remote, "remote");
-
-            this.repository = repository;
-            this.remote = remote;
-            this.options = options ?? new FetchOptions();
-            this.logMessage = logMessage;
-            this.refspecs = refspecs;
-        }
-
-        private RemoteHandle RemoteFromNameOrUrl()
+        private static RemoteHandle RemoteFromNameOrUrl(RepositoryHandle repoHandle, string remote)
         {
             RemoteHandle handle = null;
-            handle = Proxy.git_remote_lookup(repository.Handle, remote, false);
+            handle = Proxy.git_remote_lookup(repoHandle, remote, false);
 
             // If that wasn't the name of a remote, let's use it as a url
             if (handle == null)
             {
-                handle = Proxy.git_remote_create_anonymous(repository.Handle, remote);
+                handle = Proxy.git_remote_create_anonymous(repoHandle, remote);
             }
 
             return handle;
         }
 
         /// <summary>
-        /// Run this command
+        /// Perform a fetch
         /// </summary>
-        public void Run()
+        /// <param name="repository">The repository in which to fetch.</param>
+        /// <param name="remote">The remote to fetch from. Either as a remote name or a URL</param>
+        /// <param name="options">Fetch options.</param>
+        /// <param name="logMessage">Log message for any ref updates.</param>
+        /// <param name="refspecs">List of refspecs to apply as active.</param>
+        public static void Fetch(Repository repository, string remote, IEnumerable<string> refspecs, FetchOptions options, string logMessage)
         {
-            using (var remoteHandle = RemoteFromNameOrUrl())
+            Ensure.ArgumentNotNull(remote, "remote");
+
+            options = options ?? new FetchOptions();
+            using (var remoteHandle = RemoteFromNameOrUrl(repository.Handle, remote))
             {
 
                 var callbacks = new RemoteCallbacks(options);

LibGit2Sharp/Commands/Pull.cs

@@ -2,40 +2,27 @@
 using LibGit2Sharp;
 using LibGit2Sharp.Core;
 
-namespace LibGit2Sharp.Commands
+namespace LibGit2Sharp
 {
     /// <summary>
     /// Fetch changes from the configured upstream remote and branch into the branch pointed at by HEAD.
     /// </summary>
-    public class Pull
+    public static partial class Commands
     {
-        private readonly Repository repository;
-        private readonly Signature merger;
-        private readonly PullOptions options;
-
         /// <summary>
-        /// Initializes a new instance of the <see cref="LibGit2Sharp.Commands.Pull"/> class.
+        /// Fetch changes from the configured upstream remote and branch into the branch pointed at by HEAD.
         /// </summary>
         /// <param name="repository">The repository.</param>
         /// <param name="merger">The signature to use for the merge.</param>
         /// <param name="options">The options for fetch and merging.</param>
-        public Pull(Repository repository, Signature merger, PullOptions options)
+        public static MergeResult Pull(Repository repository, Signature merger, PullOptions options)
         {
             Ensure.ArgumentNotNull(repository, "repository");
             Ensure.ArgumentNotNull(merger, "merger");
             Ensure.ArgumentNotNull(options, "options");
 
-            this.repository = repository;
-            this.merger = merger;
-            this.options = options;
-        }
-
-        /// <summary>
-        /// Run this command
-        /// </summary>
-        public MergeResult Run()
-        {
 
+            options = options ?? new PullOptions();
             Branch currentBranch = repository.Head;
 
             if (!currentBranch.IsTracking)
@@ -48,7 +35,7 @@ public MergeResult Run()
                 throw new LibGit2SharpException("No upstream remote for the current branch.");
             }
 
-            new Commands.Fetch(repository, currentBranch.RemoteName, new string[0], options.FetchOptions, null).Run();
+            Commands.Fetch(repository, currentBranch.RemoteName, new string[0], options.FetchOptions, null);
             return repository.MergeFetchedRefs(merger, options.MergeOptions);
         }
     }