Merge branch 'master-v23'

1 files changed, 25 insertions, 53 deletions

diff --git a/remote_test.go b/remote_test.go
index 25ee13d..73c637f 100644
--- a/remote_test.go
+++ b/remote_test.go
@@ -3,35 +3,13 @@ package git
 import (
 	"fmt"
 	"testing"
-	"time"
 )
 
-func TestRefspecs(t *testing.T) {
-	repo := createTestRepo(t)
-	defer cleanupTestRepo(t, repo)
-
-	remote, err := repo.CreateAnonymousRemote("git://foo/bar", "refs/heads/*:refs/heads/*")
-	checkFatal(t, err)
-
-	expected := []string{
-		"refs/heads/*:refs/remotes/origin/*",
-		"refs/pull/*/head:refs/remotes/origin/*",
-	}
-
-	err = remote.SetFetchRefspecs(expected)
-	checkFatal(t, err)
-
-	actual, err := remote.FetchRefspecs()
-	checkFatal(t, err)
-
-	compareStringList(t, expected, actual)
-}
-
 func TestListRemotes(t *testing.T) {
 	repo := createTestRepo(t)
 	defer cleanupTestRepo(t, repo)
 
-	_, err := repo.CreateRemote("test", "git://foo/bar")
+	_, err := repo.Remotes.Create("test", "git://foo/bar")
 
 	checkFatal(t, err)
 
@@ -39,7 +17,7 @@ func TestListRemotes(t *testing.T) {
 		"test",
 	}
 
-	actual, err := repo.ListRemotes()
+	actual, err := repo.Remotes.List()
 	checkFatal(t, err)
 
 	compareStringList(t, expected, actual)
@@ -58,18 +36,18 @@ func TestCertificateCheck(t *testing.T) {
 	repo := createTestRepo(t)
 	defer cleanupTestRepo(t, repo)
 
-	remote, err := repo.CreateRemote("origin", "https://github.com/libgit2/TestGitRepository")
+	remote, err := repo.Remotes.Create("origin", "https://github.com/libgit2/TestGitRepository")
 	checkFatal(t, err)
 
-	callbacks := RemoteCallbacks{
-		CertificateCheckCallback: func(cert *Certificate, valid bool, hostname string) ErrorCode {
-			return assertHostname(cert, valid, hostname, t)
+	options := FetchOptions {
+		RemoteCallbacks: RemoteCallbacks{
+			CertificateCheckCallback: func(cert *Certificate, valid bool, hostname string) ErrorCode {
+				return assertHostname(cert, valid, hostname, t)
+			},
 		},
 	}
 
-	err = remote.SetCallbacks(&callbacks)
-	checkFatal(t, err)
-	err = remote.Fetch([]string{}, nil, "")
+	err = remote.Fetch([]string{}, &options, "")
 	checkFatal(t, err)
 }
 
@@ -77,10 +55,10 @@ func TestRemoteConnect(t *testing.T) {
 	repo := createTestRepo(t)
 	defer cleanupTestRepo(t, repo)
 
-	remote, err := repo.CreateRemote("origin", "https://github.com/libgit2/TestGitRepository")
+	remote, err := repo.Remotes.Create("origin", "https://github.com/libgit2/TestGitRepository")
 	checkFatal(t, err)
 
-	err = remote.ConnectFetch()
+	err = remote.ConnectFetch(nil)
 	checkFatal(t, err)
 }
 
@@ -88,10 +66,10 @@ func TestRemoteLs(t *testing.T) {
 	repo := createTestRepo(t)
 	defer cleanupTestRepo(t, repo)
 
-	remote, err := repo.CreateRemote("origin", "https://github.com/libgit2/TestGitRepository")
+	remote, err := repo.Remotes.Create("origin", "https://github.com/libgit2/TestGitRepository")
 	checkFatal(t, err)
 
-	err = remote.ConnectFetch()
+	err = remote.ConnectFetch(nil)
 	checkFatal(t, err)
 
 	heads, err := remote.Ls()
@@ -106,10 +84,10 @@ func TestRemoteLsFiltering(t *testing.T) {
 	repo := createTestRepo(t)
 	defer cleanupTestRepo(t, repo)
 
-	remote, err := repo.CreateRemote("origin", "https://github.com/libgit2/TestGitRepository")
+	remote, err := repo.Remotes.Create("origin", "https://github.com/libgit2/TestGitRepository")
 	checkFatal(t, err)
 
-	err = remote.ConnectFetch()
+	err = remote.ConnectFetch(nil)
 	checkFatal(t, err)
 
 	heads, err := remote.Ls("master")
@@ -139,10 +117,10 @@ func TestRemotePruneRefs(t *testing.T) {
 	err = config.SetBool("remote.origin.prune", true)
 	checkFatal(t, err)
 
-	_, err = repo.CreateRemote("origin", "https://github.com/libgit2/TestGitRepository")
+	_, err = repo.Remotes.Create("origin", "https://github.com/libgit2/TestGitRepository")
 	checkFatal(t, err)
 
-	remote, err := repo.LookupRemote("origin")
+	remote, err := repo.Remotes.Lookup("origin")
 	checkFatal(t, err)
 
 	if !remote.PruneRefs() {
@@ -159,13 +137,7 @@ func TestRemotePrune(t *testing.T) {
 	checkFatal(t, err)
 	defer commit.Free()
 
-	sig := &Signature{
-		Name:  "Rand Om Hacker",
-		Email: "[email protected]",
-		When:  time.Now(),
-	}
-
-	remoteRef, err := remoteRepo.CreateBranch("test-prune", commit, true, sig, "branch test-prune")
+	remoteRef, err := remoteRepo.CreateBranch("test-prune", commit, true)
 	checkFatal(t, err)
 
 	repo := createTestRepo(t)
@@ -176,13 +148,13 @@ func TestRemotePrune(t *testing.T) {
 	defer config.Free()
 
 	remoteUrl := fmt.Sprintf("file://%s", remoteRepo.Workdir())
-	remote, err := repo.CreateRemote("origin", remoteUrl)
+	remote, err := repo.Remotes.Create("origin", remoteUrl)
 	checkFatal(t, err)
 
-	err = remote.Fetch([]string{"test-prune"}, sig, "")
+	err = remote.Fetch([]string{"test-prune"}, nil, "")
 	checkFatal(t, err)
 
-	_, err = repo.CreateReference("refs/remotes/origin/test-prune", head, true, sig, "remote reference")
+	_, err = repo.References.Create("refs/remotes/origin/test-prune", head, true, "remote reference")
 	checkFatal(t, err)
 
 	err = remoteRef.Delete()
@@ -191,16 +163,16 @@ func TestRemotePrune(t *testing.T) {
 	err = config.SetBool("remote.origin.prune", true)
 	checkFatal(t, err)
 
-	rr, err := repo.LookupRemote("origin")
+	rr, err := repo.Remotes.Lookup("origin")
 	checkFatal(t, err)
 
-	err = rr.ConnectFetch()
+	err = rr.ConnectFetch(nil)
 	checkFatal(t, err)
 
-	err = rr.Prune()
+	err = rr.Prune(nil)
 	checkFatal(t, err)
 
-	_, err = repo.LookupReference("refs/remotes/origin/test-prune")
+	_, err = repo.References.Lookup("refs/remotes/origin/test-prune")
 	if err == nil {
 		t.Fatal("Expected error getting a pruned reference")
 	}