From e7b02be89f2d98fcfe900d71b3b7ecdca8441ed2 Mon Sep 17 00:00:00 2001 From: Sunny Date: Mon, 4 Dec 2017 19:10:16 +0530 Subject: git: worktree, add Clean() method for git clean This change implement git clean with a `Dir` option. By default, clean removes only the untracked files in the working directory. If `Dir` option is set to true, untracked files under other directories are also cleaned. --- options.go | 5 +++++ worktree.go | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/options.go b/options.go index d2cec4b..e5745ea 100644 --- a/options.go +++ b/options.go @@ -360,3 +360,8 @@ type ListOptions struct { // Auth credentials, if required, to use with the remote repository. Auth transport.AuthMethod } + +// CleanOptions describes how a clean should be performed. +type CleanOptions struct { + Dir bool +} diff --git a/worktree.go b/worktree.go index 67d7f08..e87f567 100644 --- a/worktree.go +++ b/worktree.go @@ -684,6 +684,33 @@ func (w *Worktree) readGitmodulesFile() (*config.Modules, error) { return m, m.Unmarshal(input) } +// Clean the worktree by removing untracked files. +func (w *Worktree) Clean(opts *CleanOptions) error { + s, err := w.Status() + if err != nil { + return err + } + + // Check Worktree status to be Untracked, obtain absolute path and delete. + for relativePath, status := range s { + // Check if the path contains a directory and if Dir options is false, + // skip the path. + if relativePath != filepath.Base(relativePath) && !opts.Dir { + continue + } + + // Remove the file only if it's an untracked file. + if status.Worktree == Untracked { + absPath := filepath.Join(w.Filesystem.Root(), relativePath) + if err := os.Remove(absPath); err != nil { + return err + } + } + } + + return nil +} + func rmFileAndDirIfEmpty(fs billy.Filesystem, name string) error { if err := util.RemoveAll(fs, name); err != nil { return err -- cgit