Add Abort() service to wrapper
diff --git a/rebase.go b/rebase.go
index fb3d612..ee409df 100644
--- a/rebase.go
+++ b/rebase.go
@@ -50,6 +50,15 @@
ptr *C.git_rebase
}
+// Abort aborts a rebase that is currently in progress, resetting the repository and working directory to their state before rebase began.
+func (rebase *Rebase) Abort() error {
+ err := C.git_rebase_abort(rebase.ptr)
+ if err < 0 {
+ return MakeGitError(err)
+ }
+ return nil
+}
+
//RebaseInit initializes a rebase operation to rebase the changes in branch relative to upstream onto another branch.
func (r *Repository) RebaseInit(branch *AnnotatedCommit, upstream *AnnotatedCommit, onto *AnnotatedCommit, opts *RebaseOptions) (*Rebase, error) {
runtime.LockOSThread()
@@ -158,7 +167,6 @@
/* TODO -- Add last wrapper services and manage rebase_options
-int git_rebase_abort(git_rebase *rebase);
int git_rebase_init_options(git_rebase_options *opts, unsigned int version);
int git_rebase_open(git_rebase **out, git_repository *repo, const git_rebase_options *opts);
git_rebase_operation * git_rebase_operation_byindex(git_rebase *rebase, size_t idx);
diff --git a/rebase_test.go b/rebase_test.go
index 7106e7f..dc5aeb3 100644
--- a/rebase_test.go
+++ b/rebase_test.go
@@ -9,6 +9,58 @@
// Tests
+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)
+ seedTestRepo(t, repo)
+
+ // Setup a repo with 2 branches and a different tree
+ err := setupRepoForRebase(repo, masterCommit, branchName)
+ checkFatal(t, err)
+ defer cleanupTestRepo(t, repo)
+
+ // 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
@@ -23,10 +75,10 @@
// Outputs
expectedHistory := []string{
- "Test rebase onto, Baby! " + emileCommits[2],
- "Test rebase onto, Baby! " + emileCommits[1],
- "Test rebase onto, Baby! " + emileCommits[0],
- "Test rebase onto, Baby! " + masterCommit,
+ "Test rebase, Baby! " + emileCommits[2],
+ "Test rebase, Baby! " + emileCommits[1],
+ "Test rebase, Baby! " + emileCommits[0],
+ "Test rebase, Baby! " + masterCommit,
"This is a commit\n",
}
@@ -46,7 +98,12 @@
}
// Rebase onto master
- err = performRebaseOnto(repo, "master")
+ rebase, err := performRebaseOnto(repo, "master")
+ checkFatal(t, err)
+ defer rebase.Free()
+
+ // Finish the rebase properly
+ err = rebase.Finish()
checkFatal(t, err)
// Check history is in correct order
@@ -84,51 +141,45 @@
return nil
}
-func performRebaseOnto(repo *Repository, branch string) error {
+func performRebaseOnto(repo *Repository, branch string) (*Rebase, error) {
master, err := repo.LookupBranch(branch, BranchLocal)
if err != nil {
- return err
+ return nil, err
}
defer master.Free()
onto, err := repo.AnnotatedCommitFromRef(master.Reference)
if err != nil {
- return err
+ return nil, err
}
defer onto.Free()
rebase, err := repo.RebaseInit(nil, nil, onto, nil)
if err != nil {
- return err
+ return nil, err
}
- defer rebase.Free()
opCount := int(rebase.OperationCount())
for op := 0; op < opCount; op++ {
operation, err := rebase.Next()
if err != nil {
- return err
+ return nil, err
}
commit, err := repo.LookupCommit(operation.ID)
if err != nil {
- return err
+ return nil, err
}
defer commit.Free()
err = rebase.Commit(operation.ID, signature(), signature(), commit.Message())
if err != nil {
- return err
+ return nil, err
}
}
- err = rebase.Finish()
- if err != nil {
- return err
- }
-
- return nil
+ return rebase, nil
}
func createBranch(repo *Repository, branch string) error {
@@ -225,7 +276,7 @@
if err != nil {
return nil, err
}
- commit, err := repo.CreateCommit("HEAD", signature(), signature(), "Test rebase onto, Baby! "+something, newTree, headCommit)
+ commit, err := repo.CreateCommit("HEAD", signature(), signature(), "Test rebase, Baby! "+something, newTree, headCommit)
if err != nil {
return nil, err
}
