fixup! feat: add fork remote command

Inline addRemoteAndRefresh and selectRemoteAndCheckout into
addAndCheckoutRemote. It's not worth having them as separate helper functions
since they are only called from within addAndCheckoutRemote, and that function
is not overly long.

This fixes two issues:
- selectRemoteAndCheckout had an unused parameter remoteUrl
- the error return value from addRemoteAndRefresh was not checked

Author: stefanhaller

pkg/gui/controllers/remotes_controller.go

@@ -143,8 +143,8 @@ func (self *RemotesController) enter(remote *models.Remote) error {
 	return nil
 }
 
-// Adds a new remote and refreshes the list of remotes.
-func (self *RemotesController) addRemoteAndRefresh(remoteName string, remoteUrl string) error {
+// Adds a new remote, refreshes and selects it, then fetches and checks out the specified branch if provided.
+func (self *RemotesController) addAndCheckoutRemote(remoteName string, remoteUrl string, branchToCheckout string) error {
 	self.c.LogAction(self.c.Tr.Actions.AddRemote)
 	err := self.c.Git().Remote.AddRemote(remoteName, remoteUrl)
 	if err != nil {
@@ -158,11 +158,7 @@ func (self *RemotesController) addRemoteAndRefresh(remoteName string, remoteUrl
 		Scope: []types.RefreshableView{types.REMOTES},
 		Mode:  types.SYNC,
 	})
-	return nil
-}
 
-// Selects the given remote in the UI, fetches it, and checks out the specified branch if profided.
-func (self *RemotesController) selectRemoteAndCheckout(remoteName string, remoteUrl string, branchToCheckout string) error {
 	// Select the remote
 	for idx, remote := range self.c.Model().Remotes {
 		if remote.Name == remoteName {
@@ -175,13 +171,6 @@ func (self *RemotesController) selectRemoteAndCheckout(remoteName string, remote
 	return self.fetchAndCheckout(self.c.Contexts().Remotes.GetSelected(), branchToCheckout)
 }
 
-// Adds a new remote, refreshes and selects it, then fetches and checks out the specified branch if provided.
-func (self *RemotesController) addAndCheckoutRemote(remoteName string, remoteUrl string, branchToCheckout string) error {
-	self.addRemoteAndRefresh(remoteName, remoteUrl)
-
-	return self.selectRemoteAndCheckout(remoteName, remoteUrl, branchToCheckout)
-}
-
 // Ensures the fork remote exists (matching the given URL).
 // If it exists and matches, it’s selected and fetched; otherwise, it’s created and then fetched and checked out.
 // If it does exist but with a different URL, an error is returned.