Add WithWaitingStatusSync for reverting commits

jesseduffield · Aug 28, 2023 · a52ff8a · a52ff8a
1 parent 3fc5e15
commit a52ff8a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go
@@ -658,10 +658,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()
+				})
 			},
 		})
 	}
@@ -681,10 +683,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()
+				})
 			},
 		}
 	}
@@ -695,7 +699,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},
 	})
 }
 

diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
@@ -264,6 +264,7 @@ type TranslationSet struct {
 	RedoingStatus                       string
 	CheckingOutStatus                   string
 	CommittingStatus                    string
+	RevertingStatus                     string
 	CommitFiles                         string
 	SubCommitsDynamicTitle              string
 	CommitFilesDynamicTitle             string
@@ -1038,6 +1039,7 @@ func EnglishTranslationSet() TranslationSet {
 		RedoingStatus:                       "Redoing",
 		CheckingOutStatus:                   "Checking out",
 		CommittingStatus:                    "Committing",
+		RevertingStatus:                     "Reverting",
 		CommitFiles:                         "Commit files",
 		SubCommitsDynamicTitle:              "Commits (%s)",
 		CommitFilesDynamicTitle:             "Diff files (%s)",