thodg/libgit2/tests/index/reuc.c

• Show log

  Commit

• Hash : 6affd71f
  Author :
  Date : 2014-01-03T17:38:34
  

  git_checkout_opts -> git_checkout_options

Download

• tests/index/reuc.c

• #include "clar_libgit2.h"
  #include "index.h"
  #include "git2/sys/index.h"
  #include "git2/repository.h"
  #include "../reset/reset_helpers.h"
  
  static git_repository *repo;
  static git_index *repo_index;
  
  #define TEST_REPO_PATH "mergedrepo"
  #define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index"
  
  #define ONE_ANCESTOR_OID "478871385b9cd03908c5383acfd568bef023c6b3"
  #define ONE_OUR_OID "4458b8bc9e72b6c8755ae456f60e9844d0538d8c"
  #define ONE_THEIR_OID "8b72416545c7e761b64cecad4f1686eae4078aa8"
  
  #define TWO_ANCESTOR_OID "9d81f82fccc7dcd7de7a1ffead1815294c2e092c"
  #define TWO_OUR_OID "8f3c06cff9a83757cec40c80bc9bf31a2582bde9"
  #define TWO_THEIR_OID "887b153b165d32409c70163e0f734c090f12f673"
  
  // Fixture setup and teardown
  void test_index_reuc__initialize(void)
  {
  	repo = cl_git_sandbox_init("mergedrepo");
  	git_repository_index(&repo_index, repo);
  }
  
  void test_index_reuc__cleanup(void)
  {
  	git_index_free(repo_index);
  	repo_index = NULL;
  
  	cl_git_sandbox_cleanup();
  }
  
  void test_index_reuc__add(void)
  {
  	git_oid ancestor_oid, our_oid, their_oid;
  	const git_index_reuc_entry *reuc;
  
  	git_oid_fromstr(&ancestor_oid, ONE_ANCESTOR_OID);
  	git_oid_fromstr(&our_oid, ONE_OUR_OID);
  	git_oid_fromstr(&their_oid, ONE_THEIR_OID);
  
  	cl_git_pass(git_index_reuc_add(repo_index, "newfile.txt",
  		0100644, &ancestor_oid,
  		0100644, &our_oid,
  		0100644, &their_oid));
  
  	cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "newfile.txt"));
  
  	cl_assert_equal_s("newfile.txt", reuc->path);
  	cl_assert(reuc->mode[0] == 0100644);
  	cl_assert(reuc->mode[1] == 0100644);
  	cl_assert(reuc->mode[2] == 0100644);
  	cl_assert(git_oid_cmp(&reuc->oid[0], &ancestor_oid) == 0);
  	cl_assert(git_oid_cmp(&reuc->oid[1], &our_oid) == 0);
  	cl_assert(git_oid_cmp(&reuc->oid[2], &their_oid) == 0);
  }
  
  void test_index_reuc__add_no_ancestor(void)
  {
  	git_oid ancestor_oid, our_oid, their_oid;
  	const git_index_reuc_entry *reuc;
  
  	memset(&ancestor_oid, 0x0, sizeof(git_oid));
  	git_oid_fromstr(&our_oid, ONE_OUR_OID);
  	git_oid_fromstr(&their_oid, ONE_THEIR_OID);
  
  	cl_git_pass(git_index_reuc_add(repo_index, "newfile.txt",
  		0, NULL,
  		0100644, &our_oid,
  		0100644, &their_oid));
  
  	cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "newfile.txt"));
  
  	cl_assert_equal_s("newfile.txt", reuc->path);
  	cl_assert(reuc->mode[0] == 0);
  	cl_assert(reuc->mode[1] == 0100644);
  	cl_assert(reuc->mode[2] == 0100644);
  	cl_assert(git_oid_cmp(&reuc->oid[0], &ancestor_oid) == 0);
  	cl_assert(git_oid_cmp(&reuc->oid[1], &our_oid) == 0);
  	cl_assert(git_oid_cmp(&reuc->oid[2], &their_oid) == 0);
  }
  
  void test_index_reuc__read_bypath(void)
  {
  	const git_index_reuc_entry *reuc;
  	git_oid oid;
  
  	cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index));
  
  	cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "two.txt"));
  
  	cl_assert_equal_s("two.txt", reuc->path);
  	cl_assert(reuc->mode[0] == 0100644);
  	cl_assert(reuc->mode[1] == 0100644);
  	cl_assert(reuc->mode[2] == 0100644);
  	git_oid_fromstr(&oid, TWO_ANCESTOR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
  	git_oid_fromstr(&oid, TWO_OUR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
  	git_oid_fromstr(&oid, TWO_THEIR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
  
  	cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "one.txt"));
  
  	cl_assert_equal_s("one.txt", reuc->path);
  	cl_assert(reuc->mode[0] == 0100644);
  	cl_assert(reuc->mode[1] == 0100644);
  	cl_assert(reuc->mode[2] == 0100644);
  	git_oid_fromstr(&oid, ONE_ANCESTOR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
  	git_oid_fromstr(&oid, ONE_OUR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
  	git_oid_fromstr(&oid, ONE_THEIR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
  }
  
  void test_index_reuc__ignore_case(void)
  {
  	const git_index_reuc_entry *reuc;
  	git_oid oid;
  	int index_caps;
  
  	index_caps = git_index_caps(repo_index);
  
  	index_caps &= ~GIT_INDEXCAP_IGNORE_CASE;
  	cl_git_pass(git_index_set_caps(repo_index, index_caps));
  
  	cl_assert(!git_index_reuc_get_bypath(repo_index, "TWO.txt"));
  
  	index_caps |= GIT_INDEXCAP_IGNORE_CASE;
  	cl_git_pass(git_index_set_caps(repo_index, index_caps));
  
  	cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index));
  
  	cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "TWO.txt"));
  
  	cl_assert_equal_s("two.txt", reuc->path);
  	cl_assert(reuc->mode[0] == 0100644);
  	cl_assert(reuc->mode[1] == 0100644);
  	cl_assert(reuc->mode[2] == 0100644);
  	git_oid_fromstr(&oid, TWO_ANCESTOR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
  	git_oid_fromstr(&oid, TWO_OUR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
  	git_oid_fromstr(&oid, TWO_THEIR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
  }
  
  void test_index_reuc__read_byindex(void)
  {
  	const git_index_reuc_entry *reuc;
  	git_oid oid;
  
  	cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index));
  
  	cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 0));
  
  	cl_assert_equal_s("one.txt", reuc->path);
  	cl_assert(reuc->mode[0] == 0100644);
  	cl_assert(reuc->mode[1] == 0100644);
  	cl_assert(reuc->mode[2] == 0100644);
  	git_oid_fromstr(&oid, ONE_ANCESTOR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
  	git_oid_fromstr(&oid, ONE_OUR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
  	git_oid_fromstr(&oid, ONE_THEIR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
  
  	cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 1));
  
  	cl_assert_equal_s("two.txt", reuc->path);
  	cl_assert(reuc->mode[0] == 0100644);
  	cl_assert(reuc->mode[1] == 0100644);
  	cl_assert(reuc->mode[2] == 0100644);
  	git_oid_fromstr(&oid, TWO_ANCESTOR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
  	git_oid_fromstr(&oid, TWO_OUR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
  	git_oid_fromstr(&oid, TWO_THEIR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
  }
  
  void test_index_reuc__updates_existing(void)
  {
  	const git_index_reuc_entry *reuc;
  	git_oid ancestor_oid, our_oid, their_oid, oid;
  	int index_caps;
  
  	git_index_clear(repo_index);
  
  	index_caps = git_index_caps(repo_index);
  
  	index_caps |= GIT_INDEXCAP_IGNORE_CASE;
  	cl_git_pass(git_index_set_caps(repo_index, index_caps));
  
  	git_oid_fromstr(&ancestor_oid, TWO_ANCESTOR_OID);
  	git_oid_fromstr(&our_oid, TWO_OUR_OID);
  	git_oid_fromstr(&their_oid, TWO_THEIR_OID);
  
  	cl_git_pass(git_index_reuc_add(repo_index, "two.txt",
  		0100644, &ancestor_oid,
  		0100644, &our_oid,
  		0100644, &their_oid));
  
  	cl_git_pass(git_index_reuc_add(repo_index, "TWO.txt",
  		0100644, &our_oid,
  		0100644, &their_oid,
  		0100644, &ancestor_oid));
  
  	cl_assert_equal_i(1, git_index_reuc_entrycount(repo_index));
  
  	cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 0));
  
  	cl_assert_equal_s("TWO.txt", reuc->path);
  	git_oid_fromstr(&oid, TWO_OUR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
  	git_oid_fromstr(&oid, TWO_THEIR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
  	git_oid_fromstr(&oid, TWO_ANCESTOR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
  }
  
  void test_index_reuc__remove(void)
  {
  	git_oid oid;
  	const git_index_reuc_entry *reuc;
  
  	cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index));
  
  	cl_git_pass(git_index_reuc_remove(repo_index, 0));
  	cl_git_fail(git_index_reuc_remove(repo_index, 1));
  
  	cl_assert_equal_i(1, git_index_reuc_entrycount(repo_index));
  
  	cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 0));
  
  	cl_assert_equal_s("two.txt", reuc->path);
  	cl_assert(reuc->mode[0] == 0100644);
  	cl_assert(reuc->mode[1] == 0100644);
  	cl_assert(reuc->mode[2] == 0100644);
  	git_oid_fromstr(&oid, TWO_ANCESTOR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0);
  	git_oid_fromstr(&oid, TWO_OUR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0);
  	git_oid_fromstr(&oid, TWO_THEIR_OID);
  	cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0);
  }
  
  void test_index_reuc__write(void)
  {
  	git_oid ancestor_oid, our_oid, their_oid;
  	const git_index_reuc_entry *reuc;
  
  	git_index_clear(repo_index);
  
  	/* Write out of order to ensure sorting is correct */
  	git_oid_fromstr(&ancestor_oid, TWO_ANCESTOR_OID);
  	git_oid_fromstr(&our_oid, TWO_OUR_OID);
  	git_oid_fromstr(&their_oid, TWO_THEIR_OID);
  
  	cl_git_pass(git_index_reuc_add(repo_index, "two.txt",
  		0100644, &ancestor_oid,
  		0100644, &our_oid,
  		0100644, &their_oid));
  
  	git_oid_fromstr(&ancestor_oid, ONE_ANCESTOR_OID);
  	git_oid_fromstr(&our_oid, ONE_OUR_OID);
  	git_oid_fromstr(&their_oid, ONE_THEIR_OID);
  
  	cl_git_pass(git_index_reuc_add(repo_index, "one.txt",
  		0100644, &ancestor_oid,
  		0100644, &our_oid,
  		0100644, &their_oid));
  
  	cl_git_pass(git_index_write(repo_index));
  	cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index));
  
  	/* ensure sort order was round-tripped correct */
  	cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 0));
  	cl_assert_equal_s("one.txt", reuc->path);
  
  	cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 1));
  	cl_assert_equal_s("two.txt", reuc->path);
  }
  
  static int reuc_entry_exists(void)
  {
  	return (git_index_reuc_get_bypath(repo_index, "newfile.txt") != NULL);
  }
  
  void test_index_reuc__cleaned_on_reset_hard(void)
  {
  	git_object *target;
  
  	cl_git_pass(git_revparse_single(&target, repo, "3a34580"));
  
  	test_index_reuc__add();
  	cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL, NULL));
  	cl_assert(reuc_entry_exists() == false);
  
  	git_object_free(target);
  }
  
  void test_index_reuc__cleaned_on_reset_mixed(void)
  {
  	git_object *target;
  
  	cl_git_pass(git_revparse_single(&target, repo, "3a34580"));
  
  	test_index_reuc__add();
  	cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL, NULL));
  	cl_assert(reuc_entry_exists() == false);
  
  	git_object_free(target);
  }
  
  void test_index_reuc__retained_on_reset_soft(void)
  {
  	git_object *target;
  
  	cl_git_pass(git_revparse_single(&target, repo, "3a34580"));
  
  	git_reset(repo, target, GIT_RESET_HARD, NULL, NULL);
  
  	test_index_reuc__add();
  	cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT, NULL, NULL));
  	cl_assert(reuc_entry_exists() == true);
  
  	git_object_free(target);
  }
  
  void test_index_reuc__cleaned_on_checkout_tree(void)
  {
  	git_oid oid;
  	git_object *obj;
  	git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
  
  	opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY;
  
  	test_index_reuc__add();
  	git_reference_name_to_id(&oid, repo, "refs/heads/master");
  	git_object_lookup(&obj, repo, &oid, GIT_OBJ_ANY);
  	git_checkout_tree(repo, obj, &opts);
  	cl_assert(reuc_entry_exists() == false);
  
  	git_object_free(obj);
  }
  
  void test_index_reuc__cleaned_on_checkout_head(void)
  {
  	git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
  
  	opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY;
  
  	test_index_reuc__add();
  	git_checkout_head(repo, &opts);
  	cl_assert(reuc_entry_exists() == false);
  }
  
  void test_index_reuc__retained_on_checkout_index(void)
  {
  	git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
  
  	opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY;
  
  	test_index_reuc__add();
  	git_checkout_index(repo, repo_index, &opts);
  	cl_assert(reuc_entry_exists() == true);
  }
  

Download