thodg/libgit2/tests-clar/submodule/modify.c

• Show log

  Commit

• Hash : 17b06f4d
  Author :
  Date : 2012-09-07T15:49:08
  

  Add missing accessor for fetchRecurseSubmodules When `git_submodule` became an opaque structure, I forgot to add accessor functions for the fetchRecurseSubmodules config setting. This fixes that.

Download

• tests-clar/submodule/modify.c

• #include "clar_libgit2.h"
  #include "posix.h"
  #include "path.h"
  #include "submodule_helpers.h"
  
  static git_repository *g_repo = NULL;
  
  #define SM_LIBGIT2_URL "https://github.com/libgit2/libgit2.git"
  #define SM_LIBGIT2     "sm_libgit2"
  #define SM_LIBGIT2B    "sm_libgit2b"
  
  void test_submodule_modify__initialize(void)
  {
  	g_repo = cl_git_sandbox_init("submod2");
  
  	cl_fixture_sandbox("submod2_target");
  	p_rename("submod2_target/.gitted", "submod2_target/.git");
  
  	/* must create submod2_target before rewrite so prettify will work */
  	rewrite_gitmodules(git_repository_workdir(g_repo));
  	p_rename("submod2/not_submodule/.gitted", "submod2/not_submodule/.git");
  }
  
  void test_submodule_modify__cleanup(void)
  {
  	cl_git_sandbox_cleanup();
  	cl_fixture_cleanup("submod2_target");
  }
  
  void test_submodule_modify__add(void)
  {
  	git_submodule *sm;
  	git_config *cfg;
  	const char *s;
  
  	/* re-add existing submodule */
  	cl_assert(
  		git_submodule_add_setup(NULL, g_repo, "whatever", "sm_unchanged", 1) ==
  		GIT_EEXISTS );
  
  	/* add a submodule using a gitlink */
  
  	cl_git_pass(
  		git_submodule_add_setup(&sm, g_repo, SM_LIBGIT2_URL, SM_LIBGIT2, 1)
  		);
  
  	cl_assert(git_path_isfile("submod2/" SM_LIBGIT2 "/.git"));
  
  	cl_assert(git_path_isdir("submod2/.git/modules"));
  	cl_assert(git_path_isdir("submod2/.git/modules/" SM_LIBGIT2));
  	cl_assert(git_path_isfile("submod2/.git/modules/" SM_LIBGIT2 "/HEAD"));
  
  	cl_git_pass(git_repository_config(&cfg, g_repo));
  	cl_git_pass(
  		git_config_get_string(&s, cfg, "submodule." SM_LIBGIT2 ".url"));
  	cl_assert_equal_s(s, SM_LIBGIT2_URL);
  	git_config_free(cfg);
  
  	/* add a submodule not using a gitlink */
  
  	cl_git_pass(
  		git_submodule_add_setup(&sm, g_repo, SM_LIBGIT2_URL, SM_LIBGIT2B, 0)
  		);
  
  	cl_assert(git_path_isdir("submod2/" SM_LIBGIT2B "/.git"));
  	cl_assert(git_path_isfile("submod2/" SM_LIBGIT2B "/.git/HEAD"));
  	cl_assert(!git_path_exists("submod2/.git/modules/" SM_LIBGIT2B));
  
  	cl_git_pass(git_repository_config(&cfg, g_repo));
  	cl_git_pass(
  		git_config_get_string(&s, cfg, "submodule." SM_LIBGIT2B ".url"));
  	cl_assert_equal_s(s, SM_LIBGIT2_URL);
  	git_config_free(cfg);
  }
  
  static int delete_one_config(
  	const char *var_name, const char *value, void *payload)
  {
  	git_config *cfg = payload;
  	GIT_UNUSED(value);
  	return git_config_delete(cfg, var_name);
  }
  
  static int init_one_submodule(
  	git_submodule *sm, const char *name, void *payload)
  {
  	GIT_UNUSED(name);
  	GIT_UNUSED(payload);
  	return git_submodule_init(sm, false);
  }
  
  void test_submodule_modify__init(void)
  {
  	git_config *cfg;
  	const char *str;
  
  	/* erase submodule data from .git/config */
  	cl_git_pass(git_repository_config(&cfg, g_repo));
  	cl_git_pass(
  		git_config_foreach_match(cfg, "submodule\\..*", delete_one_config, cfg));
  	git_config_free(cfg);
  
  	/* confirm no submodule data in config */
  	cl_git_pass(git_repository_config(&cfg, g_repo));
  	cl_git_fail(git_config_get_string(&str, cfg, "submodule.sm_unchanged.url"));
  	cl_git_fail(git_config_get_string(&str, cfg, "submodule.sm_changed_head.url"));
  	cl_git_fail(git_config_get_string(&str, cfg, "submodule.sm_added_and_uncommited.url"));
  	git_config_free(cfg);
  
  	/* call init and see that settings are copied */
  	cl_git_pass(git_submodule_foreach(g_repo, init_one_submodule, NULL));
  
  	git_submodule_reload_all(g_repo);
  
  	/* confirm submodule data in config */
  	cl_git_pass(git_repository_config(&cfg, g_repo));
  	cl_git_pass(git_config_get_string(&str, cfg, "submodule.sm_unchanged.url"));
  	cl_assert(git__suffixcmp(str, "/submod2_target") == 0);
  	cl_git_pass(git_config_get_string(&str, cfg, "submodule.sm_changed_head.url"));
  	cl_assert(git__suffixcmp(str, "/submod2_target") == 0);
  	cl_git_pass(git_config_get_string(&str, cfg, "submodule.sm_added_and_uncommited.url"));
  	cl_assert(git__suffixcmp(str, "/submod2_target") == 0);
  	git_config_free(cfg);
  }
  
  static int sync_one_submodule(
  	git_submodule *sm, const char *name, void *payload)
  {
  	GIT_UNUSED(name);
  	GIT_UNUSED(payload);
  	return git_submodule_sync(sm);
  }
  
  void test_submodule_modify__sync(void)
  {
  	git_submodule *sm1, *sm2, *sm3;
  	git_config *cfg;
  	const char *str;
  
  #define SM1 "sm_unchanged"
  #define SM2 "sm_changed_head"
  #define SM3 "sm_added_and_uncommited"
  
  	/* look up some submodules */
  	cl_git_pass(git_submodule_lookup(&sm1, g_repo, SM1));
  	cl_git_pass(git_submodule_lookup(&sm2, g_repo, SM2));
  	cl_git_pass(git_submodule_lookup(&sm3, g_repo, SM3));
  
  	/* At this point, the .git/config URLs for the submodules have
  	 * not be rewritten with the absolute paths (although the
  	 * .gitmodules have.  Let's confirm that they DO NOT match
  	 * yet, then we can do a sync to make them match...
  	 */
  
  	/* check submodule info does not match before sync */
  	cl_git_pass(git_repository_config(&cfg, g_repo));
  	cl_git_pass(git_config_get_string(&str, cfg, "submodule."SM1".url"));
  	cl_assert(strcmp(git_submodule_url(sm1), str) != 0);
  	cl_git_pass(git_config_get_string(&str, cfg, "submodule."SM2".url"));
  	cl_assert(strcmp(git_submodule_url(sm2), str) != 0);
  	cl_git_pass(git_config_get_string(&str, cfg, "submodule."SM3".url"));
  	cl_assert(strcmp(git_submodule_url(sm3), str) != 0);
  	git_config_free(cfg);
  
  	/* sync all the submodules */
  	cl_git_pass(git_submodule_foreach(g_repo, sync_one_submodule, NULL));
  
  	/* check that submodule config is updated */
  	cl_git_pass(git_repository_config(&cfg, g_repo));
  	cl_git_pass(git_config_get_string(&str, cfg, "submodule."SM1".url"));
  	cl_assert_equal_s(git_submodule_url(sm1), str);
  	cl_git_pass(git_config_get_string(&str, cfg, "submodule."SM2".url"));
  	cl_assert_equal_s(git_submodule_url(sm2), str);
  	cl_git_pass(git_config_get_string(&str, cfg, "submodule."SM3".url"));
  	cl_assert_equal_s(git_submodule_url(sm3), str);
  	git_config_free(cfg);
  }
  
  void test_submodule_modify__edit_and_save(void)
  {
  	git_submodule *sm1, *sm2;
  	char *old_url;
  	git_submodule_ignore_t old_ignore;
  	git_submodule_update_t old_update;
  	git_repository *r2;
  	int old_fetchrecurse;
  
  	cl_git_pass(git_submodule_lookup(&sm1, g_repo, "sm_changed_head"));
  
  	old_url = git__strdup(git_submodule_url(sm1));
  
  	/* modify properties of submodule */
  	cl_git_pass(git_submodule_set_url(sm1, SM_LIBGIT2_URL));
  	old_ignore = git_submodule_set_ignore(sm1, GIT_SUBMODULE_IGNORE_UNTRACKED);
  	old_update = git_submodule_set_update(sm1, GIT_SUBMODULE_UPDATE_REBASE);
  	old_fetchrecurse = git_submodule_set_fetch_recurse_submodules(sm1, 1);
  
  	cl_assert_equal_s(SM_LIBGIT2_URL, git_submodule_url(sm1));
  	cl_assert_equal_i(
  		(int)GIT_SUBMODULE_IGNORE_UNTRACKED, (int)git_submodule_ignore(sm1));
  	cl_assert_equal_i(
  		(int)GIT_SUBMODULE_UPDATE_REBASE, (int)git_submodule_update(sm1));
  	cl_assert_equal_i(1, git_submodule_fetch_recurse_submodules(sm1));
  
  	/* revert without saving (and confirm setters return old value) */
  	cl_git_pass(git_submodule_set_url(sm1, old_url));
  	cl_assert_equal_i(
  		(int)GIT_SUBMODULE_IGNORE_UNTRACKED,
  		(int)git_submodule_set_ignore(sm1, GIT_SUBMODULE_IGNORE_DEFAULT));
  	cl_assert_equal_i(
  		(int)GIT_SUBMODULE_UPDATE_REBASE,
  		(int)git_submodule_set_update(sm1, GIT_SUBMODULE_UPDATE_DEFAULT));
  	cl_assert_equal_i(
  		1, git_submodule_set_fetch_recurse_submodules(sm1, old_fetchrecurse));
  
  	/* check that revert was successful */
  	cl_assert_equal_s(old_url, git_submodule_url(sm1));
  	cl_assert_equal_i((int)old_ignore, (int)git_submodule_ignore(sm1));
  	cl_assert_equal_i((int)old_update, (int)git_submodule_update(sm1));
  	cl_assert_equal_i(
  		old_fetchrecurse, git_submodule_fetch_recurse_submodules(sm1));
  
  	/* modify properties of submodule (again) */
  	cl_git_pass(git_submodule_set_url(sm1, SM_LIBGIT2_URL));
  	git_submodule_set_ignore(sm1, GIT_SUBMODULE_IGNORE_UNTRACKED);
  	git_submodule_set_update(sm1, GIT_SUBMODULE_UPDATE_REBASE);
  	git_submodule_set_fetch_recurse_submodules(sm1, 1);
  
  	/* call save */
  	cl_git_pass(git_submodule_save(sm1));
  
  	/* attempt to "revert" values */
  	git_submodule_set_ignore(sm1, GIT_SUBMODULE_IGNORE_DEFAULT);
  	git_submodule_set_update(sm1, GIT_SUBMODULE_UPDATE_DEFAULT);
  
  	/* but ignore and update should NOT revert because the DEFAULT
  	 * should now be the newly saved value...
  	 */
  	cl_assert_equal_i(
  		(int)GIT_SUBMODULE_IGNORE_UNTRACKED, (int)git_submodule_ignore(sm1));
  	cl_assert_equal_i(
  		(int)GIT_SUBMODULE_UPDATE_REBASE, (int)git_submodule_update(sm1));
  	cl_assert_equal_i(1, git_submodule_fetch_recurse_submodules(sm1));
  
  	/* call reload and check that the new values are loaded */
  	cl_git_pass(git_submodule_reload(sm1));
  
  	cl_assert_equal_s(SM_LIBGIT2_URL, git_submodule_url(sm1));
  	cl_assert_equal_i(
  		(int)GIT_SUBMODULE_IGNORE_UNTRACKED, (int)git_submodule_ignore(sm1));
  	cl_assert_equal_i(
  		(int)GIT_SUBMODULE_UPDATE_REBASE, (int)git_submodule_update(sm1));
  	cl_assert_equal_i(1, git_submodule_fetch_recurse_submodules(sm1));
  
  	/* open a second copy of the repo and compare submodule */
  	cl_git_pass(git_repository_open(&r2, "submod2"));
  	cl_git_pass(git_submodule_lookup(&sm2, r2, "sm_changed_head"));
  
  	cl_assert_equal_s(SM_LIBGIT2_URL, git_submodule_url(sm2));
  	cl_assert_equal_i(
  		(int)GIT_SUBMODULE_IGNORE_UNTRACKED, (int)git_submodule_ignore(sm2));
  	cl_assert_equal_i(
  		(int)GIT_SUBMODULE_UPDATE_REBASE, (int)git_submodule_update(sm2));
  	cl_assert_equal_i(1, git_submodule_fetch_recurse_submodules(sm2));
  
  	git_repository_free(r2);
  	git__free(old_url);
  }
  

Download