thodg/libgit2/tests/apply/partial.c

• Show log

  Commit

• Hash : f0e693b1
  Author :
  Date : 2021-09-07T17:53:49
  

  str: introduce `git_str` for internal, `git_buf` is external libgit2 has two distinct requirements that were previously solved by `git_buf`. We require: 1. A general purpose string class that provides a number of utility APIs for manipulating data (eg, concatenating, truncating, etc). 2. A structure that we can use to return strings to callers that they can take ownership of. By using a single class (`git_buf`) for both of these purposes, we have confused the API to the point that refactorings are difficult and reasoning about correctness is also difficult. Move the utility class `git_buf` to be called `git_str`: this represents its general purpose, as an internal string buffer class. The name also is an homage to Junio Hamano ("gitstr"). The public API remains `git_buf`, and has a much smaller footprint. It is generally only used as an "out" param with strict requirements that follow the documentation. (Exceptions exist for some legacy APIs to avoid breaking callers unnecessarily.) Utility functions exist to convert a user-specified `git_buf` to a `git_str` so that we can call internal functions, then converting it back again.

Download

• tests/apply/partial.c

• #include "clar_libgit2.h"
  #include "git2/sys/repository.h"
  
  #include "apply.h"
  #include "repository.h"
  
  #include "../patch/patch_common.h"
  
  static git_repository *repo = NULL;
  
  void test_apply_partial__initialize(void)
  {
  	repo = cl_git_sandbox_init("renames");
  }
  
  void test_apply_partial__cleanup(void)
  {
  	cl_git_sandbox_cleanup();
  }
  
  static int skip_addition(
  	const git_diff_hunk *hunk,
  	void *payload)
  {
  	GIT_UNUSED(payload);
  
  	return (hunk->new_lines > hunk->old_lines) ? 1 : 0;
  }
  
  static int skip_deletion(
  	const git_diff_hunk *hunk,
  	void *payload)
  {
  	GIT_UNUSED(payload);
  
  	return (hunk->new_lines < hunk->old_lines) ? 1 : 0;
  }
  
  static int skip_change(
  	const git_diff_hunk *hunk,
  	void *payload)
  {
  	GIT_UNUSED(payload);
  
  	return (hunk->new_lines == hunk->old_lines) ? 1 : 0;
  }
  
  static int abort_addition(
  	const git_diff_hunk *hunk,
  	void *payload)
  {
  	GIT_UNUSED(payload);
  
  	return (hunk->new_lines > hunk->old_lines) ? GIT_EUSER : 0;
  }
  
  static int abort_deletion(
  	const git_diff_hunk *hunk,
  	void *payload)
  {
  	GIT_UNUSED(payload);
  
  	return (hunk->new_lines < hunk->old_lines) ? GIT_EUSER : 0;
  }
  
  static int abort_change(
  	const git_diff_hunk *hunk,
  	void *payload)
  {
  	GIT_UNUSED(payload);
  
  	return (hunk->new_lines == hunk->old_lines) ? GIT_EUSER : 0;
  }
  
  static int apply_buf(
  	const char *old,
  	const char *oldname,
  	const char *new,
  	const char *newname,
  	const char *expected,
  	const git_diff_options *diff_opts,
  	git_apply_hunk_cb hunk_cb,
  	void *payload)
  {
  	git_patch *patch;
  	git_str result = GIT_STR_INIT;
  	git_str patchbuf = GIT_STR_INIT;
  	git_apply_options opts = GIT_APPLY_OPTIONS_INIT;
  	char *filename;
  	unsigned int mode;
  	int error;
  	size_t oldsize = strlen(old);
  	size_t newsize = strlen(new);
  
  	opts.hunk_cb = hunk_cb;
  	opts.payload = payload;
  
  	cl_git_pass(git_patch_from_buffers(&patch, old, oldsize, oldname, new, newsize, newname, diff_opts));
  	if ((error = git_apply__patch(&result, &filename, &mode, old, oldsize, patch, &opts)) == 0) {
  		cl_assert_equal_s(expected, result.ptr);
  		cl_assert_equal_s(newname, filename);
  		cl_assert_equal_i(0100644, mode);
  	}
  
  	git__free(filename);
  	git_str_dispose(&result);
  	git_str_dispose(&patchbuf);
  	git_patch_free(patch);
  
  	return error;
  }
  
  void test_apply_partial__prepend_and_change_skip_addition(void)
  {
  	cl_git_pass(apply_buf(
  		FILE_ORIGINAL, "file.txt",
  		FILE_PREPEND_AND_CHANGE, "file.txt",
  		FILE_ORIGINAL, NULL, skip_addition, NULL));
  }
  
  void test_apply_partial__prepend_and_change_nocontext_skip_addition(void)
  {
  	git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
  	diff_opts.context_lines = 0;
  
  	cl_git_pass(apply_buf(
  		FILE_ORIGINAL, "file.txt",
  		FILE_PREPEND_AND_CHANGE, "file.txt",
  		FILE_CHANGE_MIDDLE, &diff_opts, skip_addition, NULL));
  }
  
  void test_apply_partial__prepend_and_change_nocontext_abort_addition(void)
  {
  	git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
  	diff_opts.context_lines = 0;
  
  	cl_git_fail(apply_buf(
  		FILE_ORIGINAL, "file.txt",
  		FILE_PREPEND_AND_CHANGE, "file.txt",
  		FILE_ORIGINAL, &diff_opts, abort_addition, NULL));
  }
  
  void test_apply_partial__prepend_and_change_skip_change(void)
  {
  	cl_git_pass(apply_buf(
  		FILE_ORIGINAL, "file.txt",
  		FILE_PREPEND_AND_CHANGE, "file.txt",
  		FILE_PREPEND_AND_CHANGE, NULL, skip_change, NULL));
  }
  
  void test_apply_partial__prepend_and_change_nocontext_skip_change(void)
  {
  	git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
  	diff_opts.context_lines = 0;
  
  	cl_git_pass(apply_buf(
  		FILE_ORIGINAL, "file.txt",
  		FILE_PREPEND_AND_CHANGE, "file.txt",
  		FILE_PREPEND, &diff_opts, skip_change, NULL));
  }
  
  void test_apply_partial__prepend_and_change_nocontext_abort_change(void)
  {
  	git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
  	diff_opts.context_lines = 0;
  
  	cl_git_fail(apply_buf(
  		FILE_ORIGINAL, "file.txt",
  		FILE_PREPEND_AND_CHANGE, "file.txt",
  		FILE_PREPEND, &diff_opts, abort_change, NULL));
  }
  
  void test_apply_partial__delete_and_change_skip_deletion(void)
  {
  	cl_git_pass(apply_buf(
  		FILE_ORIGINAL, "file.txt",
  		FILE_DELETE_AND_CHANGE, "file.txt",
  		FILE_ORIGINAL, NULL, skip_deletion, NULL));
  }
  
  void test_apply_partial__delete_and_change_nocontext_skip_deletion(void)
  {
  	git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
  	diff_opts.context_lines = 0;
  
  	cl_git_pass(apply_buf(
  		FILE_ORIGINAL, "file.txt",
  		FILE_DELETE_AND_CHANGE, "file.txt",
  		FILE_CHANGE_MIDDLE, &diff_opts, skip_deletion, NULL));
  }
  
  void test_apply_partial__delete_and_change_nocontext_abort_deletion(void)
  {
  	git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
  	diff_opts.context_lines = 0;
  
  	cl_git_fail(apply_buf(
  		FILE_ORIGINAL, "file.txt",
  		FILE_DELETE_AND_CHANGE, "file.txt",
  		FILE_ORIGINAL, &diff_opts, abort_deletion, NULL));
  }
  
  void test_apply_partial__delete_and_change_skip_change(void)
  {
  	cl_git_pass(apply_buf(
  		FILE_ORIGINAL, "file.txt",
  		FILE_DELETE_AND_CHANGE, "file.txt",
  		FILE_DELETE_AND_CHANGE, NULL, skip_change, NULL));
  }
  
  void test_apply_partial__delete_and_change_nocontext_skip_change(void)
  {
  	git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
  	diff_opts.context_lines = 0;
  
  	cl_git_pass(apply_buf(
  		FILE_ORIGINAL, "file.txt",
  		FILE_DELETE_AND_CHANGE, "file.txt",
  		FILE_DELETE_FIRSTLINE, &diff_opts, skip_change, NULL));
  }
  
  void test_apply_partial__delete_and_change_nocontext_abort_change(void)
  {
  	git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
  	diff_opts.context_lines = 0;
  
  	cl_git_fail(apply_buf(
  		FILE_ORIGINAL, "file.txt",
  		FILE_DELETE_AND_CHANGE, "file.txt",
  		FILE_DELETE_FIRSTLINE, &diff_opts, abort_change, NULL));
  }
  

Download