sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00
Code Activity

checks for if we're in a normal working tree state

Browse Source
This commit is contained in:
Jesse Duffield
2019-11-05 11:53:01 +11:00
parent 1fc120de2d
commit 0ffccbd3ee
3 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/gui/patch_options_panel.go
View File

@ -54,7 +54,9 @@ func (gui *Gui) getPatchCommitIndex() int {
}
func (gui *Gui) handleDeletePatchFromCommit() error {
// TODO: deal with when we're already rebasing
if ok, err := gui.validateNormalWorkingTreeState(); !ok {
return err
}
return gui.WithWaitingStatus(gui.Tr.SLocalize("RebasingStatus"), func() error {
commitIndex := gui.getPatchCommitIndex()
@ -64,7 +66,9 @@ func (gui *Gui) handleDeletePatchFromCommit() error {
}
func (gui *Gui) handleMovePatchToSelectedCommit() error {
// TODO: deal with when we're already rebasing
if ok, err := gui.validateNormalWorkingTreeState(); !ok {
return err
}
return gui.WithWaitingStatus(gui.Tr.SLocalize("RebasingStatus"), func() error {
commitIndex := gui.getPatchCommitIndex()
@ -73,8 +77,17 @@ func (gui *Gui) handleMovePatchToSelectedCommit() error {
})
}
func (gui *Gui) validateNormalWorkingTreeState() (bool, error) {
if gui.State.WorkingTreeState != "normal" {
return false, gui.createErrorPanel(gui.g, gui.Tr.SLocalize("CantPatchWhileRebasingError"))
}
return true, nil
}
func (gui *Gui) handlePullPatchIntoWorkingTree() error {
// TODO: deal with when we're already rebasing
if ok, err := gui.validateNormalWorkingTreeState(); !ok {
return err
}
return gui.WithWaitingStatus(gui.Tr.SLocalize("RebasingStatus"), func() error {
commitIndex := gui.getPatchCommitIndex()