Add Repository#apply and tests.

Author: Dawa Ometto

ext/rugged/rugged.h

@@ -85,6 +85,7 @@ VALUE rb_merge_file_result_fromC(const git_merge_file_result *results);
 
 void rugged_parse_diff_options(git_diff_options *opts, VALUE rb_options);
 void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options);
+void rugged_parse_apply_options(git_apply_options *opts, git_apply_location_t *location, VALUE rb_options);
 void rugged_parse_checkout_options(git_checkout_options *opts, VALUE rb_options);
 void rugged_parse_merge_file_options(git_merge_file_options *opts, VALUE rb_options);
 

ext/rugged/rugged_repo.c

@@ -10,6 +10,7 @@
 #include <git2/sys/odb_backend.h>
 #include <git2/sys/refdb_backend.h>
 #include <git2/refs.h>
+#include <git2/apply.h>
 
 extern VALUE rb_mRugged;
 extern VALUE rb_eRuggedError;
@@ -18,6 +19,7 @@ extern VALUE rb_cRuggedConfig;
 extern VALUE rb_cRuggedBackend;
 extern VALUE rb_cRuggedRemote;
 extern VALUE rb_cRuggedCommit;
+extern VALUE rb_cRuggedDiff;
 extern VALUE rb_cRuggedTag;
 extern VALUE rb_cRuggedTree;
 extern VALUE rb_cRuggedReference;
@@ -868,6 +870,42 @@ static VALUE rb_git_repo_revert_commit(int argc, VALUE *argv, VALUE self)
 	return rugged_index_new(rb_cRuggedIndex, self, index);
 }
 
