go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-23 12:18:51 +02:00
Code Issues Releases Activity

safe reword

Browse Source
This commit is contained in:
Jesse Duffield 2022-03-23 23:37:15 +11:00
parent cc5d13c833
commit 12ecd665c8
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/gui/controllers/local_commits_controller.go
View File

@ -267,18 +267,24 @@ func (self *LocalCommitsController) rewordEditor(commit *models.Commit) error {
return nil
}
self.c.LogAction(self.c.Tr.Actions.RewordCommit)
subProcess, err := self.git.Rebase.RewordCommitInEditor(
self.model.Commits, self.context().GetSelectedLineIdx(),
)
if err != nil {
return self.c.Error(err)
}
if subProcess != nil {
return self.c.RunSubprocessAndRefresh(subProcess)
}
return self.c.Ask(types.AskOpts{
Title: self.c.Tr.RewordInEditorTitle,
Prompt: self.c.Tr.RewordInEditorPrompt,
HandleConfirm: func() error {
self.c.LogAction(self.c.Tr.Actions.RewordCommit)
subProcess, err := self.git.Rebase.RewordCommitInEditor(
self.model.Commits, self.context().GetSelectedLineIdx(),
)
if err != nil {
return self.c.Error(err)
}
if subProcess != nil {
return self.c.RunSubprocessAndRefresh(subProcess)
}
return nil
return nil
},
})
}
func (self *LocalCommitsController) drop(commit *models.Commit) error {

5
pkg/i18n/english.go
View File

@ -454,6 +454,8 @@ type TranslationSet struct {
LcOpenCommitInBrowser string
LcViewBisectOptions string
ConfirmRevertCommit string
RewordInEditorTitle string
RewordInEditorPrompt string
Actions Actions
Bisect Bisect
}
@ -1027,6 +1029,9 @@ func EnglishTranslationSet() TranslationSet {
LcOpenCommitInBrowser: "open commit in browser",
LcViewBisectOptions: "view bisect options",
ConfirmRevertCommit: "Are you sure you want to revert {{.selectedCommit}}?",
RewordInEditorTitle: "Reword in editor",
RewordInEditorPrompt: "Are you sure you want to reword this commit in your editor?",
Actions: Actions{
// TODO: combine this with the original keybinding descriptions (those are all in lowercase atm)
CheckoutCommit: "Checkout commit",