Add branch methods to Repository and fix handler hookups

Author: shana

src/GitHub.Api/Git/IRepository.cs

@@ -75,5 +75,8 @@ public interface IRepository : IEquatable<IRepository>, IDisposable
         ITask RemoteAdd(string remote, string url);
         ITask RemoteRemove(string remote);
         ITask Push(string remote);
+        ITask DeleteBranch(string branch, bool force);
+        ITask CreateBranch(string branch, string baseBranch);
+        ITask SwitchBranch(string branch);
     }
 }

src/GitHub.Api/Git/Repository.cs

@@ -122,6 +122,9 @@ public ITask SetupRemote(string remote, string remoteUrl)
         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 ITask DeleteBranch(string branch, bool force) => repositoryManager.DeleteBranch(branch, force);
+        public ITask CreateBranch(string branch, string baseBranch) => repositoryManager.CreateBranch(branch, baseBranch);
+        public ITask SwitchBranch(string branch) => repositoryManager.SwitchBranch(branch);
 
         public void CheckAndRaiseEventsIfCacheNewer(CacheType cacheType, CacheUpdateEvent cacheUpdateEvent) => cacheContainer.CheckAndRaiseEventsIfCacheNewer(cacheType, cacheUpdateEvent);
 

src/GitHub.Api/Git/RepositoryManager.cs

@@ -330,12 +330,14 @@ public ITask DiscardChanges(GitStatusEntry[] gitStatusEntries)
 
                     if (itemsToRevert.Any())
                     {
-                        task.Then(GitClient.Discard(itemsToRevert));
+                        var next = GitClient.Discard(itemsToRevert);
+                        HookupHandlers(next, true);
+                        task.OnEnd -= HookupEndHandlerWithWatcher;
+                        task.Then(next);
                     }
                 }
                 , () => gitStatusEntries);
 
-
             return HookupHandlers(task, true);
         }
 
@@ -459,21 +461,37 @@ private ITask HookupHandlers(ITask task, bool filesystemChangesExpected)
                 }
             };
 
-            task.Finally(success =>
+            if (filesystemChangesExpected)
+                task.OnEnd += HookupEndHandlerWithWatcher;
+            else
+                task.OnEnd += HookupEndHandlerWithoutWatcher;
+            return task;
+        }
+
+        private void HookupEndHandlerWithWatcher(ITask task, bool success, Exception ex)
+        {
+            HookupEndHandler(task, true);
+        }
+
+        private void HookupEndHandlerWithoutWatcher(ITask task, bool success, Exception ex)
+        {
+            HookupEndHandler(task, false);
+        }
+
+        private void HookupEndHandler(ITask task, bool filesystemChangesExpected)
+        {
+            var isExclusive = task.IsChainExclusive();
+            if (filesystemChangesExpected)
             {
-                if (filesystemChangesExpected)
-                {
-                    //Logger.Trace("Ended Operation - Enable Watcher");
-                    watcher.Start();
-                }
+                //Logger.Trace("Ended Operation - Enable Watcher");
+                watcher.Start();
+            }
 
-                if (isExclusive)
-                {
-                    //Logger.Trace("Ended Operation - Clearing Busy Flag");
-                    IsBusy = false;
-                }
-            });
-            return task;
+            if (isExclusive)
+            {
+                //Logger.Trace("Ended Operation - Clearing Busy Flag");
+                IsBusy = false;
+            }
         }
 
         private string GetCurrentHead()