fixup! When checking out a remote branch by name, ask the user how

Refactor to move the condition for checking out an existing local branch into
CheckoutRemoteBranch; we want to reuse it in the remote branches controller.

Also, switch to the branches view if it isn't showing already. Again, we'll need
that when using this in the remote branches view.

Author: stefanhaller

pkg/gui/controllers/branches_controller.go

@@ -437,9 +437,7 @@ func (self *BranchesController) checkoutByName() error {
 		HandleConfirm: func(response string) error {
 			self.c.LogAction("Checkout branch")
 			_, branchName, found := self.c.Helpers().Refs.ParseRemoteBranchName(response)
-			if found && !lo.ContainsBy(self.c.Model().Branches, func(branch *models.Branch) bool {
-				return branch.Name == branchName
-			}) {
+			if found {
 				return self.c.Helpers().Refs.CheckoutRemoteBranch(response, branchName)
 			}
 			return self.c.Helpers().Refs.CheckoutRef(response, types.CheckoutRefOptions{

pkg/gui/controllers/helpers/refs_helper.go

@@ -98,6 +98,25 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions
 
 // Shows a prompt to choose between creating a new branch or checking out a detached head
 func (self *RefsHelper) CheckoutRemoteBranch(fullBranchName string, localBranchName string) error {
+	checkout := func(branchName string) error {
+		if err := self.CheckoutRef(branchName, types.CheckoutRefOptions{}); err != nil {
+			return err
+		}
+		if self.c.CurrentContext() != self.c.Contexts().Branches {
+			return self.c.PushContext(self.c.Contexts().Branches)
+		}
+		return nil
+	}
+
+	// If a branch with this name already exists locally, just check it out. We
+	// don't bother checking whether it actually tracks this remote branch, since
+	// it's very unlikely that it doesn't.
+	if lo.ContainsBy(self.c.Model().Branches, func(branch *models.Branch) bool {
+		return branch.Name == localBranchName
+	}) {
+		return checkout(localBranchName)
+	}
+
 	return self.c.Menu(types.CreateMenuOptions{
 		Title: self.c.Tr.RemoteBranchCheckoutType,
 		Items: []*types.MenuItem{
@@ -111,13 +130,13 @@ func (self *RefsHelper) CheckoutRemoteBranch(fullBranchName string, localBranchN
 					if err := self.c.Git().Branch.CreateWithUpstream(localBranchName, fullBranchName); err != nil {
 						return self.c.Error(err)
 					}
-					return self.CheckoutRef(localBranchName, types.CheckoutRefOptions{})
+					return checkout(localBranchName)
 				},
 			},
 			{
 				Label: self.c.Tr.CheckoutTypeDetachedHead,
 				OnPress: func() error {
-					return self.CheckoutRef(fullBranchName, types.CheckoutRefOptions{})
+					return checkout(fullBranchName)
 				},
 			},
 		},