go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-10 22:42:00 +02:00
Code Issues Releases Activity

Changes as per review

Browse Source
This commit is contained in:
glendsoza
2022-01-24 19:00:26 +05:30
committed by Jesse Duffield
parent 0c6bdac2f7
commit 0caa391c4d
1 changed files with 20 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
pkg/gui/commits_panel.go
View File

@@ -466,26 +466,25 @@ func (gui *Gui) handleCommitRevert() error {
return err return err
} }
commit := gui.getSelectedLocalCommit() commit := gui.getSelectedLocalCommit()
return gui.ask(askOpts{ if commit.IsMerge() {
title: gui.Tr.Actions.RevertCommit, return gui.createRevertMergeCommitMenu(commit)
prompt: utils.ResolvePlaceholderString( } else {
gui.Tr.ConfirmRevertCommit, return gui.ask(askOpts{
map[string]string{ title: gui.Tr.Actions.RevertCommit,
"selectedCommit": commit.ShortSha(), prompt: utils.ResolvePlaceholderString(
}), gui.Tr.ConfirmRevertCommit,
handleConfirm: func() error { map[string]string{
"selectedCommit": commit.ShortSha(),
if commit.IsMerge() { }),
return gui.createRevertMergeCommitMenu(commit) handleConfirm: func() error {
} else {
gui.logAction(gui.Tr.Actions.RevertCommit) gui.logAction(gui.Tr.Actions.RevertCommit)
if err := gui.Git.Commit.Revert(commit.Sha); err != nil { if err := gui.Git.Commit.Revert(commit.Sha); err != nil {
return gui.surfaceError(err) return gui.surfaceError(err)
} }
return gui.afterRevertCommit() return gui.afterRevertCommit()
} },
}, })
}) }
} }
func (gui *Gui) createRevertMergeCommitMenu(commit *models.Commit) error { func (gui *Gui) createRevertMergeCommitMenu(commit *models.Commit) error {
@@ -496,30 +495,16 @@ func (gui *Gui) createRevertMergeCommitMenu(commit *models.Commit) error {
if err != nil { if err != nil {
return gui.surfaceError(err) return gui.surfaceError(err)
} }
parentShortSha := utils.SafeTruncate(parentSha, 8)
menuItems[i] = &menuItem{ menuItems[i] = &menuItem{
displayString: fmt.Sprintf("%s: %s", parentShortSha, message), displayString: fmt.Sprintf("%s: %s", utils.SafeTruncate(parentSha, 8), message),
onPress: func() error { onPress: func() error {
parentNumber := i + 1 parentNumber := i + 1
gui.logAction(gui.Tr.Actions.RevertCommit) gui.logAction(gui.Tr.Actions.RevertCommit)
gui.ask(askOpts{ if err := gui.Git.Commit.RevertMerge(commit.Sha, parentNumber); err != nil {
title: gui.Tr.SelectParentCommitForMerge, return gui.surfaceError(err)
prompt: utils.ResolvePlaceholderString( }
"Are you sure you want use {{.selectedParentCommit}} as parent commit?", return gui.afterRevertCommit()
map[string]string{
"selectedParentCommit": parentShortSha,
}),
handleConfirm: func() error {
if err := gui.Git.Commit.RevertMerge(commit.Sha, parentNumber); err != nil {
return gui.surfaceError(err)
}
return gui.afterRevertCommit()
},
handleClose: func() error {
return gui.pushContext(gui.State.Contexts.Menu)
},
})
return nil
}, },
} }
} }