diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2023-08-01 09:58:11 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-01 09:58:11 +1000 |
commit | b44d0c4bde35b781be89f608fff6a56c0af2994b (patch) | |
tree | 0fb1b1e08efe5f709e1037cf486b35b10c6af73b | |
parent | 6984a4f4d41d003a3443abe357d75caf2af6b34c (diff) | |
parent | c7e6a73512755cc7e69c442f2def2c8e366cf864 (diff) |
Show loader when rebasing (#2851)
-rw-r--r-- | pkg/gui/controllers/helpers/merge_and_rebase_helper.go | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go index 03c3abb4b..db3ffa9ae 100644 --- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go +++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go @@ -4,6 +4,7 @@ import ( "fmt" "strings" + "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/types/enums" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -224,18 +225,20 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error { Key: 's', OnPress: func() error { self.c.LogAction(self.c.Tr.Actions.RebaseBranch) - baseCommit := self.c.Modes().MarkedBaseCommit.GetSha() - var err error - if baseCommit != "" { - err = self.c.Git().Rebase.RebaseBranchFromBaseCommit(ref, baseCommit) - } else { - err = self.c.Git().Rebase.RebaseBranch(ref) - } - err = self.CheckMergeOrRebase(err) - if err == nil { - self.c.Modes().MarkedBaseCommit.Reset() - } - return err + return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(task gocui.Task) error { + baseCommit := self.c.Modes().MarkedBaseCommit.GetSha() + var err error + if baseCommit != "" { + err = self.c.Git().Rebase.RebaseBranchFromBaseCommit(ref, baseCommit) + } else { + err = self.c.Git().Rebase.RebaseBranch(ref) + } + err = self.CheckMergeOrRebase(err) + if err == nil { + self.c.Modes().MarkedBaseCommit.Reset() + } + return err + }) }, }, { |