Merge pull request #247 from github-for-unity/fixes/clone-remote-branch-2

Confirmation and Warning messages when checking out a remote branch - Retry

Author: StanleyGoldman

Diff for: src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs

@@ -15,6 +15,13 @@ class BranchesView : Subview
         private const string ConfirmSwitchMessage = "Switch branch to {0}?";
         private const string ConfirmSwitchOK = "Switch";
         private const string ConfirmSwitchCancel = "Cancel";
+        private const string ConfirmCheckoutBranchTitle = "Confirm branch checkout";
+        private const string ConfirmCheckoutBranchMessage = "Checkout branch {0} from {1}?";
+        private const string ConfirmCheckoutBranchOK = "Checkout";
+        private const string ConfirmCheckoutBranchCancel = "Cancel";
+        private const string WarningCheckoutBranchExistsTitle = "Branch already exists";
+        private const string WarningCheckoutBranchExistsMessage = "Branch {0} already exists";
+        private const string WarningCheckoutBranchExistsOK = "Ok";
         private const string NewBranchCancelButton = "x";
         private const string NewBranchConfirmButton = "Create";
         private const string FavoritesSetting = "Favorites";
@@ -656,37 +663,62 @@ private void OnTreeNodeGUI(BranchTreeNode node)
 
                 if (Event.current.clickCount > 1 && mode == BranchesMode.Default)
                 {
-                    if (node.Type == NodeType.LocalBranch &&
-                        EditorUtility.DisplayDialog(ConfirmSwitchTitle, String.Format(ConfirmSwitchMessage, node.Name), ConfirmSwitchOK,
-                            ConfirmSwitchCancel))
+                    if (node.Type == NodeType.LocalBranch)
                     {
-                        GitClient.SwitchBranch(node.Name)
-                            .FinallyInUI((success, e) =>
-                            {
-                                if (success)
-                                    Refresh();
-                                else
+                        if (EditorUtility.DisplayDialog(ConfirmSwitchTitle, String.Format(ConfirmSwitchMessage, node.Name), ConfirmSwitchOK, ConfirmSwitchCancel))
+                        {
+                            GitClient.SwitchBranch(node.Name)
+                                .FinallyInUI((success, e) =>
                                 {
-                                    EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
-                                        String.Format(Localization.SwitchBranchFailedDescription, node.Name),
-                                    Localization.Ok);
-                                }
-                            }).Start();
+                                    if (success)
+                                    {
+                                        Refresh();
+                                    }
+                                    else
+                                    {
+                                        EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
+                                            String.Format(Localization.SwitchBranchFailedDescription, node.Name),
+                                            Localization.Ok);
+                                    }
+                                }).Start();
+                        }
                     }
                     else if (node.Type == NodeType.RemoteBranch)
                     {
-                        GitClient.CreateBranch(selectedNode.Name.Substring(selectedNode.Name.IndexOf('/') + 1), selectedNode.Name)
-                            .FinallyInUI((success, e) =>
+                        var indexOfFirstSlash = selectedNode.Name.IndexOf('/');
+                        var originName = selectedNode.Name.Substring(0, indexOfFirstSlash);
+                        var branchName = selectedNode.Name.Substring(indexOfFirstSlash + 1);
+
+                        if (Repository.LocalBranches.Any(localBranch => localBranch.Name == branchName))
+                        {
+                            EditorUtility.DisplayDialog(WarningCheckoutBranchExistsTitle, 
+                                String.Format(WarningCheckoutBranchExistsMessage, branchName),
+                                WarningCheckoutBranchExistsOK);
+                        }
+                        else
+                        {
+                            var confirmCheckout = EditorUtility.DisplayDialog(ConfirmCheckoutBranchTitle, 
+                                String.Format(ConfirmCheckoutBranchMessage, node.Name, originName), 
+                                ConfirmCheckoutBranchOK, ConfirmCheckoutBranchCancel);
+
+                            if (confirmCheckout)
                             {
-                                if (success)
-                                    Refresh();
-                                else
-                                {
-                                    EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
-                                        String.Format(Localization.SwitchBranchFailedDescription, node.Name),
-                                    Localization.Ok);
-                                }
-                            }).Start();
+                                GitClient.CreateBranch(branchName, selectedNode.Name)
+                                    .FinallyInUI((success, e) =>
+                                    {
+                                        if (success)
+                                        {
+                                            Refresh();
+                                        }
+                                        else
+                                        {
+                                            EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
+                                                String.Format(Localization.SwitchBranchFailedDescription, node.Name),
+                                                Localization.Ok);
+                                        }
+                                    }).Start();
+                            }
+                        }
                     }
                 }
             }