Enable revive linter, and fix a bunch of warnings

I took the set of enabled checks from revive's recommended configuration [1],
and removed some that I didn't like. There might be other useful checks in
revive that we might want to enable, but this is a nice improvement already.

The bulk of the changes here are removing unnecessary else statements after
returns, but there are a few others too.

[1] https://github.com/mgechev/revive?tab=readme-ov-file#recommended-configuration

pkg/gui/controllers/bisect_controller.go

@@ -54,9 +54,8 @@ func (self *BisectController) openMenu(commit *models.Commit) error {
 	info := self.c.Git().Bisect.GetInfo()
 	if info.Started() {
 		return self.openMidBisectMenu(info, commit)
-	} else {
-		return self.openStartBisectMenu(info, commit)
 	}
+	return self.openStartBisectMenu(info, commit)
 }
 
 func (self *BisectController) openMidBisectMenu(info *git_commands.BisectInfo, commit *models.Commit) error {
@@ -280,11 +279,11 @@ func (self *BisectController) afterBisectMarkRefresh(selectCurrent bool, waitToR
 
 	if waitToReselect {
 		return self.c.Refresh(types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{}, Then: selectFn})
-	} else {
-		_ = selectFn()
-
-		return self.c.Helpers().Bisect.PostBisectCommandRefresh()
 	}
+
+	_ = selectFn()
+
+	return self.c.Helpers().Bisect.PostBisectCommandRefresh()
 }
 
 func (self *BisectController) selectCurrentBisectCommit() {

pkg/gui/controllers/branches_controller.go

@@ -657,15 +657,15 @@ func (self *BranchesController) fastForward(branch *models.Branch) error {
 			)
 			_ = self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
 			return err
-		} else {
-			self.c.LogAction(action)
-
-			err := self.c.Git().Sync.FastForward(
-				task, branch.Name, branch.UpstreamRemote, branch.UpstreamBranch,
-			)
-			_ = self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES}})
-			return err
 		}
+
+		self.c.LogAction(action)
+
+		err := self.c.Git().Sync.FastForward(
+			task, branch.Name, branch.UpstreamRemote, branch.UpstreamBranch,
+		)
+		_ = self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES}})
+		return err
 	})
 }
 

pkg/gui/controllers/custom_patch_options_menu_action.go

@@ -189,9 +189,9 @@ func (self *CustomPatchOptionsMenuAction) handleMovePatchIntoWorkingTree() error
 		})
 
 		return nil
-	} else {
-		return pull(false)
 	}
+
+	return pull(false)
 }
 
 func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error {

pkg/gui/controllers/files_controller.go

@@ -901,11 +901,10 @@ func (self *FilesController) setStatusFiltering(filter filetree.FileTreeDisplayF
 	// because the untracked files filter applies when running `git status`.
 	if previousFilter != filter && (previousFilter == filetree.DisplayUntracked || filter == filetree.DisplayUntracked) {
 		return self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}, Mode: types.ASYNC})
-	} else {
-		self.c.PostRefreshUpdate(self.context())
-
-		return nil
 	}
+
+	self.c.PostRefreshUpdate(self.context())
+	return nil
 }
 
 func (self *FilesController) edit(nodes []*filetree.FileNode) error {

pkg/gui/controllers/helpers/gpg_helper.go

@@ -37,9 +37,9 @@ func (self *GpgHelper) WithGpgHandling(cmdObj *oscommands.CmdObj, configKey git_
 		}
 
 		return err
-	} else {
-		return self.runAndStream(cmdObj, waitingStatus, onSuccess, refreshScope)
 	}
+
+	return self.runAndStream(cmdObj, waitingStatus, onSuccess, refreshScope)
 }
 
 func (self *GpgHelper) runAndStream(cmdObj *oscommands.CmdObj, waitingStatus string, onSuccess func() error, refreshScope []types.RefreshableView) error {

pkg/gui/controllers/helpers/merge_and_rebase_helper.go

@@ -162,9 +162,8 @@ func (self *MergeAndRebaseHelper) CheckMergeOrRebaseWithRefreshOptions(result er
 	} else if strings.Contains(result.Error(), "No rebase in progress?") {
 		// assume in this case that we're already done
 		return nil
-	} else {
-		return self.CheckForConflicts(result)
 	}
+	return self.CheckForConflicts(result)
 }
 
 func (self *MergeAndRebaseHelper) CheckMergeOrRebase(result error) error {

pkg/gui/controllers/helpers/refs_helper.go

@@ -56,9 +56,9 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions
 	withCheckoutStatus := func(f func(gocui.Task) error) error {
 		if found {
 			return self.c.WithInlineStatus(localBranch, types.ItemOperationCheckingOut, context.LOCAL_BRANCHES_CONTEXT_KEY, f)
-		} else {
-			return self.c.WithWaitingStatus(waitingStatus, f)
 		}
+
+		return self.c.WithWaitingStatus(waitingStatus, f)
 	}
 
 	return withCheckoutStatus(func(gocui.Task) error {

pkg/gui/controllers/helpers/window_arrangement_helper.go

@@ -385,9 +385,8 @@ func splitMainPanelSideBySide(args WindowArrangementArgs) bool {
 	default:
 		if args.Width < 200 && args.Height > 30 { // 2 80 character width panels + 40 width for side panel
 			return false
-		} else {
-			return true
 		}
+		return true
 	}
 }
 
@@ -431,11 +430,11 @@ func sidePanelChildren(args WindowArrangementArgs) func(width int, height int) [
 						Window: window,
 						Weight: 1,
 					}
-				} else {
-					return &boxlayout.Box{
-						Window: window,
-						Size:   0,
-					}
+				}
+
+				return &boxlayout.Box{
+					Window: window,
+					Size:   0,
 				}
 			}
 
