From 4a796e64ac576d6a3e3f2fe6174c4aa476ea0c5c Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Mon, 23 Mar 2026 03:25:44 +0000 Subject: refstore: Improve interfaces, errors, and make batch work --- refstore/files/update_dir_tree.go | 59 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 refstore/files/update_dir_tree.go (limited to 'refstore/files/update_dir_tree.go') diff --git a/refstore/files/update_dir_tree.go b/refstore/files/update_dir_tree.go new file mode 100644 index 00000000..51fb5cfb --- /dev/null +++ b/refstore/files/update_dir_tree.go @@ -0,0 +1,59 @@ +package files + +import ( + "errors" + "fmt" + "os" + "path" +) + +func (executor *refUpdateExecutor) removeEmptyDirTree(name refPath) error { + root := executor.store.rootFor(name.root) + + info, err := root.Stat(name.path) + if err != nil { + if errors.Is(err, os.ErrNotExist) { + return nil + } + + return err + } + + if !info.IsDir() { + return nil + } + + return executor.removeEmptyDirTreeRecursive(name) +} + +func (executor *refUpdateExecutor) removeEmptyDirTreeRecursive(name refPath) error { + root := executor.store.rootFor(name.root) + + dir, err := root.Open(name.path) + if err != nil { + return err + } + + entries, err := dir.ReadDir(-1) + _ = dir.Close() + + if err != nil { + return err + } + + for _, entry := range entries { + if !entry.IsDir() { + return fmt.Errorf("refstore/files: non-empty directory blocks reference %q", name.path) + } + + err = executor.removeEmptyDirTreeRecursive(refPath{ + root: name.root, + path: path.Join(name.path, entry.Name()), + }) + if err != nil { + return err + } + } + + return root.Remove(name.path) +} -- cgit v1.3.1-10-gc9f91