go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-25 12:24:47 +02:00
Code Issues Releases Activity

Add WithWaitingStatusSync for reverting commits

Browse Source
This commit is contained in:
Stefan Haller 2023-08-28 09:19:08 +02:00
parent 569adae6a2
commit e342860ef1
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/gui/controllers/local_commits_controller.go
View File

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

2
pkg/i18n/english.go
View File

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