405 lines
8.5 KiB
Go
405 lines
8.5 KiB
Go
package git
|
|
|
|
import (
|
|
"errors"
|
|
"strconv"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// Tests
|
|
|
|
func TestDefaultRebaseOptions(t *testing.T) {
|
|
opts, err := DefaultRebaseOptions()
|
|
checkFatal(t, err)
|
|
|
|
if opts.Version != 1 {
|
|
t.Error("Expected opts Version to equal 1, got ", opts.Version)
|
|
}
|
|
if opts.Quiet != 0 {
|
|
t.Error("Expected opts Quiet to equal 1, got ", opts.Quiet)
|
|
}
|
|
if opts.InMemory != 0 {
|
|
t.Error("Expected opts InMemory to equal 1, got ", opts.InMemory)
|
|
}
|
|
if opts.RewriteNotesRef != "" {
|
|
t.Error("Expected opts RewriteNotesRef to equal 1, got ", opts.RewriteNotesRef)
|
|
}
|
|
|
|
copts := opts.toC()
|
|
if copts == nil {
|
|
t.Error("Copts should not be nil")
|
|
}
|
|
}
|
|
|
|
func TestRebaseAbort(t *testing.T) {
|
|
// TEST DATA
|
|
|
|
// Inputs
|
|
branchName := "emile"
|
|
masterCommit := "something"
|
|
emileCommits := []string{
|
|
"fou",
|
|
"barre",
|
|
}
|
|
|
|
// Outputs
|
|
expectedHistory := []string{
|
|
"Test rebase, Baby! " + emileCommits[1],
|
|
"Test rebase, Baby! " + emileCommits[0],
|
|
"This is a commit\n",
|
|
}
|
|
|
|
// TEST
|
|
repo := createTestRepo(t)
|
|
defer cleanupTestRepo(t, repo)
|
|
seedTestRepo(t, repo)
|
|
|
|
// Setup a repo with 2 branches and a different tree
|
|
err := setupRepoForRebase(repo, masterCommit, branchName)
|
|
checkFatal(t, err)
|
|
|
|
// Create several commits in emile
|
|
for _, commit := range emileCommits {
|
|
_, err = commitSomething(repo, commit, commit)
|
|
checkFatal(t, err)
|
|
}
|
|
|
|
// Check history
|
|
actualHistory, err := commitMsgsList(repo)
|
|
checkFatal(t, err)
|
|
assertStringList(t, expectedHistory, actualHistory)
|
|
|
|
// Rebase onto master
|
|
rebase, err := performRebaseOnto(repo, "master")
|
|
checkFatal(t, err)
|
|
defer rebase.Free()
|
|
|
|
// Abort rebase
|
|
rebase.Abort()
|
|
|
|
// Check history is still the same
|
|
actualHistory, err = commitMsgsList(repo)
|
|
checkFatal(t, err)
|
|
assertStringList(t, expectedHistory, actualHistory)
|
|
}
|
|
|
|
func TestRebaseNoConflicts(t *testing.T) {
|
|
// TEST DATA
|
|
|
|
// Inputs
|
|
branchName := "emile"
|
|
masterCommit := "something"
|
|
emileCommits := []string{
|
|
"fou",
|
|
"barre",
|
|
"ouich",
|
|
}
|
|
|
|
// Outputs
|
|
expectedHistory := []string{
|
|
"Test rebase, Baby! " + emileCommits[2],
|
|
"Test rebase, Baby! " + emileCommits[1],
|
|
"Test rebase, Baby! " + emileCommits[0],
|
|
"Test rebase, Baby! " + masterCommit,
|
|
"This is a commit\n",
|
|
}
|
|
|
|
// TEST
|
|
repo := createTestRepo(t)
|
|
defer cleanupTestRepo(t, repo)
|
|
seedTestRepo(t, repo)
|
|
|
|
// Try to open existing rebase
|
|
oRebase, err := repo.OpenRebase(nil)
|
|
if err == nil {
|
|
t.Fatal("Did not expect to find a rebase in progress")
|
|
}
|
|
|
|
// Setup a repo with 2 branches and a different tree
|
|
err = setupRepoForRebase(repo, masterCommit, branchName)
|
|
checkFatal(t, err)
|
|
|
|
// Create several commits in emile
|
|
for _, commit := range emileCommits {
|
|
_, err = commitSomething(repo, commit, commit)
|
|
checkFatal(t, err)
|
|
}
|
|
|
|
// Rebase onto master
|
|
rebase, err := performRebaseOnto(repo, "master")
|
|
checkFatal(t, err)
|
|
defer rebase.Free()
|
|
|
|
// Open existing rebase
|
|
oRebase, err = repo.OpenRebase(nil)
|
|
checkFatal(t, err)
|
|
defer oRebase.Free()
|
|
if oRebase == nil {
|
|
t.Fatal("Expected to find an existing rebase in progress")
|
|
}
|
|
|
|
// Finish the rebase properly
|
|
err = rebase.Finish()
|
|
checkFatal(t, err)
|
|
|
|
// Check no more rebase is in progress
|
|
oRebase, err = repo.OpenRebase(nil)
|
|
if err == nil {
|
|
t.Fatal("Did not expect to find a rebase in progress")
|
|
}
|
|
|
|
// Check history is in correct order
|
|
actualHistory, err := commitMsgsList(repo)
|
|
checkFatal(t, err)
|
|
assertStringList(t, expectedHistory, actualHistory)
|
|
|
|
}
|
|
|
|
// Utils
|
|
func setupRepoForRebase(repo *Repository, masterCommit, branchName string) error {
|
|
// Create a new branch from master
|
|
err := createBranch(repo, branchName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Create a commit in master
|
|
_, err = commitSomething(repo, masterCommit, masterCommit)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Switch to emile
|
|
err = repo.SetHead("refs/heads/" + branchName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Check master commit is not in emile branch
|
|
if entryExists(repo, masterCommit) {
|
|
return errors.New(masterCommit + " entry should not exist in " + branchName + " branch.")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func performRebaseOnto(repo *Repository, branch string) (*Rebase, error) {
|
|
master, err := repo.LookupBranch(branch, BranchLocal)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer master.Free()
|
|
|
|
onto, err := repo.AnnotatedCommitFromRef(master.Reference)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer onto.Free()
|
|
|
|
// Init rebase
|
|
rebase, err := repo.InitRebase(nil, nil, onto, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Check no operation has been started yet
|
|
rebaseOperationIndex, err := rebase.CurrentOperationIndex()
|
|
if err == nil {
|
|
return nil, errors.New("No operation should have been started yet")
|
|
}
|
|
|
|
// Iterate in rebase operations regarding operation count
|
|
opCount := int(rebase.OperationCount())
|
|
for op := 0; op < opCount; op++ {
|
|
operation, err := rebase.Next()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Check operation index is correct
|
|
rebaseOperationIndex, err = rebase.CurrentOperationIndex()
|
|
if int(rebaseOperationIndex) != op {
|
|
return nil, errors.New("Bad operation index")
|
|
}
|
|
if !operationsAreEqual(rebase.OperationAt(uint(op)), operation) {
|
|
return nil, errors.New("Rebase operations should be equal")
|
|
}
|
|
|
|
// Get current rebase operation created commit
|
|
commit, err := repo.LookupCommit(operation.Id)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer commit.Free()
|
|
|
|
// Apply commit
|
|
err = rebase.Commit(operation.Id, signature(), signature(), commit.Message())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
return rebase, nil
|
|
}
|
|
|
|
func operationsAreEqual(l, r *RebaseOperation) bool {
|
|
return l.Exec == r.Exec && l.Type == r.Type && l.Id.String() == r.Id.String()
|
|
}
|
|
|
|
func createBranch(repo *Repository, branch string) error {
|
|
commit, err := headCommit(repo)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer commit.Free()
|
|
_, err = repo.CreateBranch(branch, commit, false)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func signature() *Signature {
|
|
return &Signature{
|
|
Name: "Emile",
|
|
Email: "emile@emile.com",
|
|
When: time.Now(),
|
|
}
|
|
}
|
|
|
|
func headCommit(repo *Repository) (*Commit, error) {
|
|
head, err := repo.Head()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer head.Free()
|
|
|
|
commit, err := repo.LookupCommit(head.Target())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return commit, nil
|
|
}
|
|
|
|
func headTree(repo *Repository) (*Tree, error) {
|
|
headCommit, err := headCommit(repo)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer headCommit.Free()
|
|
|
|
tree, err := headCommit.Tree()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return tree, nil
|
|
}
|
|
|
|
func commitSomething(repo *Repository, something, content string) (*Oid, error) {
|
|
headCommit, err := headCommit(repo)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer headCommit.Free()
|
|
|
|
index, err := NewIndex()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer index.Free()
|
|
|
|
blobOID, err := repo.CreateBlobFromBuffer([]byte(content))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
entry := &IndexEntry{
|
|
Mode: FilemodeBlob,
|
|
Id: blobOID,
|
|
Path: something,
|
|
}
|
|
|
|
if err := index.Add(entry); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
newTreeOID, err := index.WriteTreeTo(repo)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
newTree, err := repo.LookupTree(newTreeOID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer newTree.Free()
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
commit, err := repo.CreateCommit("HEAD", signature(), signature(), "Test rebase, Baby! "+something, newTree, headCommit)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
opts := &CheckoutOpts{
|
|
Strategy: CheckoutRemoveUntracked | CheckoutForce,
|
|
}
|
|
err = repo.CheckoutIndex(index, opts)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return commit, nil
|
|
}
|
|
|
|
func entryExists(repo *Repository, file string) bool {
|
|
headTree, err := headTree(repo)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
defer headTree.Free()
|
|
|
|
_, err = headTree.EntryByPath(file)
|
|
|
|
return err == nil
|
|
}
|
|
|
|
func commitMsgsList(repo *Repository) ([]string, error) {
|
|
head, err := headCommit(repo)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer head.Free()
|
|
|
|
var commits []string
|
|
|
|
parent := head.Parent(0)
|
|
defer parent.Free()
|
|
commits = append(commits, head.Message(), parent.Message())
|
|
|
|
for parent.ParentCount() != 0 {
|
|
parent = parent.Parent(0)
|
|
defer parent.Free()
|
|
commits = append(commits, parent.Message())
|
|
}
|
|
|
|
return commits, nil
|
|
}
|
|
|
|
func assertStringList(t *testing.T, expected, actual []string) {
|
|
if len(expected) != len(actual) {
|
|
t.Fatal("Lists are not the same size, expected " + strconv.Itoa(len(expected)) +
|
|
", got " + strconv.Itoa(len(actual)))
|
|
}
|
|
for index, element := range expected {
|
|
if element != actual[index] {
|
|
t.Error("Expected element " + strconv.Itoa(index) + " to be " + element + ", got " + actual[index])
|
|
}
|
|
}
|
|
}
|