Remove calls to Error()

Now that we have an error handler set, we can simply let them bubble up all the
way to gocui.

pkg/gui/controllers/helpers/app_status_helper.go

@@ -63,7 +63,7 @@ func (self *AppStatusHelper) WithWaitingStatus(message string, f func(gocui.Task
 		self.statusMgr().WithWaitingStatus(message, self.renderAppStatus, func(waitingStatusHandle *status.WaitingStatusHandle) {
 			if err := f(appStatusHelperTask{task, waitingStatusHandle}); err != nil {
 				self.c.OnUIThread(func() error {
-					return self.c.Error(err)
+					return err
 				})
 			}
 		})

pkg/gui/controllers/helpers/bisect_helper.go

@@ -19,7 +19,7 @@ func (self *BisectHelper) Reset() error {
 		HandleConfirm: func() error {
 			self.c.LogAction(self.c.Tr.Actions.ResetBisect)
 			if err := self.c.Git().Bisect.Reset(); err != nil {
-				return self.c.Error(err)
+				return err
 			}
 
 			return self.PostBisectCommandRefresh()

pkg/gui/controllers/helpers/branches_helper.go

@@ -37,7 +37,7 @@ func (self *BranchesHelper) ConfirmDeleteRemote(remoteName string, branchName st
 			return self.c.WithWaitingStatus(self.c.Tr.DeletingStatus, func(task gocui.Task) error {
 				self.c.LogAction(self.c.Tr.Actions.DeleteRemoteBranch)
 				if err := self.c.Git().Remote.DeleteRemoteBranch(task, remoteName, branchName); err != nil {
-					return self.c.Error(err)
+					return err
 				}
 				return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES, types.REMOTES}})
 			})

pkg/gui/controllers/helpers/confirmation_helper.go

@@ -36,7 +36,7 @@ func (self *ConfirmationHelper) wrappedConfirmationFunction(cancel goContext.Can
 
 		if function != nil {
 			if err := function(); err != nil {
-				return self.c.Error(err)
+				return err
 			}
 		}
 

pkg/gui/controllers/helpers/files_helper.go

@@ -85,7 +85,7 @@ func (self *FilesHelper) OpenFile(filename string) error {
 	}
 	self.c.LogAction(self.c.Tr.Actions.OpenFile)
 	if err := self.c.OS().OpenFile(absPath); err != nil {
-		return self.c.Error(err)
+		return err
 	}
 	return nil
 }

pkg/gui/controllers/helpers/gpg_helper.go

@@ -45,10 +45,8 @@ func (self *GpgHelper) runAndStream(cmdObj oscommands.ICmdObj, waitingStatus str
 	return self.c.WithWaitingStatus(waitingStatus, func(gocui.Task) error {
 		if err := cmdObj.StreamOutput().Run(); err != nil {
 			_ = self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
-			return self.c.Error(
-				fmt.Errorf(
-					self.c.Tr.GitCommandFailed, self.c.UserConfig.Keybinding.Universal.ExtrasMenu,
-				),
+			return fmt.Errorf(
+				self.c.Tr.GitCommandFailed, self.c.UserConfig.Keybinding.Universal.ExtrasMenu,
 			)
 		}
 

pkg/gui/controllers/helpers/inline_status_helper.go

@@ -74,7 +74,7 @@ func (self *InlineStatusHelper) WithInlineStatus(opts InlineStatusOpts, f func(g
 			err := f(inlineStatusHelperTask{task, self, opts})
 			if err != nil {
 				self.c.OnUIThread(func() error {
-					return self.c.Error(err)
+					return err
 				})
 			}
 

pkg/gui/controllers/helpers/merge_conflicts_helper.go

@@ -129,7 +129,7 @@ func (self *MergeConflictsHelper) RefreshMergeState() error {
 
 	hasConflicts, err := self.SetConflictsAndRender(self.c.Contexts().MergeConflicts.GetState().GetPath())
 	if err != nil {
-		return self.c.Error(err)
+		return err
 	}
 
 	if !hasConflicts {

pkg/gui/controllers/helpers/refresh_helper.go

@@ -381,7 +381,7 @@ func (self *RefreshHelper) refreshCommitFilesContext() error {
 
 	files, err := self.c.Git().Loaders.CommitFileLoader.GetFilesInDiff(from, to, reverse)
 	if err != nil {
-		return self.c.Error(err)
+		return err
 	}
 	self.c.Model().CommitFiles = files
 	self.c.Contexts().CommitFiles.CommitFileTreeViewModel.SetTree()
@@ -406,7 +406,7 @@ func (self *RefreshHelper) refreshRebaseCommits() error {
 func (self *RefreshHelper) refreshTags() error {
 	tags, err := self.c.Git().Loaders.TagLoader.GetTags()
 	if err != nil {
-		return self.c.Error(err)
+		return err
 	}
 
 	self.c.Model().Tags = tags
@@ -543,7 +543,7 @@ func (self *RefreshHelper) refreshStateFiles() error {
 	if len(pathsToStage) > 0 {
 		self.c.LogAction(self.c.Tr.Actions.StageResolvedFiles)
 		if err := self.c.Git().WorkingTree.StageFiles(pathsToStage); err != nil {
-			return self.c.Error(err)
+			return err
 		}
 	}
 
@@ -603,7 +603,7 @@ func (self *RefreshHelper) refreshReflogCommits() error {
 		commits, onlyObtainedNewReflogCommits, err := self.c.Git().Loaders.ReflogCommitLoader.
 			GetReflogCommits(lastReflogCommit, filterPath, filterAuthor)
 		if err != nil {
-			return self.c.Error(err)
+			return err
 		}
 
 		if onlyObtainedNewReflogCommits {
@@ -634,7 +634,7 @@ func (self *RefreshHelper) refreshRemotes() error {
 
 	remotes, err := self.c.Git().Loaders.RemoteLoader.GetRemotes()
 	if err != nil {
-		return self.c.Error(err)
+		return err
 	}
 
 	self.c.Model().Remotes = remotes

pkg/gui/controllers/helpers/refs_helper.go

@@ -69,10 +69,10 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions
 					Prompt: self.c.Tr.AutoStashPrompt,
 					HandleConfirm: func() error {
 						if err := self.c.Git().Stash.Push(self.c.Tr.StashPrefix + ref); err != nil {
-							return self.c.Error(err)
+							return err
 						}
 						if err := self.c.Git().Branch.Checkout(ref, cmdOptions); err != nil {
-							return self.c.Error(err)
+							return err
 						}
 
 						onSuccess()
@@ -80,16 +80,14 @@ func (self *RefsHelper) CheckoutRef(ref string, options types.CheckoutRefOptions
 							if err := self.c.Refresh(refreshOptions); err != nil {
 								return err
 							}
-							return self.c.Error(err)
+							return err
 						}
 						return self.c.Refresh(refreshOptions)
 					},
 				})
 			}
 
-			if err := self.c.Error(err); err != nil {
-				return err
-			}
+			return err
 		}
 		onSuccess()
 
@@ -142,7 +140,7 @@ func (self *RefsHelper) CheckoutRemoteBranch(fullBranchName string, localBranchN
 					// "git checkout -b", but we want to benefit from all the
 					// nice features of the CheckoutRef function.
 					if err := self.c.Git().Branch.CreateWithUpstream(localBranchName, fullBranchName); err != nil {
-						return self.c.Error(err)
+						return err
 					}
 					// Do a sync refresh to make sure the new branch is visible,
 					// so that we see an inline status when checking it out
@@ -176,7 +174,7 @@ func (self *RefsHelper) GetCheckedOutRef() *models.Branch {
 
 func (self *RefsHelper) ResetToRef(ref string, strength string, envVars []string) error {
 	if err := self.c.Git().Commit.ResetToCommit(ref, strength, envVars); err != nil {
-		return self.c.Error(err)
+		return err
 	}
 
 	self.c.Contexts().LocalCommits.SetSelection(0)

pkg/gui/controllers/helpers/tags_helper.go

@@ -25,12 +25,12 @@ func (self *TagsHelper) OpenCreateTagPrompt(ref string, onCreate func()) error {
 			if description != "" {
 				self.c.LogAction(self.c.Tr.Actions.CreateAnnotatedTag)
 				if err := self.c.Git().Tag.CreateAnnotated(tagName, ref, description, force); err != nil {
-					return self.c.Error(err)
+					return err
 				}
 			} else {
 				self.c.LogAction(self.c.Tr.Actions.CreateLightweightTag)
 				if err := self.c.Git().Tag.CreateLightweight(tagName, ref, force); err != nil {
-					return self.c.Error(err)
+					return err
 				}
 			}
 

pkg/gui/controllers/helpers/update_helper.go

@@ -41,7 +41,7 @@ func (self *UpdateHelper) CheckForUpdateInForeground() error {
 	return self.c.WithWaitingStatus(self.c.Tr.CheckingForUpdates, func(gocui.Task) error {
 		self.updater.CheckForNewUpdate(func(newVersion string, err error) error {
 			if err != nil {
-				return self.c.Error(err)
+				return err
 			}
 			if newVersion == "" {
 				return self.c.ErrorMsg(self.c.Tr.FailedToRetrieveLatestVersionErr)

pkg/gui/controllers/helpers/working_tree_helper.go

@@ -165,7 +165,7 @@ func (self *WorkingTreeHelper) HandleCommitPress() error {
 
 func (self *WorkingTreeHelper) WithEnsureCommitableFiles(handler func() error) error {
 	if err := self.prepareFilesForCommit(); err != nil {
-		return self.c.Error(err)
+		return err
 	}
 
 	if len(self.c.Model().Files) == 0 {
@@ -186,10 +186,10 @@ func (self *WorkingTreeHelper) promptToStageAllAndRetry(retry func() error) erro
 		HandleConfirm: func() error {
 			self.c.LogAction(self.c.Tr.Actions.StageAllFiles)
 			if err := self.c.Git().WorkingTree.StageAll(); err != nil {
-				return self.c.Error(err)
+				return err
 			}
 			if err := self.syncRefresh(); err != nil {
-				return self.c.Error(err)
+				return err
 			}
 
 			return retry()

pkg/gui/controllers/helpers/worktree_helper.go

@@ -186,7 +186,7 @@ func (self *WorktreeHelper) Remove(worktree *models.Worktree, force bool) error
 				if err := self.c.Git().Worktree.Delete(worktree.Path, force); err != nil {
 					errMessage := err.Error()
 					if !strings.Contains(errMessage, "--force") {
-						return self.c.Error(err)
+						return err
 					}
 
 					if !force {
@@ -206,7 +206,7 @@ func (self *WorktreeHelper) Detach(worktree *models.Worktree) error {
 
 		err := self.c.Git().Worktree.Detach(worktree.Path)
 		if err != nil {
-			return self.c.Error(err)
+			return err
 		}
 		return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.WORKTREES, types.BRANCHES, types.FILES}})
 	})