+/*
+ *  call-seq:
+ *    repo.apply(diff, options = {}) -> true or false
+ *
+ *	Applies the given diff to the repository.
+ */
+static VALUE rb_git_repo_apply(int argc, VALUE *argv, VALUE self)
+{
+	VALUE rb_diff, rb_options;
+	git_diff *diff;
+	git_repository *repo;
+	git_apply_options opts = GIT_APPLY_OPTIONS_INIT;
+	git_apply_location_t location = GIT_APPLY_LOCATION_BOTH;
+	int error;
+
+	rb_scan_args(argc, argv, "11", &rb_diff, &rb_options);
+
+	if (!rb_obj_is_kind_of(rb_diff, rb_cRuggedDiff)) {
+		rb_raise(rb_eArgError, "Expected a Rugged::Diff.");
+	}
+
+	if (!NIL_P(rb_options)) {
+		Check_Type(rb_options, T_HASH);
+		rugged_parse_apply_options(&opts, &location, rb_options);
+	}
+
+	Data_Get_Struct(self, git_repository, repo);
+	Data_Get_Struct(rb_diff, git_diff, diff);
+
+	error = git_apply(repo, diff, location, &opts);
+
+	rugged_exception_check(error);
+
+	return Qtrue;
+}
+
 /*
  *  call-seq:
  *    repo.merge_commits(our_commit, their_commit, options = {}) -> index
@@ -2543,6 +2581,33 @@ static VALUE rb_git_repo_cherrypick_commit(int argc, VALUE *argv, VALUE self)
 	return rugged_index_new(rb_cRuggedIndex, self, index);
 }
 
+void rugged_parse_apply_options(git_apply_options *opts, git_apply_location_t *location, VALUE rb_options)
+{
+	if (!NIL_P(rb_options)) {
+		VALUE rb_value;
+		Check_Type(rb_options, T_HASH);
+
+		rb_value = rb_hash_aref(rb_options, CSTR2SYM("location"));
+		if (!NIL_P(rb_value)) {
+			ID id_location;
+
+			Check_Type(rb_value, T_SYMBOL);
+			id_location = SYM2ID(rb_value);
+
+			if (id_location == rb_intern("both")) {
+				*location = GIT_APPLY_LOCATION_BOTH;
+			} else if (id_location == rb_intern("index")) {
+				*location = GIT_APPLY_LOCATION_INDEX;
+			} else if (id_location == rb_intern("workdir")) {
+				*location = GIT_APPLY_LOCATION_WORKDIR;
+			} else {
+				rb_raise(rb_eTypeError,
+					"Invalid location. Expected `:both`, `:index`, or `:workdir`");
+			}
+		}
+	}
+}
+
 void Init_rugged_repo(void)
 {
 	id_call = rb_intern("call");
@@ -2598,6 +2663,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, "apply", rb_git_repo_apply, -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);

test/repo_apply_test.rb

@@ -0,0 +1,101 @@
+require 'test_helper'
+require 'base64'
+
+module RepositoryApplyTestHelpers
+  def blob_contents(repo, path)
+    repo.lookup(repo.head.target.tree[path][:oid]).content
+  end
+
+  def update_file(repo, path)
+    original = blob_contents(repo, path)
+    content = new_content(original)
+    blob = repo.write(content, :blob)
+
+    index = repo.index
+    index.read_tree(repo.head.target.tree)
+    index.add(:path => path, :oid => blob, :mode => 0100644)
+    new_tree = index.write_tree(repo)
+
+    oid = do_commit(repo, new_tree, "Update #{path}")
+
+    return repo.lookup(oid), content, original
+  end
+
+  def do_commit(repo, tree, message)
+    Rugged::Commit.create(repo,
+      :tree => tree,
+      :author => person,
+      :committer => person,
+      :message => message,
+      :parents => repo.empty? ? [] : [ repo.head.target ].compact,
+      :update_ref => 'HEAD',
+    )
+  end
+
+  def new_content(original)
+    "#{original}Some new line\n"
+  end
+
+  def person
+    {:name => 'Scott', :email => '[email protected]', :time => Time.now }
+  end
+end
+
+class RepositoryApplyTest < Rugged::TestCase
+  include RepositoryApplyTestHelpers
+
+  def setup
+    @repo = FixtureRepo.from_libgit2("testrepo")
+  end
+
+  def test_apply_index
+    original_commit = @repo.head.target.oid
+    new_commit, new_content, original_content = update_file(@repo, 'README')
+
+    assert_equal @repo.lookup(@repo.index["README"][:oid]).content, new_content
+
+    diff = @repo.diff(new_commit, original_commit)
+
+    assert_equal true, @repo.apply(diff, {:location => :index})
+    assert_equal @repo.lookup(@repo.index["README"][:oid]).content, original_content
+  end
+
+  def test_apply_workdir
+    original_commit = @repo.head.target.oid
+    new_commit, new_content, original_content = update_file(@repo, 'README')
+
+    @repo.checkout_head(:strategy => :force)
+    assert_equal File.read(File.join(@repo.workdir, 'README')), new_content
+
+    diff = @repo.diff(new_commit, original_commit)
+
+    assert_equal true, @repo.apply(diff, {:location => :workdir})
+    assert_equal File.read(File.join(@repo.workdir, 'README')), original_content
+  end
+
+  def test_apply_both
+    original_commit = @repo.head.target.oid
+    new_commit, new_content, original_content = update_file(@repo, 'README')
+
+    @repo.checkout_head(:strategy => :force)
+    assert_equal @repo.lookup(@repo.index["README"][:oid]).content, new_content
+    assert_equal File.read(File.join(@repo.workdir, 'README')), new_content
+
+    diff = @repo.diff(new_commit, original_commit)
+
+    assert_equal true, @repo.apply(diff)
+    assert_equal @repo.lookup(@repo.index["README"][:oid]).content, original_content
+    assert_equal File.read(File.join(@repo.workdir, 'README')), original_content
+  end
+
+  def test_location_option
+    original_commit = @repo.head.target.oid
+    new_commit, new_content, original_content = update_file(@repo, 'README')
+
+    diff = @repo.diff(new_commit, original_commit)
+
+    assert_raises TypeError do
+      @repo.apply(diff, :location => :invalid)
+    end
+  end
+end