thodg/libgit2/tests/rebase/inmemory.c

• Show log

  Commit

• Hash : ee667307
  Author :
  Date : 2016-02-11T10:48:48
  

  rebase: introduce inmemory rebasing Introduce the ability to rebase in-memory or in a bare repository. When `rebase_options.inmemory` is specified, the resultant `git_rebase` session will not be persisted to disk. Callers may still analyze the rebase operations, resolve any conflicts against the in-memory index and create the commits. Neither `HEAD` nor the working directory will be updated during this process.

Download

• tests/rebase/inmemory.c

• #include "clar_libgit2.h"
  #include "git2/rebase.h"
  #include "posix.h"
  
  #include <fcntl.h>
  
  static git_repository *repo;
  
  // Fixture setup and teardown
  void test_rebase_inmemory__initialize(void)
  {
  	repo = cl_git_sandbox_init("rebase");
  }
  
  void test_rebase_inmemory__cleanup(void)
  {
  	cl_git_sandbox_cleanup();
  }
  
  void test_rebase_inmemory__not_in_rebase_state(void)
  {
  	git_rebase *rebase;
  	git_reference *branch_ref, *upstream_ref;
  	git_annotated_commit *branch_head, *upstream_head;
  	git_rebase_options opts = GIT_REBASE_OPTIONS_INIT;
  
  	opts.inmemory = true;
  
  	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_annotated_commit_from_ref(&branch_head, repo, branch_ref));
  	cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
  
  	cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &opts));
  
  	cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
  
  	git_rebase_free(rebase);
  
  	git_annotated_commit_free(branch_head);
  	git_annotated_commit_free(upstream_head);
  
  	git_reference_free(branch_ref);
  	git_reference_free(upstream_ref);
  }
  
  void test_rebase_inmemory__can_resolve_conflicts(void)
  {
  	git_rebase *rebase;
  	git_reference *branch_ref, *upstream_ref;
  	git_annotated_commit *branch_head, *upstream_head;
  	git_rebase_operation *rebase_operation;
  	git_status_list *status_list;
  	git_oid pick_id, commit_id, expected_commit_id;
  	git_signature *signature;
  	git_index *repo_index;
  	git_index_entry resolution = {{0}};
  	git_rebase_options opts = GIT_REBASE_OPTIONS_INIT;
  
  	cl_git_pass(git_signature_new(&signature,
  		"Rebaser", "rebaser@rebaser.rb", 1405694510, 0));
  
  	opts.inmemory = true;
  
  	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_annotated_commit_from_ref(&branch_head, repo, branch_ref));
  	cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
  
  	cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &opts));
  
  	cl_git_pass(git_rebase_next(&rebase_operation, rebase));
  
  	git_oid_fromstr(&pick_id, "33f915f9e4dbd9f4b24430e48731a59b45b15500");
  
  	cl_assert_equal_i(GIT_REBASE_OPERATION_PICK, rebase_operation->type);
  	cl_assert_equal_oid(&pick_id, &rebase_operation->id);
  
  	/* ensure that we did not do anything stupid to the workdir or repo index */
  	cl_git_pass(git_repository_index(&repo_index, repo));
  	cl_assert(!git_index_has_conflicts(repo_index));
  
  	cl_git_pass(git_status_list_new(&status_list, repo, NULL));
  	cl_assert_equal_i(0, git_status_list_entrycount(status_list));
  
  	/* but that the index returned from rebase does have conflicts */
  	cl_assert(git_index_has_conflicts(rebase_operation->index));
  
  	cl_git_fail_with(GIT_EUNMERGED, git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL));
  
  	/* ensure that we can work with the in-memory index to resolve the conflict */
  	resolution.path = "asparagus.txt";
  	resolution.mode = GIT_FILEMODE_BLOB;
  	git_oid_fromstr(&resolution.id, "414dfc71ead79c07acd4ea47fecf91f289afc4b9");
  	cl_git_pass(git_index_conflict_remove(rebase_operation->index, "asparagus.txt"));
  	cl_git_pass(git_index_add(rebase_operation->index, &resolution));
  
  	/* and finally create a commit for the resolved rebase operation */
  	cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL));
  
  	cl_git_pass(git_oid_fromstr(&expected_commit_id, "db7af47222181e548810da2ab5fec0e9357c5637"));
  	cl_assert_equal_oid(&commit_id, &expected_commit_id);
  
  	git_signature_free(signature);
  	git_status_list_free(status_list);
  	git_annotated_commit_free(branch_head);
  	git_annotated_commit_free(upstream_head);
  	git_reference_free(branch_ref);
  	git_reference_free(upstream_ref);
  	git_index_free(repo_index);
  	git_rebase_free(rebase);
  }
  

Download