Merge pull request #545 from libgit2/vmg/revert

Revert commits!

Author: Vicent Marti

ext/rugged/rugged_repo.c

@@ -829,6 +829,62 @@ static VALUE rb_git_repo_merge_analysis(int argc, VALUE *argv, VALUE self)
 	return result;
 }
 
+/*
+ *  call-seq:
+ *    repo.revert_commit(revert_commit, our_commit, options = {}) -> index
+ *    
+ *	Reverts the given commit against the given "our" commit, producing an
+ *	index that reflects the result of the revert.
+ */
+static VALUE rb_git_repo_revert_commit(int argc, VALUE *argv, VALUE self)
+{
+	VALUE rb_revert_commit, rb_our_commit, rb_options;
+	git_commit *revert_commit, *our_commit;
+	git_index *index;
+	git_repository *repo;
+	git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
+	unsigned int mainline = 0;
+	int error;
+
+	rb_scan_args(argc, argv, "20:", &rb_revert_commit, &rb_our_commit, &rb_options);
+
+	if (TYPE(rb_revert_commit) == T_STRING)
+		rb_revert_commit = rugged_object_rev_parse(self, rb_revert_commit, 1);
+
+	if (TYPE(rb_our_commit) == T_STRING)
+		rb_our_commit = rugged_object_rev_parse(self, rb_our_commit, 1);
+
+	if (!rb_obj_is_kind_of(rb_revert_commit, rb_cRuggedCommit) ||
+		!rb_obj_is_kind_of(rb_our_commit, rb_cRuggedCommit)) {
+		rb_raise(rb_eArgError, "Expected a Rugged::Commit.");
+	}
+
+	if (!NIL_P(rb_options)) {
+		VALUE rb_mainline;
+
+		Check_Type(rb_options, T_HASH);
+		rugged_parse_merge_options(&opts, rb_options);
+
+		rb_mainline = rb_hash_aref(rb_options, CSTR2SYM("mainline"));
+		if (!NIL_P(rb_mainline)) {
+			Check_Type(rb_mainline, T_FIXNUM);
+			mainline = FIX2UINT(rb_mainline);
+		}
+	}
+
+	Data_Get_Struct(self, git_repository, repo);
+	Data_Get_Struct(rb_revert_commit, git_commit, revert_commit);
+	Data_Get_Struct(rb_our_commit, git_commit, our_commit);
+
+	error = git_revert_commit(&index, repo, revert_commit, our_commit, mainline, &opts);
+	if (error == GIT_EMERGECONFLICT)
+		return Qnil;
+
+	rugged_exception_check(error);
+
+	return rugged_index_new(rb_cRuggedIndex, self, index);
+}
+
 /*
  *  call-seq:
  *    repo.merge_commits(our_commit, their_commit, options = {}) -> index
@@ -2528,6 +2584,8 @@ void Init_rugged_repo(void)
 	rb_define_method(rb_cRuggedRepo, "merge_analysis", rb_git_repo_merge_analysis, -1);
 	rb_define_method(rb_cRuggedRepo, "merge_commits", rb_git_repo_merge_commits, -1);
 
+	rb_define_method(rb_cRuggedRepo, "revert_commit", rb_git_repo_revert_commit, -1);
+
 	rb_define_method(rb_cRuggedRepo, "path_ignored?", rb_git_repo_is_path_ignored, 1);
 
 	rb_define_method(rb_cRuggedRepo, "reset", rb_git_repo_reset, 2);

test/remote_test.rb

@@ -202,11 +202,6 @@ def test_fetch_prune_nil
     assert_equal "8496071c1b46c854b31185ea97743be6a8774479", @repo.ref("refs/remotes/origin/unit_test").target_id
   end
 
-  def test_fetch_prune_nil
-    @remote.fetch(prune: nil)
-    assert_equal "8496071c1b46c854b31185ea97743be6a8774479", @repo.ref("refs/remotes/origin/unit_test").target_id
-  end
-
   def test_fetch_prune_with_invalid_argument_raises
     assert_raises TypeError do
       @remote.fetch(prune: 'INVALID')

test/revert_test.rb

@@ -0,0 +1,64 @@
+require "test_helper"
+
+class RevertTest < Rugged::TestCase
+  def setup
+    @repo = FixtureRepo.from_libgit2("revert")
+  end
+
+  def verify_index(index, expected)
+    assert index.is_a?(Rugged::Index)
+    assert_equal expected.count, index.count
+    expected.each_with_index do |(mode, oid, stage, path), i|
+      entry = index[i]
+      assert entry
+      assert_equal path, entry[:path]
+      assert_equal mode, entry[:mode]
+      assert_equal oid, entry[:oid]
+      assert_equal stage, entry[:stage]
+    end
+  end
+
+  def test_revert_automerge
+    expected = [
+      [0100644, "caf99de3a49827117bb66721010eac461b06a80c", 0, "file1.txt"],
+      [0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt"],
+      [0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt"],
+      [0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt"]]
+
+    ours = Rugged::Commit.lookup(@repo, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45")
+    revert = Rugged::Commit.lookup(@repo, "d1d403d22cbe24592d725f442835cf46fe60c8ac")
+
+    index = @repo.revert_commit(revert, ours)
+    verify_index(index, expected)
+  end
+
+  def test_revert_with_conflicts
+    expected = [
+      [0100644, "7731926a337c4eaba1e2187d90ebfa0a93659382", 1, "file1.txt"],
+      [0100644, "4b8fcff56437e60f58e9a6bc630dd242ebf6ea2c", 2, "file1.txt"],
+      [0100644, "3a3ef367eaf3fe79effbfb0a56b269c04c2b59fe", 3, "file1.txt"],
+      [0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt"],
+      [0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt"],
+      [0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt"]]
+
+    revert = Rugged::Commit.lookup(@repo, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45")
+
+    index = @repo.revert_commit(revert, "HEAD")
+    assert index.conflicts?
+    verify_index(index, expected)
+
+    index = @repo.revert_commit(revert, "HEAD", :fail_on_conflict => true)
+    refute index
+  end
+
+  def test_revert_orphan
+		expected = [
+      [0100644, "296a6d3be1dff05c5d1f631d2459389fa7b619eb", 0, "file-mainline.txt"]]
+
+    head = Rugged::Commit.lookup(@repo,"39467716290f6df775a91cdb9a4eb39295018145")
+    revert = Rugged::Commit.lookup(@repo, "ebb03002cee5d66c7732dd06241119fe72ab96a5")
+
+    index = @repo.revert_commit(revert, head)
+    verify_index(index, expected)
+  end
+end