diff options
Diffstat (limited to 'pkg/gui/controllers/branches_controller.go')
| -rw-r--r-- | pkg/gui/controllers/branches_controller.go | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go index ff9473ab6..0091f1c77 100644 --- a/pkg/gui/controllers/branches_controller.go +++ b/pkg/gui/controllers/branches_controller.go @@ -209,7 +209,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc LabelColumns: []string{self.c.Tr.UnsetUpstream}, OnPress: func() error { if err := self.c.Git().Branch.UnsetUpstream(selectedBranch.Name); err != nil { - return self.c.Error(err) + return err } if err := self.c.Refresh(types.RefreshOptions{ Mode: types.SYNC, @@ -218,7 +218,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc types.COMMITS, }, }); err != nil { - return self.c.Error(err) + return err } return nil }, @@ -231,11 +231,11 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc return self.c.Helpers().Upstream.PromptForUpstreamWithoutInitialContent(selectedBranch, func(upstream string) error { upstreamRemote, upstreamBranch, err := self.c.Helpers().Upstream.ParseUpstream(upstream) if err != nil { - return self.c.Error(err) + return err } if err := self.c.Git().Branch.SetUpstream(upstreamRemote, upstreamBranch, selectedBranch.Name); err != nil { - return self.c.Error(err) + return err } if err := self.c.Refresh(types.RefreshOptions{ Mode: types.SYNC, @@ -244,7 +244,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc types.COMMITS, }, }); err != nil { - return self.c.Error(err) + return err } return nil }) @@ -279,7 +279,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc OnPress: func() error { err := self.c.Helpers().Refs.CreateGitResetMenu(upstream) if err != nil { - return self.c.Error(err) + return err } return nil }, @@ -292,7 +292,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc OpensMenu: true, OnPress: func() error { if err := self.c.Helpers().MergeAndRebase.RebaseOntoRef(selectedBranch.ShortUpstreamRefName()); err != nil { - return self.c.Error(err) + return err } return nil }, @@ -395,16 +395,16 @@ func (self *BranchesController) copyPullRequestURL() error { branchExistsOnRemote := self.c.Git().Remote.CheckRemoteBranchExists(branch.Name) if !branchExistsOnRemote { - return self.c.Error(errors.New(self.c.Tr.NoBranchOnRemote)) + return errors.New(self.c.Tr.NoBranchOnRemote) } url, err := self.c.Helpers().Host.GetPullRequestURL(branch.Name, "") if err != nil { - return self.c.Error(err) + return err } self.c.LogAction(self.c.Tr.Actions.CopyPullRequestURL) if err := self.c.OS().CopyToClipboard(url); err != nil { - return self.c.Error(err) + return err } self.c.Toast(self.c.Tr.PullRequestURLCopiedToClipboard) @@ -423,7 +423,7 @@ func (self *BranchesController) forceCheckout() error { HandleConfirm: func() error { self.c.LogAction(self.c.Tr.Actions.ForceCheckoutBranch) if err := self.c.Git().Branch.Checkout(branch.Name, git_commands.CheckoutOptions{Force: true}); err != nil { - _ = self.c.Error(err) + return err } return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) }, @@ -463,7 +463,7 @@ func (self *BranchesController) createNewBranchWithName(newBranchName string) er } if err := self.c.Git().Branch.New(newBranchName, branch.FullRefName()); err != nil { - return self.c.Error(err) + return err } self.context().SetSelection(0) @@ -524,7 +524,7 @@ func (self *BranchesController) localDelete(branch *models.Branch) error { return self.forceDelete(branch) } if err != nil { - return self.c.Error(err) + return err } return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.BRANCHES}}) }) @@ -688,7 +688,7 @@ func (self *BranchesController) rename(branch *models.Branch) error { HandleConfirm: func(newBranchName string) error { self.c.LogAction(self.c.Tr.Actions.RenameBranch) if err := self.c.Git().Branch.Rename(branch.Name, helpers.SanitizedBranchName(newBranchName)); err != nil { - return self.c.Error(err) + return err } // need to find where the branch is now so that we can re-select it. That means we need to refetch the branches synchronously and then find our branch @@ -783,13 +783,13 @@ func (self *BranchesController) createPullRequestMenu(selectedBranch *models.Bra func (self *BranchesController) createPullRequest(from string, to string) error { url, err := self.c.Helpers().Host.GetPullRequestURL(from, to) if err != nil { - return self.c.Error(err) + return err } self.c.LogAction(self.c.Tr.Actions.OpenPullRequest) if err := self.c.OS().OpenLink(url); err != nil { - return self.c.Error(err) + return err } return nil |