Make object repacking more configurable

3 files changed, 18 insertions, 6 deletions

diff --git a/storage/filesystem/internal/dotgit/dotgit.go b/storage/filesystem/internal/dotgit/dotgit.go
index 09688c1..cd4f517 100644
--- a/storage/filesystem/internal/dotgit/dotgit.go
+++ b/storage/filesystem/internal/dotgit/dotgit.go
@@ -9,6 +9,7 @@ import (
 	stdioutil "io/ioutil"
 	"os"
 	"strings"
+	"time"
 
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/utils/ioutil"
@@ -193,8 +194,19 @@ func (d *DotGit) ObjectPackIdx(hash plumbing.Hash) (billy.File, error) {
 	return d.objectPackOpen(hash, `idx`)
 }
 
-func (d *DotGit) DeleteObjectPackAndIndex(hash plumbing.Hash) error {
-	err := d.fs.Remove(d.objectPackPath(hash, `pack`))
+func (d *DotGit) DeleteOldObjectPackAndIndex(hash plumbing.Hash, t time.Time) error {
+	path := d.objectPackPath(hash, `pack`)
+	if !t.IsZero() {
+		fi, err := d.fs.Stat(path)
+		if err != nil {
+			return err
+		}
+		// too new, skip deletion.
+		if !fi.ModTime().Before(t) {
+			return nil
+		}
+	}
+	err := d.fs.Remove(path)
 	if err != nil {
 		return err
 	}
diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go
index f235204..13b8ddb 100644
--- a/storage/filesystem/object.go
+++ b/storage/filesystem/object.go
@@ -508,6 +508,6 @@ func (s *ObjectStorage) ObjectPacks() ([]plumbing.Hash, error) {
 	return s.dir.ObjectPacks()
 }
 
-func (s *ObjectStorage) DeleteObjectPackAndIndex(h plumbing.Hash) error {
-	return s.dir.DeleteObjectPackAndIndex(h)
+func (s *ObjectStorage) DeleteOldObjectPackAndIndex(h plumbing.Hash, t time.Time) error {
+	return s.dir.DeleteOldObjectPackAndIndex(h, t)
 }
diff --git a/storage/memory/storage.go b/storage/memory/storage.go
index 5049036..2d1a4b6 100644
--- a/storage/memory/storage.go
+++ b/storage/memory/storage.go
@@ -173,8 +173,8 @@ func (o *ObjectStorage) ForEachObjectHash(fun func(plumbing.Hash) error) error {
 func (o *ObjectStorage) ObjectPacks() ([]plumbing.Hash, error) {
 	return nil, nil
 }
-func (o *ObjectStorage) DeleteObjectPackAndIndex(plumbing.Hash) error {
-	return errNotSupported
+func (o *ObjectStorage) DeleteOldObjectPackAndIndex(plumbing.Hash, time.Time) error {
+	return nil
 }
 
 var errNotSupported = fmt.Errorf("Not supported")