diff options
author | Stefan Haller <stefan@haller-berlin.de> | 2023-10-08 17:18:37 +0200 |
---|---|---|
committer | Stefan Haller <stefan@haller-berlin.de> | 2023-10-08 18:30:34 +0200 |
commit | cc9a20c4abc850e94352cf04f7484bf0ba381780 (patch) | |
tree | 2986fc968413387bf8736d3935827fee72be6b5f | |
parent | c39fafe6ec6fb64d1510adef8980e93aebb334d5 (diff) |
Don't report errors from within a WithWaitingStatus
We can just return our error to WithWaitingStatus, it will take care of
reporting it.
-rw-r--r-- | pkg/gui/controllers/branches_controller.go | 13 | ||||
-rw-r--r-- | pkg/gui/controllers/tags_controller.go | 15 |
2 files changed, 8 insertions, 20 deletions
diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go index 45f950457..4f8ebdbf8 100644 --- a/pkg/gui/controllers/branches_controller.go +++ b/pkg/gui/controllers/branches_controller.go @@ -590,24 +590,17 @@ func (self *BranchesController) fastForward(branch *models.Branch) error { WorktreeGitDir: worktreeGitDir, }, ) - if err != nil { - _ = self.c.Error(err) - } - - return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) + _ = 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, ) - if err != nil { - _ = self.c.Error(err) - } _ = self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES}}) + return err } - - return nil }) } diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go index 91d590c32..2fa24f734 100644 --- a/pkg/gui/controllers/tags_controller.go +++ b/pkg/gui/controllers/tags_controller.go @@ -92,10 +92,9 @@ func (self *TagsController) checkout(tag *models.Tag) error { func (self *TagsController) localDelete(tag *models.Tag) error { return self.c.WithWaitingStatus(self.c.Tr.DeletingStatus, func(gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.DeleteLocalTag) - if err := self.c.Git().Tag.LocalDelete(tag.Name); err != nil { - return self.c.Error(err) - } - return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.COMMITS, types.TAGS}}) + err := self.c.Git().Tag.LocalDelete(tag.Name) + _ = self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.COMMITS, types.TAGS}}) + return err }) } @@ -133,7 +132,7 @@ func (self *TagsController) remoteDelete(tag *models.Tag) error { return self.c.WithWaitingStatus(self.c.Tr.DeletingStatus, func(t gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.DeleteRemoteTag) if err := self.c.Git().Remote.DeleteRemoteTag(t, upstream, tag.Name); err != nil { - return self.c.Error(err) + return err } self.c.Toast(self.c.Tr.RemoteTagDeletedMessage) return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.COMMITS, types.TAGS}}) @@ -192,11 +191,7 @@ func (self *TagsController) push(tag *models.Tag) error { return self.c.WithWaitingStatus(self.c.Tr.PushingTagStatus, func(task gocui.Task) error { self.c.LogAction(self.c.Tr.Actions.PushTag) err := self.c.Git().Tag.Push(task, response, tag.Name) - if err != nil { - _ = self.c.Error(err) - } - - return nil + return err }) }, }) |