From 569adae6a2f6553114a95289f3fd4fd44f50c3e2 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 27 Aug 2023 16:50:24 +0200 Subject: [PATCH] Use WithWaitingStatusSync for move commit up/down --- pkg/gui/controllers/local_commits_controller.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index 2c4794195..48af15eb9 100644 --- a/pkg/gui/controllers/local_commits_controller.go +++ b/pkg/gui/controllers/local_commits_controller.go @@ -548,13 +548,14 @@ func (self *LocalCommitsController) moveDown(commit *models.Commit) error { return self.c.ErrorMsg(self.c.Tr.AlreadyRebasing) } - return self.c.WithWaitingStatus(self.c.Tr.MovingStatus, func(gocui.Task) error { + return self.c.WithWaitingStatusSync(self.c.Tr.MovingStatus, func() error { self.c.LogAction(self.c.Tr.Actions.MoveCommitDown) err := self.c.Git().Rebase.MoveCommitDown(self.c.Model().Commits, index) if err == nil { self.context().MoveSelectedLine(1) } - return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err) + return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions( + err, types.RefreshOptions{Mode: types.SYNC}) }) } @@ -589,13 +590,14 @@ func (self *LocalCommitsController) moveUp(commit *models.Commit) error { return self.c.ErrorMsg(self.c.Tr.AlreadyRebasing) } - return self.c.WithWaitingStatus(self.c.Tr.MovingStatus, func(gocui.Task) error { + return self.c.WithWaitingStatusSync(self.c.Tr.MovingStatus, func() error { self.c.LogAction(self.c.Tr.Actions.MoveCommitUp) err := self.c.Git().Rebase.MoveCommitUp(self.c.Model().Commits, index) if err == nil { self.context().MoveSelectedLine(-1) } - return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err) + return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions( + err, types.RefreshOptions{Mode: types.SYNC}) }) }