diff options
| author | Moritz Haase <Moritz.Haase@bmw.de> | 2022-03-30 08:48:29 +0200 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-30 20:13:43 +1100 |
| commit | 8fb2acc2244ae0364fa20288bfcf70deed3ae974 (patch) | |
| tree | 02c132565c7b87bf54f895fbc0d815efce867cd1 /pkg/gui/controllers/helpers/merge_and_rebase_helper.go | |
| parent | f2fb6453a13d7e609bb8456843e208e8e3e7901a (diff) | |
pkg/gui: Rename IPopupHandler::Ask() to Confirm()
Follow the JavaScript naming scheme for user interaction (alert, prompt,
confirm) as discussed in #1832.
Diffstat (limited to 'pkg/gui/controllers/helpers/merge_and_rebase_helper.go')
| -rw-r--r-- | pkg/gui/controllers/helpers/merge_and_rebase_helper.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go index 9b45ca1a9..4484e4fc8 100644 --- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go +++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go @@ -148,7 +148,7 @@ func (self *MergeAndRebaseHelper) CheckMergeOrRebase(result error) error { // assume in this case that we're already done return nil } else if isMergeConflictErr(result.Error()) { - return self.c.Ask(types.AskOpts{ + return self.c.Confirm(types.ConfirmOpts{ Title: self.c.Tr.FoundConflictsTitle, Prompt: self.c.Tr.FoundConflicts, HandlersManageFocus: true, @@ -171,7 +171,7 @@ func (self *MergeAndRebaseHelper) CheckMergeOrRebase(result error) error { func (self *MergeAndRebaseHelper) AbortMergeOrRebaseWithConfirm() error { // prompt user to confirm that they want to abort, then do it mode := self.workingTreeStateNoun() - return self.c.Ask(types.AskOpts{ + return self.c.Confirm(types.ConfirmOpts{ Title: fmt.Sprintf(self.c.Tr.AbortTitle, mode), Prompt: fmt.Sprintf(self.c.Tr.AbortPrompt, mode), HandleConfirm: func() error { @@ -196,7 +196,7 @@ func (self *MergeAndRebaseHelper) workingTreeStateNoun() string { func (self *MergeAndRebaseHelper) PromptToContinueRebase() error { self.takeOverMergeConflictScrolling() - return self.c.Ask(types.AskOpts{ + return self.c.Confirm(types.ConfirmOpts{ Title: "continue", Prompt: self.c.Tr.ConflictsResolved, HandleConfirm: func() error { @@ -218,7 +218,7 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error { }, ) - return self.c.Ask(types.AskOpts{ + return self.c.Confirm(types.ConfirmOpts{ Title: self.c.Tr.RebasingTitle, Prompt: prompt, HandleConfirm: func() error { @@ -245,7 +245,7 @@ func (self *MergeAndRebaseHelper) MergeRefIntoCheckedOutBranch(refName string) e }, ) - return self.c.Ask(types.AskOpts{ + return self.c.Confirm(types.ConfirmOpts{ Title: self.c.Tr.MergeConfirmTitle, Prompt: prompt, HandleConfirm: func() error { |