@@ -469,33 +468,33 @@ func sidePanelChildren(args WindowArrangementArgs) func(width int, height int) [
 				accordionBox(&boxlayout.Box{Window: "commits", Weight: 1}),
 				accordionBox(getDefaultStashWindowBox(args)),
 			}
-		} else {
-			squashedHeight := 1
-			if height >= 21 {
-				squashedHeight = 3
-			}
+		}
 
-			squashedSidePanelBox := func(window string) *boxlayout.Box {
-				if window == args.CurrentSideWindow {
-					return &boxlayout.Box{
-						Window: window,
-						Weight: 1,
-					}
-				} else {
-					return &boxlayout.Box{
-						Window: window,
-						Size:   squashedHeight,
-					}
+		squashedHeight := 1
+		if height >= 21 {
+			squashedHeight = 3
+		}
+
+		squashedSidePanelBox := func(window string) *boxlayout.Box {
+			if window == args.CurrentSideWindow {
+				return &boxlayout.Box{
+					Window: window,
+					Weight: 1,
 				}
 			}
 
-			return []*boxlayout.Box{
-				squashedSidePanelBox("status"),
-				squashedSidePanelBox("files"),
-				squashedSidePanelBox("branches"),
-				squashedSidePanelBox("commits"),
-				squashedSidePanelBox("stash"),
+			return &boxlayout.Box{
+				Window: window,
+				Size:   squashedHeight,
 			}
 		}
+
+		return []*boxlayout.Box{
+			squashedSidePanelBox("status"),
+			squashedSidePanelBox("files"),
+			squashedSidePanelBox("branches"),
+			squashedSidePanelBox("commits"),
+			squashedSidePanelBox("stash"),
+		}
 	}
 }

pkg/gui/controllers/helpers/working_tree_helper.go

@@ -245,7 +245,7 @@ func (self *WorkingTreeHelper) commitPrefixConfigsForRepo() []config.CommitPrefi
 	cfg, ok := self.c.UserConfig().Git.CommitPrefixes[self.c.Git().RepoPaths.RepoName()]
 	if ok {
 		return append(cfg, self.c.UserConfig().Git.CommitPrefix...)
-	} else {
-		return self.c.UserConfig().Git.CommitPrefix
 	}
+
+	return self.c.UserConfig().Git.CommitPrefix
 }

pkg/gui/controllers/helpers/worktree_helper.go

@@ -132,24 +132,24 @@ func (self *WorktreeHelper) NewWorktreeCheckout(base string, canCheckoutBase boo
 					},
 				})
 
-				return nil
-			} else {
-				// prompt for the new branch name where a blank means we just check out the branch
-				self.c.Prompt(types.PromptOpts{
-					Title: self.c.Tr.NewBranchName,
-					HandleConfirm: func(branchName string) error {
-						if branchName == "" {
-							return errors.New(self.c.Tr.BranchNameCannotBeBlank)
-						}
-
-						opts.Branch = branchName
-
-						return f()
-					},
-				})
-
 				return nil
 			}
+
+			// prompt for the new branch name where a blank means we just check out the branch
+			self.c.Prompt(types.PromptOpts{
+				Title: self.c.Tr.NewBranchName,
+				HandleConfirm: func(branchName string) error {
+					if branchName == "" {
+						return errors.New(self.c.Tr.BranchNameCannotBeBlank)
+					}
+
+					opts.Branch = branchName
+
+					return f()
+				},
+			})
+
+			return nil
 		},
 	})
 

pkg/gui/controllers/sync_controller.go

@@ -92,27 +92,27 @@ func (self *SyncController) push(currentBranch *models.Branch) error {
 		opts := pushOpts{remoteBranchStoredLocally: currentBranch.RemoteBranchStoredLocally()}
 		if currentBranch.IsBehindForPush() {
 			return self.requestToForcePush(currentBranch, opts)
-		} else {
-			return self.pushAux(currentBranch, opts)
 		}
-	} else {
-		if self.c.Git().Config.GetPushToCurrent() {
-			return self.pushAux(currentBranch, pushOpts{setUpstream: true})
-		} else {
-			return self.c.Helpers().Upstream.PromptForUpstreamWithInitialContent(currentBranch, func(upstream string) error {
-				upstreamRemote, upstreamBranch, err := self.c.Helpers().Upstream.ParseUpstream(upstream)
-				if err != nil {
-					return err
-				}
 
-				return self.pushAux(currentBranch, pushOpts{
-					setUpstream:    true,
-					upstreamRemote: upstreamRemote,
-					upstreamBranch: upstreamBranch,
-				})
-			})
-		}
+		return self.pushAux(currentBranch, opts)
 	}
+
+	if self.c.Git().Config.GetPushToCurrent() {
+		return self.pushAux(currentBranch, pushOpts{setUpstream: true})
+	}
+
+	return self.c.Helpers().Upstream.PromptForUpstreamWithInitialContent(currentBranch, func(upstream string) error {
+		upstreamRemote, upstreamBranch, err := self.c.Helpers().Upstream.ParseUpstream(upstream)
+		if err != nil {
+			return err
+		}
+
+		return self.pushAux(currentBranch, pushOpts{
+			setUpstream:    true,
+			upstreamRemote: upstreamRemote,
+			upstreamBranch: upstreamBranch,
+		})
+	})
 }
 
 func (self *SyncController) pull(currentBranch *models.Branch) error {