From e342860ef17f5ae64287ea05750c6fd26ffdc9fb Mon Sep 17 00:00:00 2001
From: Stefan Haller <stefan@haller-berlin.de>
Date: Mon, 28 Aug 2023 09:19:08 +0200
Subject: [PATCH] Add WithWaitingStatusSync for reverting commits

---
 .../controllers/local_commits_controller.go   | 22 +++++++++++--------
 pkg/i18n/english.go                           |  2 ++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go
index 48af15eb9..efb06fe71 100644
--- a/pkg/gui/controllers/local_commits_controller.go
+++ b/pkg/gui/controllers/local_commits_controller.go
@@ -731,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()
+				})
 			},
 		})
 	}
@@ -754,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()
+				})
 			},
 		}
 	}
@@ -768,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},
 	})
 }
 
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index a70d08ee7..32392cee7 100644
--- a/pkg/i18n/english.go
+++ b/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)",