1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00

Remove calls to Error()

Now that we have an error handler set, we can simply let them bubble up all the
way to gocui.
This commit is contained in:
Stefan Haller
2024-04-11 21:57:13 +02:00
parent 325800a72e
commit 82a3d33ce3
35 changed files with 158 additions and 168 deletions

View File

@ -172,7 +172,7 @@ func (self *BasicCommitsController) copyCommitAttribute(commit *models.Commit) e
func (self *BasicCommitsController) copyCommitHashToClipboard(commit *models.Commit) error {
self.c.LogAction(self.c.Tr.Actions.CopyCommitHashToClipboard)
if err := self.c.OS().CopyToClipboard(commit.Hash); err != nil {
return self.c.Error(err)
return err
}
self.c.Toast(fmt.Sprintf("'%s' %s", commit.Hash, self.c.Tr.CopiedToClipboard))
@ -182,12 +182,12 @@ func (self *BasicCommitsController) copyCommitHashToClipboard(commit *models.Com
func (self *BasicCommitsController) copyCommitURLToClipboard(commit *models.Commit) error {
url, err := self.c.Helpers().Host.GetCommitURL(commit.Hash)
if err != nil {
return self.c.Error(err)
return err
}
self.c.LogAction(self.c.Tr.Actions.CopyCommitURLToClipboard)
if err := self.c.OS().CopyToClipboard(url); err != nil {
return self.c.Error(err)
return err
}
self.c.Toast(self.c.Tr.CommitURLCopiedToClipboard)
@ -197,12 +197,12 @@ func (self *BasicCommitsController) copyCommitURLToClipboard(commit *models.Comm
func (self *BasicCommitsController) copyCommitDiffToClipboard(commit *models.Commit) error {
diff, err := self.c.Git().Commit.GetCommitDiff(commit.Hash)
if err != nil {
return self.c.Error(err)
return err
}
self.c.LogAction(self.c.Tr.Actions.CopyCommitDiffToClipboard)
if err := self.c.OS().CopyToClipboard(diff); err != nil {
return self.c.Error(err)
return err
}
self.c.Toast(self.c.Tr.CommitDiffCopiedToClipboard)
@ -212,14 +212,14 @@ func (self *BasicCommitsController) copyCommitDiffToClipboard(commit *models.Com
func (self *BasicCommitsController) copyAuthorToClipboard(commit *models.Commit) error {
author, err := self.c.Git().Commit.GetCommitAuthor(commit.Hash)
if err != nil {
return self.c.Error(err)
return err
}
formattedAuthor := fmt.Sprintf("%s <%s>", author.Name, author.Email)
self.c.LogAction(self.c.Tr.Actions.CopyCommitAuthorToClipboard)
if err := self.c.OS().CopyToClipboard(formattedAuthor); err != nil {
return self.c.Error(err)
return err
}
self.c.Toast(self.c.Tr.CommitAuthorCopiedToClipboard)
@ -229,12 +229,12 @@ func (self *BasicCommitsController) copyAuthorToClipboard(commit *models.Commit)
func (self *BasicCommitsController) copyCommitMessageToClipboard(commit *models.Commit) error {
message, err := self.c.Git().Commit.GetCommitMessage(commit.Hash)
if err != nil {
return self.c.Error(err)
return err
}
self.c.LogAction(self.c.Tr.Actions.CopyCommitMessageToClipboard)
if err := self.c.OS().CopyToClipboard(message); err != nil {
return self.c.Error(err)
return err
}
self.c.Toast(self.c.Tr.CommitMessageCopiedToClipboard)
@ -244,12 +244,12 @@ func (self *BasicCommitsController) copyCommitMessageToClipboard(commit *models.
func (self *BasicCommitsController) copyCommitSubjectToClipboard(commit *models.Commit) error {
message, err := self.c.Git().Commit.GetCommitSubject(commit.Hash)
if err != nil {
return self.c.Error(err)
return err
}
self.c.LogAction(self.c.Tr.Actions.CopyCommitSubjectToClipboard)
if err := self.c.OS().CopyToClipboard(message); err != nil {
return self.c.Error(err)
return err
}
self.c.Toast(self.c.Tr.CommitSubjectCopiedToClipboard)
@ -259,12 +259,12 @@ func (self *BasicCommitsController) copyCommitSubjectToClipboard(commit *models.
func (self *BasicCommitsController) openInBrowser(commit *models.Commit) error {
url, err := self.c.Helpers().Host.GetCommitURL(commit.Hash)
if err != nil {
return self.c.Error(err)
return err
}
self.c.LogAction(self.c.Tr.Actions.OpenCommitInBrowser)
if err := self.c.OS().OpenLink(url); err != nil {
return self.c.Error(err)
return err
}
return nil