Make sure things are called at the end of tasks

Author: shana

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs

@@ -693,15 +693,6 @@ private void Pull()
             {
                 Repository
                     .Pull()
-                    // we need the error propagated from the original git command to handle things appropriately
-                    .Then(success => {
-                        if (!success)
-                        {
-                            // if Pull fails we need to parse the output of the command, figure out
-                            // whether pull triggered a merge or a rebase, and abort the operation accordingly
-                            // (either git rebase --abort or git merge --abort)
-                        }
-                    }, runOptions: TaskRunOptions.OnAlways)
                     .FinallyInUI((success, e) => {
                         if (success)
                         {

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs

@@ -107,9 +107,12 @@ private static void ContextMenu_Lock()
 
             repository
                 .RequestLock(repositoryPath)
-                .ThenInUI(_ =>
+                .FinallyInUI((success, ex) =>
                 {
-                    EntryPoint.ApplicationManager.TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementAssetExplorerContextMenuLfsLock);
+                    if (success)
+                    {
+                        EntryPoint.ApplicationManager.TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementAssetExplorerContextMenuLfsLock);
+                    }
 
                     isBusy = false;
                     Selection.activeGameObject = null;
@@ -150,10 +153,12 @@ private static void ContextMenu_Unlock()
 
             repository
                 .ReleaseLock(repositoryPath, false)
-                .ThenInUI(_ =>
+                .FinallyInUI((success, ex) =>
                 {
-                    EntryPoint.ApplicationManager.TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementAssetExplorerContextMenuLfsUnlock);
-
+                    if (success)
+                    {
+                        EntryPoint.ApplicationManager.TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementAssetExplorerContextMenuLfsUnlock);
+                    }
                     isBusy = false;
                     Selection.activeGameObject = null;
                     EditorApplication.RepaintProjectWindow();