diff options
Diffstat (limited to 'pkg/gui/controllers/helpers/working_tree_helper.go')
| -rw-r--r-- | pkg/gui/controllers/helpers/working_tree_helper.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkg/gui/controllers/helpers/working_tree_helper.go b/pkg/gui/controllers/helpers/working_tree_helper.go index 6f00c7479..edd7005e9 100644 --- a/pkg/gui/controllers/helpers/working_tree_helper.go +++ b/pkg/gui/controllers/helpers/working_tree_helper.go @@ -1,6 +1,7 @@ package helpers import ( + "errors" "fmt" "regexp" @@ -137,7 +138,7 @@ func (self *WorkingTreeHelper) HandleCommitEditorPress() error { func (self *WorkingTreeHelper) HandleWIPCommitPress() error { skipHookPrefix := self.c.UserConfig.Git.SkipHookPrefix if skipHookPrefix == "" { - return self.c.ErrorMsg(self.c.Tr.SkipHookPrefixNotConfigured) + return errors.New(self.c.Tr.SkipHookPrefixNotConfigured) } return self.HandleCommitPressWithMessage(skipHookPrefix) @@ -153,7 +154,7 @@ func (self *WorkingTreeHelper) HandleCommitPress() error { prefixReplace := commitPrefixConfig.Replace rgx, err := regexp.Compile(prefixPattern) if err != nil { - return self.c.ErrorMsg(fmt.Sprintf("%s: %s", self.c.Tr.CommitPrefixPatternError, err.Error())) + return fmt.Errorf("%s: %s", self.c.Tr.CommitPrefixPatternError, err.Error()) } prefix := rgx.ReplaceAllString(self.refHelper.GetCheckedOutRef().Name, prefixReplace) message = prefix @@ -165,11 +166,11 @@ 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 { - return self.c.ErrorMsg(self.c.Tr.NoFilesStagedTitle) + return errors.New(self.c.Tr.NoFilesStagedTitle) } if !self.AnyStagedFiles() { @@ -186,10 +187,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() |