gitbase: use KeepDescriptors go-git option

Adds storer close after repository usage. Also adds
ExclusiveAccess option.

Signed-off-by: Javi Fontan <[email protected]>

Author: jfontan

blobs.go

@@ -239,6 +239,8 @@ func (i *blobRowIter) Close() error {
 		i.iter.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }
 

commit_blobs.go

@@ -314,5 +314,7 @@ func (i *commitBlobsRowIter) Close() error {
 		return i.index.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }

commit_trees.go

@@ -326,5 +326,7 @@ func (i *commitTreesRowIter) Close() error {
 		return i.index.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }

commits.go

@@ -193,6 +193,8 @@ func (i *commitIter) Close() error {
 		i.iter.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }
 

files.go

@@ -282,6 +282,8 @@ func (i *filesRowIter) Close() error {
 		i.commits.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }
 

ref_commits.go

@@ -353,6 +353,8 @@ func (i *refCommitsRowIter) Close() error {
 		return i.index.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }
 

repository_pool.go

@@ -35,10 +35,47 @@ func NewRepository(id string, repo *git.Repository) *Repository {
 	}
 }
 
+// Close closes all opened files in the repository.
+func (r *Repository) Close() {
+	if r != nil && r.Repository != nil {
+		f, ok := r.Storer.(*filesystem.Storage)
+		if ok {
+			// The only type of error returned is "file already closed" and
+			// we don't want to do anything with it.
+			f.Close()
+		}
+	}
+}
+
 // NewRepositoryFromPath creates and initializes a new Repository structure
 // and initializes a go-git repository
 func NewRepositoryFromPath(id, path string) (*Repository, error) {
-	repo, err := git.PlainOpen(path)
+	op := filesystem.Options{
+		ExclusiveAccess: true,
+		KeepDescriptors: true,
+	}
+
+	var wt billy.Filesystem
+	fs := osfs.New(path)
+	f, err := fs.Stat(git.GitDirName)
+	if err != nil && !os.IsNotExist(err) {
+		return nil, err
+	}
+
+	if f != nil && f.IsDir() {
+		wt = fs
+		fs, err = fs.Chroot(git.GitDirName)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	sto, err := filesystem.NewStorageWithOptions(fs, op)
+	if err != nil {
+		return nil, err
+	}
+
+	repo, err := git.Open(sto, wt)
 	if err != nil {
 		return nil, err
 	}
@@ -63,7 +100,12 @@ func NewSivaRepositoryFromPath(id, path string) (*Repository, error) {
 		return nil, err
 	}
 
-	sto, err := filesystem.NewStorage(fs)
+	op := filesystem.Options{
+		ExclusiveAccess: true,
+		KeepDescriptors: true,
+	}
+
+	sto, err := filesystem.NewStorageWithOptions(fs, op)
 	if err != nil {
 		return nil, err
 	}

tree_entries.go

@@ -236,6 +236,8 @@ func (i *treeEntriesRowIter) Close() error {
 		i.iter.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }