aboutsummaryrefslogtreecommitdiffstats
path: root/storage/filesystem/dotgit/dotgit.go
diff options
context:
space:
mode:
Diffstat (limited to 'storage/filesystem/dotgit/dotgit.go')
-rw-r--r--storage/filesystem/dotgit/dotgit.go53
1 files changed, 50 insertions, 3 deletions
diff --git a/storage/filesystem/dotgit/dotgit.go b/storage/filesystem/dotgit/dotgit.go
index dc12f23..d16a77d 100644
--- a/storage/filesystem/dotgit/dotgit.go
+++ b/storage/filesystem/dotgit/dotgit.go
@@ -279,19 +279,66 @@ func (d *DotGit) objectPath(h plumbing.Hash) string {
return d.fs.Join(objectsPath, hash[0:2], hash[2:40])
}
+//incomingObjectPath is intended to add support for a git pre-recieve hook to be written
+//it adds support for go-git to find objects in an "incoming" directory, so that the library
+//can be used to write a pre-recieve hook that deals with the incoming objects.
+//More on git hooks found here : https://git-scm.com/docs/githooks
+//More on 'quarantine'/incoming directory here : https://git-scm.com/docs/git-receive-pack
+func (d *DotGit) incomingObjectPath(h plumbing.Hash) string {
+ hString := h.String()
+ directoryContents, err := d.fs.ReadDir(objectsPath)
+ if err != nil {
+ return d.fs.Join(objectsPath, hString[0:2], hString[2:40])
+ }
+ var incomingDirName string
+ for _, file := range directoryContents {
+ if strings.Split(file.Name(), "-")[0] == "incoming" && file.IsDir() {
+ incomingDirName = file.Name()
+ }
+ }
+ if incomingDirName == "" {
+ return d.fs.Join(objectsPath, hString[0:2], hString[2:40])
+ }
+ return d.fs.Join(objectsPath, incomingDirName, hString[0:2], hString[2:40])
+}
+
// Object returns a fs.File pointing the object file, if exists
func (d *DotGit) Object(h plumbing.Hash) (billy.File, error) {
- return d.fs.Open(d.objectPath(h))
+ obj1, err1 := d.fs.Open(d.objectPath(h))
+ if os.IsNotExist(err1) {
+ obj2, err2 := d.fs.Open(d.incomingObjectPath(h))
+ if err2 != nil {
+ return obj1, err1
+ }
+ return obj2, err2
+ }
+ return obj1, err1
}
// ObjectStat returns a os.FileInfo pointing the object file, if exists
func (d *DotGit) ObjectStat(h plumbing.Hash) (os.FileInfo, error) {
- return d.fs.Stat(d.objectPath(h))
+ obj1, err1 := d.fs.Stat(d.objectPath(h))
+ if os.IsNotExist(err1) {
+ obj2, err2 := d.fs.Stat(d.incomingObjectPath(h))
+ if err2 != nil {
+ return obj1, err1
+ }
+ return obj2, err2
+ }
+ return obj1, err1
}
// ObjectDelete removes the object file, if exists
func (d *DotGit) ObjectDelete(h plumbing.Hash) error {
- return d.fs.Remove(d.objectPath(h))
+ err1 := d.fs.Remove(d.objectPath(h))
+ if os.IsNotExist(err1) {
+ err2 := d.fs.Remove(d.incomingObjectPath(h))
+ if err2 != nil {
+ return err1
+ }
+ return err2
+ }
+ return err1
}
func (d *DotGit) readReferenceFrom(rd io.Reader, name string) (ref *plumbing.Reference, err error) {