lhchavez
137c05e802
This change introduces the file deprecated.go, which contains any constants, functions, and types that are slated to be deprecated in the next major release. These symbols are deprecated because they refer to old spellings in pre-1.0 libgit2. This also makes the build be done with the `-DDEPRECATE_HARD` flag to avoid regressions. This, together with [gorelease](https://godoc.org/golang.org/x/exp/cmd/gorelease)[1] should make releases safer going forward. 1: More information about how that works at https://go.googlesource.com/exp/+/refs/heads/master/apidiff/README.md
141 lines
2.8 KiB
Go
141 lines
2.8 KiB
Go
package git
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"testing"
|
|
)
|
|
|
|
func checkout(t *testing.T, repo *Repository, commit *Commit) {
|
|
tree, err := commit.Tree()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
err = repo.CheckoutTree(tree, &CheckoutOptions{Strategy: CheckoutSafe})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
err = repo.SetHeadDetached(commit.Id())
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
const content = "Herro, Worrd!"
|
|
|
|
func readReadme(t *testing.T, repo *Repository) string {
|
|
bytes, err := ioutil.ReadFile(pathInRepo(repo, "README"))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
return string(bytes)
|
|
}
|
|
|
|
func TestCherrypick(t *testing.T) {
|
|
t.Parallel()
|
|
repo := createTestRepo(t)
|
|
defer cleanupTestRepo(t, repo)
|
|
|
|
c1, _ := seedTestRepo(t, repo)
|
|
c2, _ := updateReadme(t, repo, content)
|
|
|
|
commit1, err := repo.LookupCommit(c1)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
commit2, err := repo.LookupCommit(c2)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
checkout(t, repo, commit1)
|
|
|
|
if readReadme(t, repo) == content {
|
|
t.Fatalf("README has wrong content after checking out initial commit")
|
|
}
|
|
|
|
opts, err := DefaultCherrypickOptions()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
err = repo.Cherrypick(commit2, opts)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
if readReadme(t, repo) != content {
|
|
t.Fatalf("README has wrong contents after cherry-picking")
|
|
}
|
|
|
|
state := repo.State()
|
|
if state != RepositoryStateCherrypick {
|
|
t.Fatal("Incorrect repository state: ", state)
|
|
}
|
|
|
|
err = repo.StateCleanup()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
state = repo.State()
|
|
if state != RepositoryStateNone {
|
|
t.Fatal("Incorrect repository state: ", state)
|
|
}
|
|
}
|
|
|
|
func TestCherrypickCommit(t *testing.T) {
|
|
t.Parallel()
|
|
repo := createTestRepo(t)
|
|
defer cleanupTestRepo(t, repo)
|
|
|
|
c1, _ := seedTestRepo(t, repo)
|
|
c2, _ := updateReadme(t, repo, content)
|
|
|
|
commit1, err := repo.LookupCommit(c1)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
commit2, err := repo.LookupCommit(c2)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
checkout(t, repo, commit1)
|
|
|
|
if got := readReadme(t, repo); got == content {
|
|
t.Fatalf("README = %q, want %q", got, content)
|
|
}
|
|
|
|
opts, err := DefaultCherrypickOptions()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
idx, err := repo.CherrypickCommit(commit2, commit1, opts)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer idx.Free()
|
|
|
|
// The file is only updated in the index, not in the working directory.
|
|
if got := readReadme(t, repo); got == content {
|
|
t.Errorf("README = %q, want %q", got, content)
|
|
}
|
|
if got := repo.State(); got != RepositoryStateNone {
|
|
t.Errorf("repo.State() = %v, want %v", got, RepositoryStateCherrypick)
|
|
}
|
|
|
|
if got := idx.EntryCount(); got != 1 {
|
|
t.Fatalf("idx.EntryCount() = %v, want %v", got, 1)
|
|
}
|
|
entry, err := idx.EntryByIndex(0)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if entry.Path != "README" {
|
|
t.Errorf("entry.Path = %v, want %v", entry.Path, "README")
|
|
}
|
|
}
|