Merge pull request #730 from github-for-unity/fixes/on-end-not-firing

Hookup Handlers error

Author: shana

src/GitHub.Api/Git/RepositoryManager.cs

@@ -327,10 +327,7 @@ public ITask DiscardChanges(GitStatusEntry[] gitStatusEntries)
 
                     if (itemsToRevert.Any())
                     {
-                        var next = GitClient.Discard(itemsToRevert);
-                        HookupHandlers(next, true);
-                        task.OnEnd -= HookupEndHandlerWithWatcher;
-                        task.Then(next);
+                        task.Then(GitClient.Discard(itemsToRevert));
                     }
                 }
                 , () => gitStatusEntries);
@@ -453,35 +450,21 @@ private ITask HookupHandlers(ITask task, bool filesystemChangesExpected)
                 }
             };
 
-            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)
+            task.Finally(success =>
             {
-                watcher.Start();
-            }
+                if (filesystemChangesExpected)
+                {
+                    //Logger.Trace("Ended Operation - Enable Watcher");
+                    watcher.Start();
+                }
 
-            if (isExclusive)
-            {
-                IsBusy = false;
-            }
+                if (isExclusive)
+                {
+                    //Logger.Trace("Ended Operation - Clearing Busy Flag");
+                    IsBusy = false;
+                }
+            });
+            return task;
         }
 
         private string GetCurrentHead()