Add prune methods to Remote.
This commit is contained in:
parent
d57246fb74
commit
dbddb88a8c
18
remote.go
18
remote.go
|
@ -69,7 +69,6 @@ type RemoteCallbacks struct {
|
|||
PushUpdateReferenceCallback
|
||||
}
|
||||
|
||||
|
||||
type Remote struct {
|
||||
ptr *C.git_remote
|
||||
callbacks RemoteCallbacks
|
||||
|
@ -259,8 +258,6 @@ func pushUpdateReferenceCallback(refname, status *C.char, data unsafe.Pointer) i
|
|||
return int(callbacks.PushUpdateReferenceCallback(C.GoString(refname), C.GoString(status)))
|
||||
}
|
||||
|
||||
|
||||
|
||||
func RemoteIsValidName(name string) bool {
|
||||
cname := C.CString(name)
|
||||
defer C.free(unsafe.Pointer(cname))
|
||||
|
@ -731,3 +728,18 @@ func (o *Remote) Push(refspecs []string, opts *PushOptions, sig *Signature, msg
|
|||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (o *Remote) PruneRefs() bool {
|
||||
return C.git_remote_prune_refs(o.ptr) > 0
|
||||
}
|
||||
|
||||
func (o *Remote) Prune() error {
|
||||
runtime.LockOSThread()
|
||||
defer runtime.UnlockOSThread()
|
||||
|
||||
ret := C.git_remote_prune(o.ptr)
|
||||
if ret < 0 {
|
||||
return MakeGitError(ret)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
package git
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestRefspecs(t *testing.T) {
|
||||
|
@ -132,3 +134,84 @@ func TestRemoteLsFiltering(t *testing.T) {
|
|||
t.Fatalf("Expected head to have a name, but it's empty")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRemotePruneRefs(t *testing.T) {
|
||||
repo := createTestRepo(t)
|
||||
defer os.RemoveAll(repo.Workdir())
|
||||
defer repo.Free()
|
||||
|
||||
config, err := repo.Config()
|
||||
checkFatal(t, err)
|
||||
defer config.Free()
|
||||
|
||||
err = config.SetBool("remote.origin.prune", true)
|
||||
checkFatal(t, err)
|
||||
|
||||
_, err = repo.CreateRemote("origin", "https://github.com/libgit2/TestGitRepository")
|
||||
checkFatal(t, err)
|
||||
|
||||
remote, err := repo.LookupRemote("origin")
|
||||
checkFatal(t, err)
|
||||
|
||||
if !remote.PruneRefs() {
|
||||
t.Fatal("Expected remote to be configured to prune references")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRemotePrune(t *testing.T) {
|
||||
remoteRepo := createTestRepo(t)
|
||||
defer os.RemoveAll(remoteRepo.Workdir())
|
||||
defer remoteRepo.Free()
|
||||
|
||||
head, _ := seedTestRepo(t, remoteRepo)
|
||||
commit, err := remoteRepo.LookupCommit(head)
|
||||
checkFatal(t, err)
|
||||
defer commit.Free()
|
||||
|
||||
sig := &Signature{
|
||||
Name: "Rand Om Hacker",
|
||||
Email: "random@hacker.com",
|
||||
When: time.Now(),
|
||||
}
|
||||
|
||||
remoteRef, err := remoteRepo.CreateBranch("test-prune", commit, true, sig, "branch test-prune")
|
||||
checkFatal(t, err)
|
||||
|
||||
repo := createTestRepo(t)
|
||||
defer os.RemoveAll(repo.Workdir())
|
||||
defer repo.Free()
|
||||
|
||||
config, err := repo.Config()
|
||||
checkFatal(t, err)
|
||||
defer config.Free()
|
||||
|
||||
remoteUrl := fmt.Sprintf("file://%s", remoteRepo.Workdir())
|
||||
remote, err := repo.CreateRemote("origin", remoteUrl)
|
||||
checkFatal(t, err)
|
||||
|
||||
err = remote.Fetch([]string{"test-prune"}, sig, "")
|
||||
checkFatal(t, err)
|
||||
|
||||
_, err = repo.CreateReference("refs/remotes/origin/test-prune", head, true, sig, "remote reference")
|
||||
checkFatal(t, err)
|
||||
|
||||
err = remoteRef.Delete()
|
||||
checkFatal(t, err)
|
||||
|
||||
err = config.SetBool("remote.origin.prune", true)
|
||||
checkFatal(t, err)
|
||||
|
||||
rr, err := repo.LookupRemote("origin")
|
||||
checkFatal(t, err)
|
||||
|
||||
err = rr.ConnectFetch()
|
||||
checkFatal(t, err)
|
||||
|
||||
err = rr.Prune()
|
||||
checkFatal(t, err)
|
||||
|
||||
_, err = repo.LookupReference("refs/remotes/origin/test-prune")
|
||||
if err == nil {
|
||||
t.Fatal("Expected error getting a pruned reference")
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue