thodg/libgit2/tests/rebase/merge.c

• Show log

  Commit

• Hash : 93a7004c
  Author :
  Date : 2014-07-18T14:50:06
  

  git_rebase_commit: drop already-picked commits
  
  Already cherry-picked commits should not be re-included.  If all changes
  included in a commit exist in the upstream, then we should error with
  GIT_EAPPLIED.
  

Download

• tests/rebase/merge.c

• #include "clar_libgit2.h"
  #include "git2/rebase.h"
  #include "posix.h"
  #include "signature.h"
  
  #include <fcntl.h>
  
  static git_repository *repo;
  static git_signature *signature;
  
  // Fixture setup and teardown
  void test_rebase_merge__initialize(void)
  {
  	repo = cl_git_sandbox_init("rebase");
  	cl_git_pass(git_signature_new(&signature,
  		"Rebaser", "rebaser@rebaser.rb", 1405694510, 0));
  }
  
  void test_rebase_merge__cleanup(void)
  {
  	git_signature_free(signature);
  	cl_git_sandbox_cleanup();
  }
  
  void test_rebase_merge__next(void)
  {
  	git_reference *branch_ref, *upstream_ref;
  	git_merge_head *branch_head, *upstream_head;
  	git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
  	git_status_list *status_list;
  	const git_status_entry *status_entry;
  	git_oid file1_id;
  
  	checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
  
  	cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef"));
  	cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
  
  	cl_git_pass(git_merge_head_from_ref(&branch_head, repo, branch_ref));
  	cl_git_pass(git_merge_head_from_ref(&upstream_head, repo, upstream_ref));
  
  	cl_git_pass(git_rebase(repo, branch_head, upstream_head, NULL, signature, NULL));
  
  	cl_git_pass(git_rebase_next(repo, &checkout_opts));
  
  	cl_assert_equal_file("da9c51a23d02d931a486f45ad18cda05cf5d2b94\n", 41, "rebase/.git/rebase-merge/current");
  	cl_assert_equal_file("1\n", 2, "rebase/.git/rebase-merge/msgnum");
  
  	cl_git_pass(git_status_list_new(&status_list, repo, NULL));
  	cl_assert_equal_i(1, git_status_list_entrycount(status_list));
  	cl_assert(status_entry = git_status_byindex(status_list, 0));
  
  	cl_assert_equal_s("beef.txt", status_entry->head_to_index->new_file.path);
  
  	git_oid_fromstr(&file1_id, "8d95ea62e621f1d38d230d9e7d206e41096d76af");
  	cl_assert_equal_oid(&file1_id, &status_entry->head_to_index->new_file.id);
  
  	git_status_list_free(status_list);
  	git_merge_head_free(branch_head);
  	git_merge_head_free(upstream_head);
  	git_reference_free(branch_ref);
  	git_reference_free(upstream_ref);
  }
  
  void test_rebase_merge__next_with_conflicts(void)
  {
  	git_reference *branch_ref, *upstream_ref;
  	git_merge_head *branch_head, *upstream_head;
  	git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
  	git_status_list *status_list;
  	const git_status_entry *status_entry;
  
  	const char *expected_merge =
  "ASPARAGUS SOUP.\n"
  "\n"
  "<<<<<<< master\n"
  "TAKE FOUR LARGE BUNCHES of asparagus, scrape it nicely, cut off one inch\n"
  "OF THE TOPS, and lay them in water, chop the stalks and put them on the\n"
  "FIRE WITH A PIECE OF BACON, a large onion cut up, and pepper and salt;\n"
  "ADD TWO QUARTS OF WATER, boil them till the stalks are quite soft, then\n"
  "PULP THEM THROUGH A SIEVE, and strain the water to it, which must be put\n"
  "=======\n"
  "Take four large bunches of asparagus, scrape it nicely, CUT OFF ONE INCH\n"
  "of the tops, and lay them in water, chop the stalks and PUT THEM ON THE\n"
  "fire with a piece of bacon, a large onion cut up, and pepper and salt;\n"
  "add two quarts of water, boil them till the stalks are quite soft, then\n"
  "pulp them through a sieve, and strain the water to it, which must be put\n"
  ">>>>>>> Conflicting modification 1 to asparagus\n"
  "back in the pot; put into it a chicken cut up, with the tops of\n"
  "asparagus which had been laid by, boil it until these last articles are\n"
  "sufficiently done, thicken with flour, butter and milk, and serve it up.\n";
  
  	checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
  
  	cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/asparagus"));
  	cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
  
  	cl_git_pass(git_merge_head_from_ref(&branch_head, repo, branch_ref));
  	cl_git_pass(git_merge_head_from_ref(&upstream_head, repo, upstream_ref));
  
  	cl_git_pass(git_rebase(repo, branch_head, upstream_head, NULL, signature, NULL));
  
  	cl_git_pass(git_rebase_next(repo, &checkout_opts));
  
  	cl_assert_equal_file("33f915f9e4dbd9f4b24430e48731a59b45b15500\n", 41, "rebase/.git/rebase-merge/current");
  	cl_assert_equal_file("1\n", 2, "rebase/.git/rebase-merge/msgnum");
  
  	cl_git_pass(git_status_list_new(&status_list, repo, NULL));
  	cl_assert_equal_i(1, git_status_list_entrycount(status_list));
  	cl_assert(status_entry = git_status_byindex(status_list, 0));
  
  	cl_assert_equal_s("asparagus.txt", status_entry->head_to_index->new_file.path);
  
  	cl_assert_equal_file(expected_merge, strlen(expected_merge), "rebase/asparagus.txt");
  
  	git_status_list_free(status_list);
  	git_merge_head_free(branch_head);
  	git_merge_head_free(upstream_head);
  	git_reference_free(branch_ref);
  	git_reference_free(upstream_ref);
  }
  
  void test_rebase_merge__commit(void)
  {
  	git_reference *branch_ref, *upstream_ref;
  	git_merge_head *branch_head, *upstream_head;
  	git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
  	git_oid commit_id, tree_id, parent_id;
  	git_signature *author;
  	git_commit *commit;
  
  	checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
  
  	cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef"));
  	cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
  
  	cl_git_pass(git_merge_head_from_ref(&branch_head, repo, branch_ref));
  	cl_git_pass(git_merge_head_from_ref(&upstream_head, repo, upstream_ref));
  
  	cl_git_pass(git_rebase(repo, branch_head, upstream_head, NULL, signature, NULL));
  
  	cl_git_pass(git_rebase_next(repo, &checkout_opts));
  	cl_git_pass(git_rebase_commit(&commit_id, repo, NULL, signature,
  		NULL, NULL));
  
  	cl_git_pass(git_commit_lookup(&commit, repo, &commit_id));
  
  	git_oid_fromstr(&parent_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
  	cl_assert_equal_i(1, git_commit_parentcount(commit));
  	cl_assert_equal_oid(&parent_id, git_commit_parent_id(commit, 0));
  
  	git_oid_fromstr(&tree_id, "4461379789c777d2a6c1f2ee0e9d6c86731b9992");
  	cl_assert_equal_oid(&tree_id, git_commit_tree_id(commit));
  
  	cl_assert_equal_s(NULL, git_commit_message_encoding(commit));
  	cl_assert_equal_s("Modification 1 to beef\n", git_commit_message(commit));
  
  	cl_git_pass(git_signature_new(&author,
  		"Edward Thomson", "ethomson@edwardthomson.com", 1405621769, 0-(4*60)));
  	cl_assert(git_signature__equal(author, git_commit_author(commit)));
  
  	cl_assert(git_signature__equal(signature, git_commit_committer(commit)));
  
  	cl_assert_equal_file("da9c51a23d02d931a486f45ad18cda05cf5d2b94 776e4c48922799f903f03f5f6e51da8b01e4cce0\n", 82, "rebase/.git/rebase-merge/rewritten");
  
  	git_signature_free(author);
  	git_commit_free(commit);
  	git_merge_head_free(branch_head);
  	git_merge_head_free(upstream_head);
  	git_reference_free(branch_ref);
  	git_reference_free(upstream_ref);
  }
  
  void test_rebase_merge__commit_updates_rewritten(void)
  {
  	git_reference *branch_ref, *upstream_ref;
  	git_merge_head *branch_head, *upstream_head;
  	git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
  	git_oid commit_id;
  
  	checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
  
  	cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef"));
  	cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
  
  	cl_git_pass(git_merge_head_from_ref(&branch_head, repo, branch_ref));
  	cl_git_pass(git_merge_head_from_ref(&upstream_head, repo, upstream_ref));
  
  	cl_git_pass(git_rebase(repo, branch_head, upstream_head, NULL, signature, NULL));
  
  	cl_git_pass(git_rebase_next(repo, &checkout_opts));
  	cl_git_pass(git_rebase_commit(&commit_id, repo, NULL, signature,
  		NULL, NULL));
  
  	cl_git_pass(git_rebase_next(repo, &checkout_opts));
  	cl_git_pass(git_rebase_commit(&commit_id, repo, NULL, signature,
  		NULL, NULL));
  
  	cl_assert_equal_file(
  		"da9c51a23d02d931a486f45ad18cda05cf5d2b94 776e4c48922799f903f03f5f6e51da8b01e4cce0\n"
  		"8d1f13f93c4995760ac07d129246ac1ff64c0be9 ba1f9b4fd5cf8151f7818be2111cc0869f1eb95a\n",
  		164, "rebase/.git/rebase-merge/rewritten");
  
  	git_merge_head_free(branch_head);
  	git_merge_head_free(upstream_head);
  	git_reference_free(branch_ref);
  	git_reference_free(upstream_ref);
  }
  
  void test_rebase_merge__commit_drops_already_applied(void)
  {
  	git_reference *branch_ref, *upstream_ref;
  	git_merge_head *branch_head, *upstream_head;
  	git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
  	git_oid commit_id;
  	int error;
  
  	checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
  
  	cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef"));
  	cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/green_pea"));
  
  	cl_git_pass(git_merge_head_from_ref(&branch_head, repo, branch_ref));
  	cl_git_pass(git_merge_head_from_ref(&upstream_head, repo, upstream_ref));
  
  	cl_git_pass(git_rebase(repo, branch_head, upstream_head, NULL, signature, NULL));
  
  	cl_git_pass(git_rebase_next(repo, &checkout_opts));
  	cl_git_fail(error = git_rebase_commit(&commit_id, repo, NULL, signature,
  		NULL, NULL));
  
  	cl_assert_equal_i(GIT_EAPPLIED, error);
  
  	cl_git_pass(git_rebase_next(repo, &checkout_opts));
  	cl_git_pass(git_rebase_commit(&commit_id, repo, NULL, signature,
  		NULL, NULL));
  
  	cl_assert_equal_file(
  		"8d1f13f93c4995760ac07d129246ac1ff64c0be9 2ac4fb7b74c1287f6c792acad759e1ec01e18dae\n",
  		82, "rebase/.git/rebase-merge/rewritten");
  
  	git_merge_head_free(branch_head);
  	git_merge_head_free(upstream_head);
  	git_reference_free(branch_ref);
  	git_reference_free(upstream_ref);
  }
  
  

Download