Merge pull request #770 from github-for-unity/fixes/error-message-popups

Using git errors in popup messages

Author: shana

src/GitHub.Api/Localization.Designer.cs

@@ -345,4 +345,10 @@
   <data name="Window_RepoUrlTooltip" xml:space="preserve">
     <value>Url of the {0} remote</value>
   </data>
+  <data name="ReleaseLockActionTitle" xml:space="preserve">
+    <value>Release Lock</value>
+  </data>
+  <data name="RequestLockActionTitle" xml:space="preserve">
+    <value>Request Lock</value>
+  </data>
 </root>

src/GitHub.Api/Localization.resx

@@ -108,6 +108,12 @@ private static void ContextMenu_Lock()
                     {
                         EntryPoint.ApplicationManager.TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsLock);
                     }
+                    else
+                    {
+                        EditorUtility.DisplayDialog(Localization.RequestLockActionTitle,
+                            ex.Message,
+                            Localization.Ok);
+                    }
 
                     isBusy = false;
                     Selection.activeGameObject = null;
@@ -154,6 +160,13 @@ private static void ContextMenu_Unlock()
                     {
                         EntryPoint.ApplicationManager.TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock);
                     }
+                    else
+                    {
+                        EditorUtility.DisplayDialog(Localization.ReleaseLockActionTitle,
+                            ex.Message,
+                            Localization.Ok);
+                    }
+
                     isBusy = false;
                     Selection.activeGameObject = null;
                     EditorApplication.RepaintProjectWindow();

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

@@ -295,7 +295,19 @@ private void OnGitLfsLocksGUI()
                                 if (GUILayout.Button("Unlock"))
                                 {
                                     Repository.ReleaseLock(lck.Path, true)
-                                        .Then(UsageTracker.IncrementSettingsViewButtonLfsUnlock)
+                                        .FinallyInUI((success, ex) =>
+                                        {
+                                            if (success)
+                                            {
+                                                TaskManager.Run(UsageTracker.IncrementSettingsViewButtonLfsUnlock);
+                                            }
+                                            else
+                                            {
+                                                EditorUtility.DisplayDialog(Localization.ReleaseLockActionTitle,
+                                                    ex.Message,
+                                                    Localization.Ok);
+                                            }
+                                        })
                                         .Start();
                                 }
                             }

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

@@ -566,7 +566,7 @@ private void Pull()
                         else
                         {
                             EditorUtility.DisplayDialog(Localization.PullActionTitle,
-                                Localization.PullFailureDescription,
+                                e.Message,
                             Localization.Ok);
                         }
                     })
@@ -590,7 +590,7 @@ private void Push()
                     else
                     {
                         EditorUtility.DisplayDialog(Localization.PushActionTitle,
-                            Localization.PushFailureDescription,
+                            e.Message,
                         Localization.Ok);
                     }
                 })
@@ -602,12 +602,13 @@ private void Fetch()
             Repository
                 .Fetch()
                 .FinallyInUI((success, e) => {
-                    if (!success)
+                    if (success)
                     {
                         TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementHistoryViewToolbarFetch);
-
-                        EditorUtility.DisplayDialog(Localization.FetchActionTitle, Localization.FetchFailureDescription,
-                            Localization.Ok);
+                    }
+                    else
+                    {
+                        EditorUtility.DisplayDialog(Localization.FetchActionTitle, e.Message, Localization.Ok);
                     }
                 })
                 .Start();