mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 12:55:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use a WithWaitingStatus for rewording a non-head commit

Browse source 
Rewording a commit at the beginning of a long branch can take very long;
without this change, the commit message panel would stay visible with a blinking
cursor during that time, which is very confusing.

This has the slight downside that it will say "Rebasing" in the lower right
corner until the operation is done; but we already have this problem when doing
custom patch operations, or dropping changes from a commit, so it's not new, and
we can think about how to fix all these another time.
This commit is contained in:
Stefan Haller 2025-02-28 13:08:44 +01:00
parent eda65cbade
commit c18d8af9f4
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkg/gui/controllers/local_commits_controller.go
View file

@ -415,11 +415,13 @@ func (self *LocalCommitsController) handleReword(summary string, description str
self.c.Tr.CommittingStatus, nil) self.c.Tr.CommittingStatus, nil)
} }
err := self.c.Git().Rebase.RewordCommit(self.c.Model().Commits, self.c.Contexts().LocalCommits.GetSelectedLineIdx(), summary, description) return self.c.WithWaitingStatus(self.c.Tr.RewordingStatus, func(gocui.Task) error {
if err != nil { err := self.c.Git().Rebase.RewordCommit(self.c.Model().Commits, self.c.Contexts().LocalCommits.GetSelectedLineIdx(), summary, description)
return err if err != nil {
} return err
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) }
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
})
} }
func (self *LocalCommitsController) doRewordEditor() error { func (self *LocalCommitsController) doRewordEditor() error {

2
pkg/i18n/english.go
View file

@ -384,6 +384,7 @@ type TranslationSet struct {
RedoingStatus string RedoingStatus string
CheckingOutStatus string CheckingOutStatus string
CommittingStatus string CommittingStatus string
RewordingStatus string
RevertingStatus string RevertingStatus string
CreatingFixupCommitStatus string CreatingFixupCommitStatus string
CommitFiles string CommitFiles string
@ -1425,6 +1426,7 @@ func EnglishTranslationSet() *TranslationSet {
RedoingStatus: "Redoing", RedoingStatus: "Redoing",
CheckingOutStatus: "Checking out", CheckingOutStatus: "Checking out",
CommittingStatus: "Committing", CommittingStatus: "Committing",
RewordingStatus: "Rewording",
RevertingStatus: "Reverting", RevertingStatus: "Reverting",
CreatingFixupCommitStatus: "Creating fixup commit", CreatingFixupCommitStatus: "Creating fixup commit",
CommitFiles: "Commit files", CommitFiles: "Commit files",