diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2021-03-21 15:58:15 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-03-30 21:57:00 +1100 |
commit | d5639e6e956c87b97e0c673ccc4d224bd12fbe68 (patch) | |
tree | d327d219d823059b284e9c223a170c620ba06c9b /pkg/commands/files.go | |
parent | 9e67f74ca32d4422df13bc1ffeb1e7d639c11639 (diff) |
refactor
Diffstat (limited to 'pkg/commands/files.go')
-rw-r--r-- | pkg/commands/files.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkg/commands/files.go b/pkg/commands/files.go index 82d3ae244..328853a79 100644 --- a/pkg/commands/files.go +++ b/pkg/commands/files.go @@ -9,6 +9,7 @@ import ( "github.com/go-errors/errors" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/gui/filetree" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/mgutz/str" ) @@ -137,12 +138,12 @@ func (c *GitCommand) DiscardAllFileChanges(file *models.File) error { return c.DiscardUnstagedFileChanges(file) } -func (c *GitCommand) DiscardAllDirChanges(node *models.FileChangeNode) error { +func (c *GitCommand) DiscardAllDirChanges(node *filetree.FileChangeNode) error { // this could be more efficient but we would need to handle all the edge cases return node.ForEachFile(c.DiscardAllFileChanges) } -func (c *GitCommand) DiscardUnstagedDirChanges(node *models.FileChangeNode) error { +func (c *GitCommand) DiscardUnstagedDirChanges(node *filetree.FileChangeNode) error { if err := c.RemoveUntrackedDirFiles(node); err != nil { return err } @@ -155,9 +156,9 @@ func (c *GitCommand) DiscardUnstagedDirChanges(node *models.FileChangeNode) erro return nil } -func (c *GitCommand) RemoveUntrackedDirFiles(node *models.FileChangeNode) error { +func (c *GitCommand) RemoveUntrackedDirFiles(node *filetree.FileChangeNode) error { untrackedFilePaths := node.GetPathsMatching( - func(n *models.FileChangeNode) bool { return n.File != nil && !n.File.GetIsTracked() }, + func(n *filetree.FileChangeNode) bool { return n.File != nil && !n.File.GetIsTracked() }, ) for _, path := range untrackedFilePaths { |