Make move up/down blocking

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/integrii/flaggy v1.4.0
 	github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68
 	github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d
-	github.com/jesseduffield/gocui v0.3.1-0.20230925062444-7cd0d7e2a70a
+	github.com/jesseduffield/gocui v0.3.1-0.20231209142059-968d8b62e1ef
 	github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10
 	github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
 	github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e
@@ -74,8 +74,8 @@ require (
 	github.com/xanzy/ssh-agent v0.2.1 // indirect
 	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
 	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )

go.sum

@@ -185,8 +185,8 @@ github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 h1:EQP2Tv8T
 github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68/go.mod h1:+LLj9/WUPAP8LqCchs7P+7X0R98HiFujVFANdNaxhGk=
 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d h1:bO+OmbreIv91rCe8NmscRwhFSqkDJtzWCPV4Y+SQuXE=
 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d/go.mod h1:nGNEErzf+NRznT+N2SWqmHnDnF9aLgANB1CUNEan09o=
-github.com/jesseduffield/gocui v0.3.1-0.20230925062444-7cd0d7e2a70a h1:/Ifbvq4BWY5VKoyPnHIW5oRLiy00S3ebFtVIY2MlJm0=
-github.com/jesseduffield/gocui v0.3.1-0.20230925062444-7cd0d7e2a70a/go.mod h1:trXE7RRGL2hTsv+Ntk+SHLtRobg9JE138n3Ug/X2Cf4=
+github.com/jesseduffield/gocui v0.3.1-0.20231209142059-968d8b62e1ef h1:pMi1UJqTE1j4NRxAeQ835qv+tj364zCocQ+/r9ZLrM0=
+github.com/jesseduffield/gocui v0.3.1-0.20231209142059-968d8b62e1ef/go.mod h1:trXE7RRGL2hTsv+Ntk+SHLtRobg9JE138n3Ug/X2Cf4=
 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 h1:jmpr7KpX2+2GRiE91zTgfq49QvgiqB0nbmlwZ8UnOx0=
 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10/go.mod h1:aA97kHeNA+sj2Hbki0pvLslmE4CbDyhBeSSTUUnOuVo=
 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY=
@@ -468,13 +468,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -484,8 +484,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

pkg/gui/controllers.go

@@ -77,6 +77,7 @@ func (gui *Gui) resetHelpersAndControllers() {
 	appStatusHelper := helpers.NewAppStatusHelper(
 		helperCommon,
 		func() *status.StatusManager { return gui.statusManager },
+		modeHelper,
 	)
 
 	setSubCommits := func(commits []*models.Commit) {

pkg/gui/controllers/helpers/app_status_helper.go

@@ -11,13 +11,15 @@ import (
 type AppStatusHelper struct {
 	c *HelperCommon
 
-	statusMgr func() *status.StatusManager
+	statusMgr  func() *status.StatusManager
+	modeHelper *ModeHelper
 }
 
-func NewAppStatusHelper(c *HelperCommon, statusMgr func() *status.StatusManager) *AppStatusHelper {
+func NewAppStatusHelper(c *HelperCommon, statusMgr func() *status.StatusManager, modeHelper *ModeHelper) *AppStatusHelper {
 	return &AppStatusHelper{
-		c:         c,
-		statusMgr: statusMgr,
+		c:          c,
+		statusMgr:  statusMgr,
+		modeHelper: modeHelper,
 	}
 }
 
@@ -68,6 +70,18 @@ func (self *AppStatusHelper) WithWaitingStatus(message string, f func(gocui.Task
 	})
 }
 
+func (self *AppStatusHelper) WithWaitingStatusSync(message string, f func() error) {
+	self.statusMgr().WithWaitingStatus(message, func() {}, func(*status.WaitingStatusHandle) {
+		stop := make(chan struct{})
+		defer func() { close(stop) }()
+		self.renderAppStatusSync(stop)
+
+		if err := f(); err != nil {
+			_ = self.c.Error(err)
+		}
+	})
+}
+
 func (self *AppStatusHelper) HasStatus() bool {
 	return self.statusMgr().HasStatus()
 }
@@ -93,3 +107,37 @@ func (self *AppStatusHelper) renderAppStatus() {
 		}
 	})
 }
