go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-17 00:18:05 +02:00
Code Issues Releases Activity

Show loader when rebasing (#2851)

Browse Source
This commit is contained in:
Jesse Duffield
2023-08-01 09:58:11 +10:00
committed by GitHub
parent 6984a4f4d4 c7e6a73512
commit b44d0c4bde
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/gui/controllers/helpers/merge_and_rebase_helper.go
View File

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/jesseduffield/gocui"
"github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/git_commands"
"github.com/jesseduffield/lazygit/pkg/commands/types/enums" "github.com/jesseduffield/lazygit/pkg/commands/types/enums"
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
@ -224,18 +225,20 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error {
Key: 's', Key: 's',
OnPress: func() error { OnPress: func() error {
self.c.LogAction(self.c.Tr.Actions.RebaseBranch) self.c.LogAction(self.c.Tr.Actions.RebaseBranch)
baseCommit := self.c.Modes().MarkedBaseCommit.GetSha() return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(task gocui.Task) error {
var err error baseCommit := self.c.Modes().MarkedBaseCommit.GetSha()
if baseCommit != "" { var err error
err = self.c.Git().Rebase.RebaseBranchFromBaseCommit(ref, baseCommit) if baseCommit != "" {
} else { err = self.c.Git().Rebase.RebaseBranchFromBaseCommit(ref, baseCommit)
err = self.c.Git().Rebase.RebaseBranch(ref) } else {
} err = self.c.Git().Rebase.RebaseBranch(ref)
err = self.CheckMergeOrRebase(err) }
if err == nil { err = self.CheckMergeOrRebase(err)
self.c.Modes().MarkedBaseCommit.Reset() if err == nil {
} self.c.Modes().MarkedBaseCommit.Reset()
return err }
return err
})
}, },
}, },
{ {