Makes RemoteUpdater disposable to reuse remotehandle

Author: sitereactor

LibGit2Sharp/RemoteCollection.cs

@@ -57,11 +57,12 @@ internal Remote RemoteForName(string name, bool shouldThrowIfNotFound = true)
         /// <returns>The updated remote.</returns>
         public virtual Remote Update(Remote remote, params Action<RemoteUpdater>[] actions)
         {
-            var updater = new RemoteUpdater(this.repository, remote);
-
-            foreach (Action<RemoteUpdater> action in actions)
+            using (var updater = new RemoteUpdater(this.repository, remote))
             {
-                action(updater);
+                foreach (Action<RemoteUpdater> action in actions)
+                {
+                    action(updater);
+                }
             }
 
             return this[remote.Name];

LibGit2Sharp/RemoteUpdater.cs

@@ -8,12 +8,11 @@ namespace LibGit2Sharp
     /// <summary>
     /// Exposes properties of a remote that can be updated.
     /// </summary>
-    public class RemoteUpdater
+    public class RemoteUpdater : IDisposable
     {
-        private readonly Repository repo;
-        private readonly Remote remote;
         private readonly UpdatingCollection<string> fetchRefSpecs;
         private readonly UpdatingCollection<string> pushRefSpecs;
+        private readonly RemoteSafeHandle remoteHandle;
 
         /// <summary>
         /// Needed for mocking purposes.
@@ -26,45 +25,32 @@ internal RemoteUpdater(Repository repo, Remote remote)
             Ensure.ArgumentNotNull(repo, "repo");
             Ensure.ArgumentNotNull(remote, "remote");
 
-            this.repo = repo;
-            this.remote = remote;
-
             fetchRefSpecs = new UpdatingCollection<string>(GetFetchRefSpecs, SetFetchRefSpecs);
             pushRefSpecs = new UpdatingCollection<string>(GetPushRefSpecs, SetPushRefSpecs);
+
+            remoteHandle = Proxy.git_remote_load(repo.Handle, remote.Name, true);
         }
 
         private IEnumerable<string> GetFetchRefSpecs()
         {
-            using (RemoteSafeHandle remoteHandle = Proxy.git_remote_load(repo.Handle, remote.Name, true))
-            {
-                return Proxy.git_remote_get_fetch_refspecs(remoteHandle);
-            }
+            return Proxy.git_remote_get_fetch_refspecs(remoteHandle);
         }
 
         private void SetFetchRefSpecs(IEnumerable<string> value)
         {
-            using (RemoteSafeHandle remoteHandle = Proxy.git_remote_load(repo.Handle, remote.Name, true))
-            {
-                Proxy.git_remote_set_fetch_refspecs(remoteHandle, value);
-                Proxy.git_remote_save(remoteHandle);
-            }
+            Proxy.git_remote_set_fetch_refspecs(remoteHandle, value);
+            Proxy.git_remote_save(remoteHandle);
         }
 
         private IEnumerable<string> GetPushRefSpecs()
         {
-            using (RemoteSafeHandle remoteHandle = Proxy.git_remote_load(repo.Handle, remote.Name, true))
-            {
-                return Proxy.git_remote_get_push_refspecs(remoteHandle);
-            }
+            return Proxy.git_remote_get_push_refspecs(remoteHandle);
         }
 
         private void SetPushRefSpecs(IEnumerable<string> value)
         {
-            using (RemoteSafeHandle remoteHandle = Proxy.git_remote_load(repo.Handle, remote.Name, true))
-            {
-                Proxy.git_remote_set_push_refspecs(remoteHandle, value);
-                Proxy.git_remote_save(remoteHandle);
-            }
+            Proxy.git_remote_set_push_refspecs(remoteHandle, value);
+            Proxy.git_remote_save(remoteHandle);
         }
 
         /// <summary>
@@ -74,11 +60,8 @@ public virtual TagFetchMode TagFetchMode
         {
             set
             {
-                using (RemoteSafeHandle remoteHandle = Proxy.git_remote_load(repo.Handle, remote.Name, true))
-                {
-                    Proxy.git_remote_set_autotag(remoteHandle, value);
-                    Proxy.git_remote_save(remoteHandle);
-                }
+                Proxy.git_remote_set_autotag(remoteHandle, value);
+                Proxy.git_remote_save(remoteHandle);
             }
         }
 
@@ -89,11 +72,8 @@ public virtual string Url
         {
             set
             {
-                using (RemoteSafeHandle remoteHandle = Proxy.git_remote_load(repo.Handle, remote.Name, true))
-                {
-                    Proxy.git_remote_set_url(remoteHandle, value);
-                    Proxy.git_remote_save(remoteHandle);
-                }
+                Proxy.git_remote_set_url(remoteHandle, value);
+                Proxy.git_remote_save(remoteHandle);
             }
         }
 
@@ -195,5 +175,10 @@ private void Save()
                 setter(list.Value);
             }
         }
+
+        public void Dispose()
+        {
+            remoteHandle.Dispose();
+        }
     }
 }