+
+func (self *AppStatusHelper) renderAppStatusSync(stop chan struct{}) {
+	go func() {
+		ticker := time.NewTicker(time.Millisecond * 50)
+		defer ticker.Stop()
+
+		// Forcing a re-layout and redraw after we added the waiting status;
+		// this is needed in case the gui.showBottomLine config is set to false,
+		// to make sure the bottom line appears. It's also useful for redrawing
+		// once after each of several consecutive keypresses, e.g. pressing
+		// ctrl-j to move a commit down several steps.
+		_ = self.c.GocuiGui().ForceLayoutAndRedraw()
+
+		self.modeHelper.SetSuppressRebasingMode(true)
+		defer func() { self.modeHelper.SetSuppressRebasingMode(false) }()
+
+	outer:
+		for {
+			select {
+			case <-ticker.C:
+				appStatus := self.statusMgr().GetStatusString()
+				self.c.SetViewContent(self.c.Views().AppStatus, appStatus)
+				// Redraw all views of the bottom line:
+				bottomLineViews := []*gocui.View{
+					self.c.Views().AppStatus, self.c.Views().Options, self.c.Views().Information,
+					self.c.Views().StatusSpacer1, self.c.Views().StatusSpacer2,
+				}
+				_ = self.c.GocuiGui().ForceRedrawViews(bottomLineViews...)
+			case <-stop:
+				break outer
+			}
+		}
+	}()
+}

pkg/gui/controllers/helpers/mode_helper.go

@@ -19,6 +19,7 @@ type ModeHelper struct {
 	cherryPickHelper     *CherryPickHelper
 	mergeAndRebaseHelper *MergeAndRebaseHelper
 	bisectHelper         *BisectHelper
+	suppressRebasingMode bool
 }
 
 func NewModeHelper(
@@ -114,7 +115,7 @@ func (self *ModeHelper) Statuses() []ModeStatus {
 		},
 		{
 			IsActive: func() bool {
-				return self.c.Git().Status.WorkingTreeState() != enums.REBASE_MODE_NONE
+				return !self.suppressRebasingMode && self.c.Git().Status.WorkingTreeState() != enums.REBASE_MODE_NONE
 			},
 			Description: func() string {
 				workingTreeState := self.c.Git().Status.WorkingTreeState()
@@ -168,3 +169,7 @@ func (self *ModeHelper) ClearFiltering() error {
 
 	return self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.COMMITS}})
 }
+
+func (self *ModeHelper) SetSuppressRebasingMode(value bool) {
+	self.suppressRebasingMode = value
+}

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})
 	})
 }
 
@@ -729,10 +731,12 @@ func (self *LocalCommitsController) revert(commit *models.Commit) error {
 				}),
 			HandleConfirm: func() error {
 				self.c.LogAction(self.c.Tr.Actions.RevertCommit)
-				if err := self.c.Git().Commit.Revert(commit.Sha); err != nil {
-					return self.c.Error(err)
-				}
-				return self.afterRevertCommit()
+				return self.c.WithWaitingStatusSync(self.c.Tr.RevertingStatus, func() error {
+					if err := self.c.Git().Commit.Revert(commit.Sha); err != nil {
+						return err
+					}
+					return self.afterRevertCommit()
+				})
 			},
 		})
 	}
@@ -752,10 +756,12 @@ func (self *LocalCommitsController) createRevertMergeCommitMenu(commit *models.C
 			OnPress: func() error {
 				parentNumber := i + 1
 				self.c.LogAction(self.c.Tr.Actions.RevertCommit)
-				if err := self.c.Git().Commit.RevertMerge(commit.Sha, parentNumber); err != nil {
-					return self.c.Error(err)
-				}
-				return self.afterRevertCommit()
+				return self.c.WithWaitingStatusSync(self.c.Tr.RevertingStatus, func() error {
+					if err := self.c.Git().Commit.RevertMerge(commit.Sha, parentNumber); err != nil {
+						return err
+					}
+					return self.afterRevertCommit()
+				})
 			},
 		}
 	}
