mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-03 01:58:32 +00:00
bae957b95d
There are a lot of places where the diff API gives the user access to internal data structures and many of these were being exposed through non-const pointers. This replaces them all with const pointers for any object that the user can access but is still owned internally to the git_diff_list or git_diff_patch objects. This will probably break some bindings... Sorry!
100 lines
2.2 KiB
C
100 lines
2.2 KiB
C
#include "clar_libgit2.h"
|
|
#include "diff_helpers.h"
|
|
|
|
static git_repository *g_repo = NULL;
|
|
|
|
void test_diff_patch__initialize(void)
|
|
{
|
|
g_repo = cl_git_sandbox_init("status");
|
|
}
|
|
|
|
void test_diff_patch__cleanup(void)
|
|
{
|
|
cl_git_sandbox_cleanup();
|
|
}
|
|
|
|
#define EXPECTED_HEADER "diff --git a/subdir.txt b/subdir.txt\n" \
|
|
"deleted file mode 100644\n" \
|
|
"index e8ee89e..0000000\n" \
|
|
"--- a/subdir.txt\n" \
|
|
"+++ /dev/null\n"
|
|
|
|
#define EXPECTED_HUNK "@@ -1,2 +0,0 @@\n"
|
|
|
|
static int check_removal_cb(
|
|
void *cb_data,
|
|
const git_diff_delta *delta,
|
|
const git_diff_range *range,
|
|
char line_origin,
|
|
const char *formatted_output,
|
|
size_t output_len)
|
|
{
|
|
GIT_UNUSED(cb_data);
|
|
GIT_UNUSED(output_len);
|
|
|
|
switch (line_origin) {
|
|
case GIT_DIFF_LINE_FILE_HDR:
|
|
cl_assert_equal_s(EXPECTED_HEADER, formatted_output);
|
|
cl_assert(range == NULL);
|
|
goto check_delta;
|
|
|
|
case GIT_DIFF_LINE_HUNK_HDR:
|
|
cl_assert_equal_s(EXPECTED_HUNK, formatted_output);
|
|
/* Fall through */
|
|
|
|
case GIT_DIFF_LINE_CONTEXT:
|
|
case GIT_DIFF_LINE_DELETION:
|
|
goto check_range;
|
|
|
|
default:
|
|
/* unexpected code path */
|
|
return -1;
|
|
}
|
|
|
|
check_range:
|
|
cl_assert(range != NULL);
|
|
cl_assert_equal_i(1, range->old_start);
|
|
cl_assert_equal_i(2, range->old_lines);
|
|
cl_assert_equal_i(0, range->new_start);
|
|
cl_assert_equal_i(0, range->new_lines);
|
|
|
|
check_delta:
|
|
cl_assert_equal_s("subdir.txt", delta->old_file.path);
|
|
cl_assert_equal_s("subdir.txt", delta->new_file.path);
|
|
cl_assert_equal_i(GIT_DELTA_DELETED, delta->status);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void test_diff_patch__can_properly_display_the_removal_of_a_file(void)
|
|
{
|
|
/*
|
|
* $ git diff 26a125e..735b6a2
|
|
* diff --git a/subdir.txt b/subdir.txt
|
|
* deleted file mode 100644
|
|
* index e8ee89e..0000000
|
|
* --- a/subdir.txt
|
|
* +++ /dev/null
|
|
* @@ -1,2 +0,0 @@
|
|
* -Is it a bird?
|
|
* -Is it a plane?
|
|
*/
|
|
|
|
const char *one_sha = "26a125e";
|
|
const char *another_sha = "735b6a2";
|
|
git_tree *one, *another;
|
|
git_diff_list *diff;
|
|
|
|
one = resolve_commit_oid_to_tree(g_repo, one_sha);
|
|
another = resolve_commit_oid_to_tree(g_repo, another_sha);
|
|
|
|
cl_git_pass(git_diff_tree_to_tree(g_repo, NULL, one, another, &diff));
|
|
|
|
cl_git_pass(git_diff_print_patch(diff, NULL, check_removal_cb));
|
|
|
|
git_diff_list_free(diff);
|
|
|
|
git_tree_free(another);
|
|
git_tree_free(one);
|
|
}
|