go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-29 23:17:32 +02:00
Code Issues Releases Activity

Refresh work trees when discarding file changes

Browse Source 
We do this because we may be deleting a worktree folder so we'll need to show that in the worktrees view
This commit is contained in:
Jesse Duffield 2023-07-16 20:34:22 +10:00
parent 9c69a5df69
commit 71422a8549
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/controllers/files_remove_controller.go
View File

@ -51,7 +51,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error {
if err := self.c.Git().WorkingTree.DiscardAllDirChanges(node); err != nil { if err := self.c.Git().WorkingTree.DiscardAllDirChanges(node); err != nil {
return self.c.Error(err) return self.c.Error(err)
} }
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}) return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}})
}, },
Key: 'x', Key: 'x',
Tooltip: utils.ResolvePlaceholderString( Tooltip: utils.ResolvePlaceholderString(
@ -72,7 +72,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error {
return self.c.Error(err) return self.c.Error(err)
} }
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}) return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}})
}, },
Key: 'u', Key: 'u',
Tooltip: utils.ResolvePlaceholderString( Tooltip: utils.ResolvePlaceholderString(
@ -107,7 +107,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error {
if err := self.c.Git().WorkingTree.DiscardAllFileChanges(file); err != nil { if err := self.c.Git().WorkingTree.DiscardAllFileChanges(file); err != nil {
return self.c.Error(err) return self.c.Error(err)
} }
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}) return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}})
}, },
Key: 'x', Key: 'x',
Tooltip: utils.ResolvePlaceholderString( Tooltip: utils.ResolvePlaceholderString(
@ -128,7 +128,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error {
return self.c.Error(err) return self.c.Error(err)
} }
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}) return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}})
}, },
Key: 'u', Key: 'u',
Tooltip: utils.ResolvePlaceholderString( Tooltip: utils.ResolvePlaceholderString(