thodg/libgit2/tests/apply/index.c

• Show log

  Commit

• Hash : 37b25ac5
  Author :
  Date : 2018-07-08T16:12:58
  

  apply: move location to an argument, not the opts Move the location option to an argument, out of the options structure. This allows the options structure to be re-used for functions that don't need to know the location, since it's implicit in their functionality. For example, `git_apply_tree` should not take a location, but is expected to take all the other options.

Download

• tests/apply/index.c

• #include "clar_libgit2.h"
  #include "apply_helpers.h"
  
  static git_repository *repo;
  
  #define TEST_REPO_PATH "merge-recursive"
  
  void test_apply_index__initialize(void)
  {
  	git_oid oid;
  	git_commit *commit;
  
  	repo = cl_git_sandbox_init(TEST_REPO_PATH);
  
  	git_oid_fromstr(&oid, "539bd011c4822c560c1d17cab095006b7a10f707");
  	cl_git_pass(git_commit_lookup(&commit, repo, &oid));
  	cl_git_pass(git_reset(repo, (git_object *)commit, GIT_RESET_HARD, NULL));
  	git_commit_free(commit);
  }
  
  void test_apply_index__cleanup(void)
  {
  	cl_git_sandbox_cleanup();
  }
  
  void test_apply_index__generate_diff(void)
  {
  	git_oid a_oid, b_oid;
  	git_commit *a_commit, *b_commit;
  	git_tree *a_tree, *b_tree;
  	git_diff *diff;
  	git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
  
  	struct merge_index_entry index_expected[] = {
  		{ 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
  		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
  	};
  	size_t index_expected_cnt = sizeof(index_expected) /
  		sizeof(struct merge_index_entry);
  
  	git_oid_fromstr(&a_oid, "539bd011c4822c560c1d17cab095006b7a10f707");
  	git_oid_fromstr(&b_oid, "7c7bf85e978f1d18c0566f702d2cb7766b9c8d4f");
  	cl_git_pass(git_commit_lookup(&a_commit, repo, &a_oid));
  	cl_git_pass(git_commit_lookup(&b_commit, repo, &b_oid));
  
  	cl_git_pass(git_commit_tree(&a_tree, a_commit));
  	cl_git_pass(git_commit_tree(&b_tree, b_commit));
  
  	cl_git_pass(git_diff_tree_to_tree(&diff, repo, a_tree, b_tree, &diff_opts));
  	cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
  
  	validate_apply_index(repo, index_expected, index_expected_cnt);
  	validate_workdir_unchanged(repo);
  
  	git_diff_free(diff);
  	git_tree_free(a_tree);
  	git_tree_free(b_tree);
  	git_commit_free(a_commit);
  	git_commit_free(b_commit);
  }
  
  void test_apply_index__parsed_diff(void)
  {
  	git_diff *diff;
  
  	struct merge_index_entry index_expected[] = {
  		{ 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
  		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
  	};
  	size_t index_expected_cnt = sizeof(index_expected) /
  		sizeof(struct merge_index_entry);
  
  	cl_git_pass(git_diff_from_buffer(&diff,
  		DIFF_MODIFY_TWO_FILES, strlen(DIFF_MODIFY_TWO_FILES)));
  	cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
  
  	validate_apply_index(repo, index_expected, index_expected_cnt);
  	validate_workdir_unchanged(repo);
  
  	git_diff_free(diff);
  }
  
  void test_apply_index__removes_file(void)
  {
  	git_diff *diff;
  
  	struct merge_index_entry index_expected[] = {
  		{ 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
  		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
  	};
  	size_t index_expected_cnt = sizeof(index_expected) /
  	    sizeof(struct merge_index_entry);
  
  	cl_git_pass(git_diff_from_buffer(&diff, DIFF_DELETE_FILE,
  		strlen(DIFF_DELETE_FILE)));
  	cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
  
  	validate_apply_index(repo, index_expected, index_expected_cnt);
  	validate_workdir_unchanged(repo);
  
  	git_diff_free(diff);
  }
  
  void test_apply_index__adds_file(void)
  {
  	git_diff *diff;
  
  	struct merge_index_entry index_expected[] = {
  		{ 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
  		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  		{ 0100644, "6370543fcfedb3e6516ec53b06158f3687dc1447", 0, "newfile.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
  	};
  	size_t index_expected_cnt = sizeof(index_expected) /
  	    sizeof(struct merge_index_entry);
  
  	cl_git_pass(git_diff_from_buffer(&diff,
  		DIFF_ADD_FILE, strlen(DIFF_ADD_FILE)));
  	cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
  
  	validate_apply_index(repo, index_expected, index_expected_cnt);
  	validate_workdir_unchanged(repo);
  
  	git_diff_free(diff);
  }
  
  void test_apply_index__modified_workdir_with_unmodified_index_is_ok(void)
  {
  	git_diff *diff;
  
  	const char *diff_file = DIFF_MODIFY_TWO_FILES;
  
  	struct merge_index_entry index_expected[] = {
  		{ 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
  		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
  	};
  	size_t index_expected_cnt = sizeof(index_expected) /
  		sizeof(struct merge_index_entry);
  
  	struct merge_index_entry workdir_expected[] = {
  		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "f75ba05f340c51065cbea2e1fdbfe5fe13144c97", 0, "veal.txt" }
  	};
  	size_t workdir_expected_cnt = sizeof(workdir_expected) /
  		sizeof(struct merge_index_entry);
  
  	/* mutate the workdir and leave the index matching HEAD */
  	cl_git_rmfile("merge-recursive/asparagus.txt");
  	cl_git_rewritefile("merge-recursive/veal.txt", "Hello, world.\n");
  
  	cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
  	cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
  
  	validate_apply_index(repo, index_expected, index_expected_cnt);
  	validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
  
  	git_diff_free(diff);
  }
  
  void test_apply_index__application_failure_leaves_index_unmodified(void)
  {
  	git_diff *diff;
  	git_index *index;
  
  	const char *diff_file = DIFF_MODIFY_TWO_FILES;
  
  	struct merge_index_entry index_expected[] = {
  		{ 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
  		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  	};
  	size_t index_expected_cnt = sizeof(index_expected) /
  		sizeof(struct merge_index_entry);
  
  	/* mutate the index */
  	cl_git_pass(git_repository_index(&index, repo));
  	cl_git_pass(git_index_remove(index, "veal.txt", 0));
  	cl_git_pass(git_index_write(index));
  	git_index_free(index);
  
  	cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
  	cl_git_fail_with(GIT_EAPPLYFAIL, git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
  
  	validate_apply_index(repo, index_expected, index_expected_cnt);
  
  	git_diff_free(diff);
  }
  
  void test_apply_index__keeps_nonconflicting_changes(void)
  {
  	git_diff *diff;
  	git_index *index;
  	git_index_entry idx_entry;
  
  	const char *diff_file = DIFF_MODIFY_TWO_FILES;
  
  	struct merge_index_entry index_expected[] = {
  		{ 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
  		{ 0100644, "898d12687fb35be271c27c795a6b32c8b51da79e", 0, "beef.txt" },
  		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
  	};
  	size_t index_expected_cnt = sizeof(index_expected) /
  		sizeof(struct merge_index_entry);
  
  	/* mutate the index */
  	cl_git_pass(git_repository_index(&index, repo));
  
  	memset(&idx_entry, 0, sizeof(git_index_entry));
  	idx_entry.mode = 0100644;
  	idx_entry.path = "beef.txt";
  	cl_git_pass(git_oid_fromstr(&idx_entry.id, "898d12687fb35be271c27c795a6b32c8b51da79e"));
  	cl_git_pass(git_index_add(index, &idx_entry));
  
  	cl_git_pass(git_index_remove(index, "bouilli.txt", 0));
  	cl_git_pass(git_index_write(index));
  	git_index_free(index);
  
  	cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
  	cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
  
  	validate_apply_index(repo, index_expected, index_expected_cnt);
  	validate_workdir_unchanged(repo);
  
  	git_diff_free(diff);
  }
  
  void test_apply_index__can_apply_nonconflicting_file_changes(void)
  {
  	git_diff *diff;
  	git_index *index;
  	git_index_entry idx_entry;
  
  	const char *diff_file = DIFF_MODIFY_TWO_FILES;
  
  	struct merge_index_entry index_expected[] = {
  		{ 0100644, "4f2d1645dee99ced096877911de540c65ade2ef8", 0, "asparagus.txt" },
  		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
  	};
  	size_t index_expected_cnt = sizeof(index_expected) /
  		sizeof(struct merge_index_entry);
  
  	/*
  	 * Replace the index entry with a version that is different than
  	 * HEAD but such that the patch still applies cleanly.  This item
  	 * has a new line appended.
  	 */
  
  	cl_git_pass(git_repository_index(&index, repo));
  
  	memset(&idx_entry, 0, sizeof(git_index_entry));
  	idx_entry.mode = 0100644;
  	idx_entry.path = "asparagus.txt";
  	cl_git_pass(git_oid_fromstr(&idx_entry.id, "06d3fefb8726ab1099acc76e02dfb85e034b2538"));
  	cl_git_pass(git_index_add(index, &idx_entry));
  
  	cl_git_pass(git_index_write(index));
  	git_index_free(index);
  
  	cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
  	cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
  
  	validate_apply_index(repo, index_expected, index_expected_cnt);
  	validate_workdir_unchanged(repo);
  
  	git_diff_free(diff);
  }
  
  void test_apply_index__change_mode(void)
  {
  	git_diff *diff;
  
  	const char *diff_file = DIFF_EXECUTABLE_FILE;
  
  	struct merge_index_entry index_expected[] = {
  		{ 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
  		{ 0100755, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
  	};
  	size_t index_expected_cnt = sizeof(index_expected) /
  		sizeof(struct merge_index_entry);
  
  	cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
  	cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
  
  	validate_apply_index(repo, index_expected, index_expected_cnt);
  	validate_workdir_unchanged(repo);
  
  	git_diff_free(diff);
  }
  

Download