summaryrefslogtreecommitdiffstats
path: root/pkg/commands/files.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-03-21 10:23:14 +1100
committerJesse Duffield <jessedduffield@gmail.com>2021-03-30 21:57:00 +1100
commit1b94462410daa7424f1d050549d4da278da4a02b (patch)
tree91004f85f88380c69e040d093256e6dfaea78bda /pkg/commands/files.go
parent120bb443febe96dfb72e6f5859df697e5fb27e0a (diff)
rename some things
Diffstat (limited to 'pkg/commands/files.go')
-rw-r--r--pkg/commands/files.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/commands/files.go b/pkg/commands/files.go
index 163e006e1..82d3ae244 100644
--- a/pkg/commands/files.go
+++ b/pkg/commands/files.go
@@ -137,12 +137,12 @@ func (c *GitCommand) DiscardAllFileChanges(file *models.File) error {
return c.DiscardUnstagedFileChanges(file)
}
-func (c *GitCommand) DiscardAllDirChanges(node *models.StatusLineNode) error {
+func (c *GitCommand) DiscardAllDirChanges(node *models.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.StatusLineNode) error {
+func (c *GitCommand) DiscardUnstagedDirChanges(node *models.FileChangeNode) error {
if err := c.RemoveUntrackedDirFiles(node); err != nil {
return err
}
@@ -155,9 +155,9 @@ func (c *GitCommand) DiscardUnstagedDirChanges(node *models.StatusLineNode) erro
return nil
}
-func (c *GitCommand) RemoveUntrackedDirFiles(node *models.StatusLineNode) error {
+func (c *GitCommand) RemoveUntrackedDirFiles(node *models.FileChangeNode) error {
untrackedFilePaths := node.GetPathsMatching(
- func(n *models.StatusLineNode) bool { return n.File != nil && !n.File.GetIsTracked() },
+ func(n *models.FileChangeNode) bool { return n.File != nil && !n.File.GetIsTracked() },
)
for _, path := range untrackedFilePaths {
@@ -188,7 +188,7 @@ func (c *GitCommand) WorktreeFileDiff(file *models.File, plain bool, cached bool
return s
}
-func (c *GitCommand) WorktreeFileDiffCmdStr(node models.IStatusLine, plain bool, cached bool) string {
+func (c *GitCommand) WorktreeFileDiffCmdStr(node models.IFileChange, plain bool, cached bool) string {
cachedArg := ""
trackedArg := "--"
colorArg := c.colorArg()