aboutsummaryrefslogtreecommitdiffstats
path: root/cshared
diff options
context:
space:
mode:
Diffstat (limited to 'cshared')
-rw-r--r--cshared/auth_method_cshared.go4
-rw-r--r--cshared/commit_cshared.go7
-rw-r--r--cshared/file_cshared.go4
-rw-r--r--cshared/objects_cshared.go4
-rw-r--r--cshared/repository_cshared.go12
-rw-r--r--cshared/tag_cshared.go7
-rw-r--r--cshared/tree_cshared.go4
7 files changed, 22 insertions, 20 deletions
diff --git a/cshared/auth_method_cshared.go b/cshared/auth_method_cshared.go
index 2219edb..9be3339 100644
--- a/cshared/auth_method_cshared.go
+++ b/cshared/auth_method_cshared.go
@@ -6,8 +6,8 @@ import (
"strings"
"golang.org/x/crypto/ssh"
- "gopkg.in/src-d/go-git.v4/clients/http"
- gssh "gopkg.in/src-d/go-git.v4/clients/ssh"
+ "gopkg.in/src-d/go-git.v4/plumbing/client/http"
+ gssh "gopkg.in/src-d/go-git.v4/plumbing/client/ssh"
)
//export c_NewBasicAuth
diff --git a/cshared/commit_cshared.go b/cshared/commit_cshared.go
index 8cb91aa..756b0b2 100644
--- a/cshared/commit_cshared.go
+++ b/cshared/commit_cshared.go
@@ -8,8 +8,9 @@ import (
"unsafe"
"gopkg.in/src-d/go-git.v4"
- "gopkg.in/src-d/go-git.v4/core"
+ "gopkg.in/src-d/go-git.v4/plumbing"
)
+import "gopkg.in/src-d/go-git.v4/plumbing/storer"
//export c_Commit_get_Hash
func c_Commit_get_Hash(c uint64) *C.char {
@@ -130,7 +131,7 @@ func c_Commit_Decode(o uint64) (uint64, int, *C.char) {
if !ok {
return IH, ErrorCodeNotFound, C.CString(MessageNotFound)
}
- cobj := obj.(*core.Object)
+ cobj := obj.(*plumbing.Object)
err := commit.Decode(*cobj)
if err != nil {
return IH, ErrorCodeInternal, C.CString(err.Error())
@@ -196,7 +197,7 @@ func c_NewCommitIter(r uint64, iter uint64) uint64 {
if !ok {
return IH
}
- obj_iter := obj.(*core.ObjectIter)
+ obj_iter := obj.(*storer.ObjectIter)
commit_iter := git.NewCommitIter(repo, *obj_iter)
handle := RegisterObject(commit_iter)
return uint64(handle)
diff --git a/cshared/file_cshared.go b/cshared/file_cshared.go
index 8191289..8ef6427 100644
--- a/cshared/file_cshared.go
+++ b/cshared/file_cshared.go
@@ -6,7 +6,7 @@ import (
"io/ioutil"
"gopkg.in/src-d/go-git.v4"
- "gopkg.in/src-d/go-git.v4/core"
+ "gopkg.in/src-d/go-git.v4/plumbing"
)
//export c_File_get_Name
@@ -55,7 +55,7 @@ func c_File_Decode(o uint64) uint64 {
if !ok {
return IH
}
- cobj := obj.(*core.Object)
+ cobj := obj.(*plumbing.Object)
file := git.File{}
file.Decode(*cobj)
return uint64(RegisterObject(&file))
diff --git a/cshared/objects_cshared.go b/cshared/objects_cshared.go
index 2600555..54b9426 100644
--- a/cshared/objects_cshared.go
+++ b/cshared/objects_cshared.go
@@ -7,7 +7,7 @@ import (
"time"
"gopkg.in/src-d/go-git.v4"
- "gopkg.in/src-d/go-git.v4/core"
+ "gopkg.in/src-d/go-git.v4/plumbing"
)
//export c_Signature_Name
@@ -73,7 +73,7 @@ func c_Blob_Decode(o uint64) uint64 {
if !ok {
return IH
}
- cobj := obj.(*core.Object)
+ cobj := obj.(*plumbing.Object)
blob := git.Blob{}
blob.Decode(*cobj)
return uint64(RegisterObject(&blob))
diff --git a/cshared/repository_cshared.go b/cshared/repository_cshared.go
index e11a6c0..76755bf 100644
--- a/cshared/repository_cshared.go
+++ b/cshared/repository_cshared.go
@@ -83,7 +83,7 @@ func c_Repository_set_Storage(r uint64, val uint64) {
if !ok {
return
}
- repo.Storage = *obj.(*core.ObjectStorage)
+ repo.Storage = *obj.(*plumbing.ObjectStorage)
}
//export c_Repository_Pull
@@ -121,7 +121,7 @@ func c_Repository_Commit(r uint64, h []byte) (uint64, int, *C.char) {
return IH, ErrorCodeNotFound, C.CString(MessageNotFound)
}
repo := obj.(*git.Repository)
- var hash core.Hash
+ var hash plumbing.Hash
copy(hash[:], h)
commit, err := repo.Commit(hash)
if err != nil {
@@ -153,7 +153,7 @@ func c_Repository_Tree(r uint64, h []byte) (uint64, int, *C.char) {
return IH, ErrorCodeNotFound, C.CString(MessageNotFound)
}
repo := obj.(*git.Repository)
- var hash core.Hash
+ var hash plumbing.Hash
copy(hash[:], h)
tree, err := repo.Tree(hash)
if err != nil {
@@ -170,7 +170,7 @@ func c_Repository_Blob(r uint64, h []byte) (uint64, int, *C.char) {
return IH, ErrorCodeNotFound, C.CString(MessageNotFound)
}
repo := obj.(*git.Repository)
- var hash core.Hash
+ var hash plumbing.Hash
copy(hash[:], h)
blob, err := repo.Blob(hash)
if err != nil {
@@ -187,7 +187,7 @@ func c_Repository_Tag(r uint64, h []byte) (uint64, int, *C.char) {
return IH, ErrorCodeNotFound, C.CString(MessageNotFound)
}
repo := obj.(*git.Repository)
- var hash core.Hash
+ var hash plumbing.Hash
copy(hash[:], h)
tag, err := repo.Tag(hash)
if err != nil {
@@ -219,7 +219,7 @@ func c_Repository_Object(r uint64, h []byte) (uint64, int, *C.char) {
return IH, ErrorCodeNotFound, C.CString(MessageNotFound)
}
repo := obj.(*git.Repository)
- var hash core.Hash
+ var hash plumbing.Hash
copy(hash[:], h)
robj, err := repo.Object(hash)
if err != nil {
diff --git a/cshared/tag_cshared.go b/cshared/tag_cshared.go
index 67c3ada..dd0814a 100644
--- a/cshared/tag_cshared.go
+++ b/cshared/tag_cshared.go
@@ -6,8 +6,9 @@ import (
"io"
"gopkg.in/src-d/go-git.v4"
- "gopkg.in/src-d/go-git.v4/core"
+ "gopkg.in/src-d/go-git.v4/plumbing"
)
+import "gopkg.in/src-d/go-git.v4/plumbing/storer"
func c_Tag_get_Hash(t uint64) *C.char {
obj, ok := GetObject(Handle(t))
@@ -79,7 +80,7 @@ func c_Tag_Decode(o uint64) (uint64, int, *C.char) {
if !ok {
return IH, ErrorCodeNotFound, C.CString(MessageNotFound)
}
- cobj := obj.(*core.Object)
+ cobj := obj.(*plumbing.Object)
tag := git.Tag{}
err := tag.Decode(*cobj)
if err != nil {
@@ -165,7 +166,7 @@ func c_NewTagIter(r uint64, i uint64) uint64 {
if !ok {
return IH
}
- iter := obj.(*core.ObjectIter)
+ iter := obj.(*storer.ObjectIter)
return uint64(RegisterObject(git.NewTagIter(repo, *iter)))
}
diff --git a/cshared/tree_cshared.go b/cshared/tree_cshared.go
index 4974904..8533f60 100644
--- a/cshared/tree_cshared.go
+++ b/cshared/tree_cshared.go
@@ -10,7 +10,7 @@ package main
import (
//line /home/mcuadros/workspace/go/src/gopkg.in/src-d/go-git.v4/cshared/tree_cshared.go:7
"gopkg.in/src-d/go-git.v4"
- "gopkg.in/src-d/go-git.v4/core"
+ "gopkg.in/src-d/go-git.v4/plumbing"
)
//line /home/mcuadros/workspace/go/src/gopkg.in/src-d/go-git.v4/cshared/tree_cshared.go:13
@@ -99,7 +99,7 @@ func c_Tree_Decode(o uint64) (uint64, int, *_Ctype_char) {
if !ok {
return IH, ErrorCodeNotFound, _Cfunc_CString(MessageNotFound)
}
- cobj := obj.(*core.Object)
+ cobj := obj.(*plumbing.Object)
tree := git.Tree{}
err := tree.Decode(*cobj)
if err != nil {