sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

Better prompt for discarding old file changes

Browse Source 
Lazygit knows what kind of file change this is, so there doesn't have to be any
"if" in the prompt text.
This commit is contained in:
Stefan Haller
2023-03-12 16:45:46 +01:00
parent 1f801b91e4
commit 5c55ce6555
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/gui/controllers/commits_files_controller.go
View File

@ -161,9 +161,16 @@ func (self *CommitFilesController) discard(node *filetree.CommitFileNode) error
return err
}
prompt := self.c.Tr.DiscardFileChangesPrompt
if node.File.Added() {
prompt = self.c.Tr.DiscardAddedFileChangesPrompt
} else if node.File.Deleted() {
prompt = self.c.Tr.DiscardDeletedFileChangesPrompt
}
return self.c.Confirm(types.ConfirmOpts{
Title: self.c.Tr.DiscardFileChangesTitle,
Prompt: self.c.Tr.DiscardFileChangesPrompt,
Prompt: prompt,
HandleConfirm: func() error {
return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func() error {
self.c.LogAction(self.c.Tr.Actions.DiscardOldFileChange)