Merge pull request #805 from github-for-unity/fixes/discard-should-confirm

Discard should always ask for confirmation

Author: StanleyGoldman

src/GitHub.Api/Localization.Designer.cs

@@ -198,9 +198,6 @@
   <data name="PullConfirmYes" xml:space="preserve">
     <value>Pull</value>
   </data>
-  <data name="PullConfirmCancel" xml:space="preserve">
-    <value>Cancel</value>
-  </data>
   <data name="PushConfirmTitle" xml:space="preserve">
     <value>Push Changes?</value>
   </data>
@@ -210,9 +207,6 @@
   <data name="PushConfirmYes" xml:space="preserve">
     <value>Push</value>
   </data>
-  <data name="PushConfirmCancel" xml:space="preserve">
-    <value>Cancel</value>
-  </data>
   <data name="SummaryLabel" xml:space="preserve">
     <value>Commit summary</value>
   </data>
@@ -265,7 +259,7 @@
     <value>ok</value>
   </data>
   <data name="Cancel" xml:space="preserve">
-    <value>cancel</value>
+    <value>Cancel</value>
   </data>
   <data name="PullActionTitle" xml:space="preserve">
     <value>Pull</value>
@@ -426,4 +420,13 @@
   <data name="MessageRefreshing" xml:space="preserve">
     <value>Refreshing</value>
   </data>
+  <data name="DiscardConfirmDescription" xml:space="preserve">
+    <value>Are you sure you want to discard these changes?</value>
+  </data>
+  <data name="DiscardConfirmTitle" xml:space="preserve">
+    <value>Discard Changes?</value>
+  </data>
+  <data name="DiscardConfirmYes" xml:space="preserve">
+    <value>Discard</value>
+  </data>
 </root>

src/GitHub.Api/Localization.resx

@@ -194,7 +194,14 @@ private GenericMenu CreateContextMenu(ChangesTreeNode node)
                 discardGuiContent = new GUIContent("Discard");
             }
 
-            genericMenu.AddItem(discardGuiContent, false, () => {
+            genericMenu.AddItem(discardGuiContent, false, () =>
+            {
+                if (!EditorUtility.DisplayDialog(Localization.DiscardConfirmTitle,
+                                Localization.DiscardConfirmDescription,
+                                Localization.DiscardConfirmYes,
+                                Localization.Cancel))
+                    return;
+
                 GitStatusEntry[] discardEntries;
                 if (node.isFolder)
                 {

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

@@ -568,7 +568,7 @@ private void DoActionbarGUI()
                             EditorUtility.DisplayDialog(Localization.PullConfirmTitle,
                                 String.Format(Localization.PullConfirmDescription, currentRemoteName),
                                 Localization.PullConfirmYes,
-                                Localization.PullConfirmCancel)
+                                Localization.Cancel)
                         )
                         {
                             Pull();
@@ -586,7 +586,7 @@ private void DoActionbarGUI()
                             EditorUtility.DisplayDialog(Localization.PushConfirmTitle,
                                 String.Format(Localization.PushConfirmDescription, currentRemoteName),
                                 Localization.PushConfirmYes,
-                                Localization.PushConfirmCancel)
+                                Localization.Cancel)
                         )
                         {
                             Push();