@@ -766,7 +772,7 @@ func (self *LocalCommitsController) createRevertMergeCommitMenu(commit *models.C
 func (self *LocalCommitsController) afterRevertCommit() error {
 	self.context().MoveSelectedLine(1)
 	return self.c.Refresh(types.RefreshOptions{
-		Mode: types.BLOCK_UI, Scope: []types.RefreshableView{types.COMMITS, types.BRANCHES},
+		Mode: types.SYNC, Scope: []types.RefreshableView{types.COMMITS, types.BRANCHES},
 	})
 }
 

pkg/gui/gui.go

@@ -513,6 +513,9 @@ func NewGui(
 		func() types.Context { return gui.State.ContextMgr.Current() },
 		gui.createMenu,
 		func(message string, f func(gocui.Task) error) { gui.helpers.AppStatus.WithWaitingStatus(message, f) },
+		func(message string, f func() error) {
+			gui.helpers.AppStatus.WithWaitingStatusSync(message, f)
+		},
 		func(message string) { gui.helpers.AppStatus.Toast(message) },
 		func() string { return gui.Views.Confirmation.TextArea.GetContent() },
 		func() bool { return gui.c.InDemo() },

pkg/gui/popup/popup_handler.go

@@ -15,15 +15,16 @@ type PopupHandler struct {
 	*common.Common
 	index int
 	deadlock.Mutex
-	createPopupPanelFn  func(context.Context, types.CreatePopupPanelOpts) error
-	onErrorFn           func() error
-	popContextFn        func() error
-	currentContextFn    func() types.Context
-	createMenuFn        func(types.CreateMenuOptions) error
-	withWaitingStatusFn func(message string, f func(gocui.Task) error)
-	toastFn             func(message string)
-	getPromptInputFn    func() string
-	inDemo              func() bool
+	createPopupPanelFn      func(context.Context, types.CreatePopupPanelOpts) error
+	onErrorFn               func() error
+	popContextFn            func() error
+	currentContextFn        func() types.Context
+	createMenuFn            func(types.CreateMenuOptions) error
+	withWaitingStatusFn     func(message string, f func(gocui.Task) error)
+	withWaitingStatusSyncFn func(message string, f func() error)
+	toastFn                 func(message string)
+	getPromptInputFn        func() string
+	inDemo                  func() bool
 }
 
 var _ types.IPopupHandler = &PopupHandler{}
@@ -36,22 +37,24 @@ func NewPopupHandler(
 	currentContextFn func() types.Context,
 	createMenuFn func(types.CreateMenuOptions) error,
 	withWaitingStatusFn func(message string, f func(gocui.Task) error),
+	withWaitingStatusSyncFn func(message string, f func() error),
 	toastFn func(message string),
 	getPromptInputFn func() string,
 	inDemo func() bool,
 ) *PopupHandler {
 	return &PopupHandler{
-		Common:              common,
-		index:               0,
-		createPopupPanelFn:  createPopupPanelFn,
-		onErrorFn:           onErrorFn,
-		popContextFn:        popContextFn,
-		currentContextFn:    currentContextFn,
-		createMenuFn:        createMenuFn,
-		withWaitingStatusFn: withWaitingStatusFn,
-		toastFn:             toastFn,
-		getPromptInputFn:    getPromptInputFn,
-		inDemo:              inDemo,
+		Common:                  common,
+		index:                   0,
+		createPopupPanelFn:      createPopupPanelFn,
+		onErrorFn:               onErrorFn,
+		popContextFn:            popContextFn,
+		currentContextFn:        currentContextFn,
+		createMenuFn:            createMenuFn,
+		withWaitingStatusFn:     withWaitingStatusFn,
+		withWaitingStatusSyncFn: withWaitingStatusSyncFn,
+		toastFn:                 toastFn,
+		getPromptInputFn:        getPromptInputFn,
+		inDemo:                  inDemo,
 	}
 }
 
@@ -68,6 +71,11 @@ func (self *PopupHandler) WithWaitingStatus(message string, f func(gocui.Task) e
 	return nil
 }
 
+func (self *PopupHandler) WithWaitingStatusSync(message string, f func() error) error {
+	self.withWaitingStatusSyncFn(message, f)
+	return nil
+}
+
 func (self *PopupHandler) Error(err error) error {
 	if err == gocui.ErrQuit {
 		return err

pkg/gui/types/common.go

@@ -141,6 +141,7 @@ type IPopupHandler interface {
 	// Shows a popup prompting the user for input.
 	Prompt(opts PromptOpts) error
 	WithWaitingStatus(message string, f func(gocui.Task) error) error
+	WithWaitingStatusSync(message string, f func() error) error
 	Menu(opts CreateMenuOptions) error
 	Toast(message string)
 	GetPromptInput() string

pkg/i18n/english.go

@@ -281,6 +281,7 @@ type TranslationSet struct {
 	RedoingStatus                       string
 	CheckingOutStatus                   string
 	CommittingStatus                    string
+	RevertingStatus                     string
 	CommitFiles                         string
 	SubCommitsDynamicTitle              string
 	CommitFilesDynamicTitle             string
@@ -1093,6 +1094,7 @@ func EnglishTranslationSet() TranslationSet {
 		RedoingStatus:                       "Redoing",
 		CheckingOutStatus:                   "Checking out",
 		CommittingStatus:                    "Committing",
+		RevertingStatus:                     "Reverting",
 		CommitFiles:                         "Commit files",
 		SubCommitsDynamicTitle:              "Commits (%s)",
 		CommitFilesDynamicTitle:             "Diff files (%s)",