From 6357771fd445f929d504e94f2ba7e13c462a4626 Mon Sep 17 00:00:00 2001
From: Stanley Goldman <Stanley.Goldman@gmail.com>
Date: Mon, 2 Apr 2018 17:18:58 -0400
Subject: [PATCH] Using Repository to RemoteAdd and expecting file changes

---
 src/GitHub.Api/Git/IRepository.cs                        | 3 +++
 src/GitHub.Api/Git/Repository.cs                         | 3 +++
 src/GitHub.Api/Git/RepositoryManager.cs                  | 6 +++---
 .../Assets/Editor/GitHub.Unity/UI/PublishView.cs         | 9 +++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/GitHub.Api/Git/IRepository.cs b/src/GitHub.Api/Git/IRepository.cs
index 981aa5059..fa815a152 100644
--- a/src/GitHub.Api/Git/IRepository.cs
+++ b/src/GitHub.Api/Git/IRepository.cs
@@ -72,5 +72,8 @@ public interface IRepository : IEquatable<IRepository>, IDisposable
         event Action<CacheUpdateEvent> LocksChanged;
         event Action<CacheUpdateEvent> RemoteBranchListChanged;
         event Action<CacheUpdateEvent> LocalAndRemoteBranchListChanged;
+        ITask RemoteAdd(string remote, string url);
+        ITask RemoteRemove(string remote);
+        ITask Push(string remote);
     }
 }
\ No newline at end of file
diff --git a/src/GitHub.Api/Git/Repository.cs b/src/GitHub.Api/Git/Repository.cs
index 6e87c0e9a..88040611e 100644
--- a/src/GitHub.Api/Git/Repository.cs
+++ b/src/GitHub.Api/Git/Repository.cs
@@ -113,12 +113,15 @@ public ITask SetupRemote(string remote, string remoteUrl)
         public ITask CommitAllFiles(string message, string body) => repositoryManager.CommitAllFiles(message, body);
         public ITask CommitFiles(List<string> files, string message, string body) => repositoryManager.CommitFiles(files, message, body);
         public ITask Pull() => repositoryManager.Pull(CurrentRemote.Value.Name, CurrentBranch?.Name);
+        public ITask Push(string remote) => repositoryManager.Push(remote, CurrentBranch?.Name);
         public ITask Push() => repositoryManager.Push(CurrentRemote.Value.Name, CurrentBranch?.Name);
         public ITask Fetch() => repositoryManager.Fetch(CurrentRemote.Value.Name);
         public ITask Revert(string changeset) => repositoryManager.Revert(changeset);
         public ITask RequestLock(string file) => repositoryManager.LockFile(file);
         public ITask ReleaseLock(string file, bool force) => repositoryManager.UnlockFile(file, force);
         public ITask DiscardChanges(GitStatusEntry[] gitStatusEntry) => repositoryManager.DiscardChanges(gitStatusEntry);
+        public ITask RemoteAdd(string remote, string url) => repositoryManager.RemoteAdd(remote, url);
+        public ITask RemoteRemove(string remote) => repositoryManager.RemoteRemove(remote);
 
         public void CheckAndRaiseEventsIfCacheNewer(CacheType cacheType, CacheUpdateEvent cacheUpdateEvent) => cacheContainer.CheckAndRaiseEventsIfCacheNewer(cacheType, cacheUpdateEvent);
 
diff --git a/src/GitHub.Api/Git/RepositoryManager.cs b/src/GitHub.Api/Git/RepositoryManager.cs
index f9f53a83d..7cb0d413e 100644
--- a/src/GitHub.Api/Git/RepositoryManager.cs
+++ b/src/GitHub.Api/Git/RepositoryManager.cs
@@ -225,19 +225,19 @@ public ITask Revert(string changeset)
         public ITask RemoteAdd(string remote, string url)
         {
             var task = GitClient.RemoteAdd(remote, url);
-            return HookupHandlers(task, false);
+            return HookupHandlers(task, true);
         }
 
         public ITask RemoteRemove(string remote)
         {
             var task = GitClient.RemoteRemove(remote);
-            return HookupHandlers(task, false);
+            return HookupHandlers(task, true);
         }
 
         public ITask RemoteChange(string remote, string url)
         {
             var task = GitClient.RemoteChange(remote, url);
-            return HookupHandlers(task, false);
+            return HookupHandlers(task, true);
         }
 
         public ITask SwitchBranch(string branch)
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PublishView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PublishView.cs
index 5f47fe2f6..b62d1e823 100644
--- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PublishView.cs
+++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PublishView.cs
@@ -182,10 +182,11 @@ public override void OnGUI()
 
                             Logger.Trace("Repository Created");
 
-                            GitClient.RemoteAdd("origin", repository.CloneUrl)
-                                     .Then(GitClient.Push("origin", Repository.CurrentBranch.Value.Name))
-                                     .ThenInUI(Finish)
-                                     .Start();
+                            Repository.RemoteAdd("origin", repository.CloneUrl)
+                                .Then(Repository.Push("origin"))
+                                .ThenInUI(Finish)
+                                .Start();
+
                         }, organization);
                     }
                     EditorGUI.EndDisabledGroup();