|
Packit Service |
20376f |
#include "clar_libgit2.h"
|
|
Packit Service |
20376f |
#include "diff_helpers.h"
|
|
Packit Service |
20376f |
#include "repository.h"
|
|
Packit Service |
20376f |
#include "diff_driver.h"
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
static git_repository *g_repo = NULL;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
void test_diff_drivers__initialize(void)
|
|
Packit Service |
20376f |
{
|
|
Packit Service |
20376f |
}
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
void test_diff_drivers__cleanup(void)
|
|
Packit Service |
20376f |
{
|
|
Packit Service |
20376f |
cl_git_sandbox_cleanup();
|
|
Packit Service |
20376f |
g_repo = NULL;
|
|
Packit Service |
20376f |
}
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
static void overwrite_filemode(const char *expected, git_buf *actual)
|
|
Packit Service |
20376f |
{
|
|
Packit Service |
20376f |
size_t offset;
|
|
Packit Service |
20376f |
char *found;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
found = strstr(expected, "100644");
|
|
Packit Service |
20376f |
if (!found)
|
|
Packit Service |
20376f |
return;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
offset = ((const char *)found) - expected;
|
|
Packit Service |
20376f |
if (actual->size < offset + 6)
|
|
Packit Service |
20376f |
return;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
if (memcmp(&actual->ptr[offset], "100644", 6) != 0)
|
|
Packit Service |
20376f |
memcpy(&actual->ptr[offset], "100644", 6);
|
|
Packit Service |
20376f |
}
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
void test_diff_drivers__patterns(void)
|
|
Packit Service |
20376f |
{
|
|
Packit Service |
20376f |
git_config *cfg;
|
|
Packit Service |
20376f |
const char *one_sha = "19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13";
|
|
Packit Service |
20376f |
git_tree *one;
|
|
Packit Service |
20376f |
git_diff *diff;
|
|
Packit Service |
20376f |
git_patch *patch;
|
|
Packit Service |
20376f |
git_buf actual = GIT_BUF_INIT;
|
|
Packit Service |
20376f |
const char *expected0 = "diff --git a/untimely.txt b/untimely.txt\nindex 9a69d96..57fd0cf 100644\n--- a/untimely.txt\n+++ b/untimely.txt\n@@ -22,3 +22,5 @@ Comes through the blood of the vanguards who\n dreamed--too soon--it had sounded.\r\n \r\n -- Rudyard Kipling\r\n+\r\n+Some new stuff\r\n";
|
|
Packit Service |
20376f |
const char *expected1 = "diff --git a/untimely.txt b/untimely.txt\nindex 9a69d96..57fd0cf 100644\nBinary files a/untimely.txt and b/untimely.txt differ\n";
|
|
Packit Service |
20376f |
const char *expected2 = "diff --git a/untimely.txt b/untimely.txt\nindex 9a69d96..57fd0cf 100644\n--- a/untimely.txt\n+++ b/untimely.txt\n@@ -22,3 +22,5 @@ Heaven delivers on earth the Hour that cannot be\n dreamed--too soon--it had sounded.\r\n \r\n -- Rudyard Kipling\r\n+\r\n+Some new stuff\r\n";
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
g_repo = cl_git_sandbox_init("renames");
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
one = resolve_commit_oid_to_tree(g_repo, one_sha);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
/* no diff */
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, one, NULL));
|
|
Packit Service |
20376f |
cl_assert_equal_i(0, (int)git_diff_num_deltas(diff));
|
|
Packit Service |
20376f |
git_diff_free(diff);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
/* default diff */
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_append2file("renames/untimely.txt", "\r\nSome new stuff\r\n");
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, one, NULL));
|
|
Packit Service |
20376f |
cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_from_diff(&patch, diff, 0));
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_to_buf(&actual, patch));
|
|
Packit Service |
20376f |
cl_assert_equal_s(expected0, actual.ptr);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_buf_free(&actual);
|
|
Packit Service |
20376f |
git_patch_free(patch);
|
|
Packit Service |
20376f |
git_diff_free(diff);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
/* attribute diff set to false */
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_rewritefile("renames/.gitattributes", "untimely.txt -diff\n");
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, one, NULL));
|
|
Packit Service |
20376f |
cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_from_diff(&patch, diff, 0));
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_to_buf(&actual, patch));
|
|
Packit Service |
20376f |
cl_assert_equal_s(expected1, actual.ptr);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_buf_free(&actual);
|
|
Packit Service |
20376f |
git_patch_free(patch);
|
|
Packit Service |
20376f |
git_diff_free(diff);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
/* attribute diff set to unconfigured value (should use default) */
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_rewritefile("renames/.gitattributes", "untimely.txt diff=kipling0\n");
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, one, NULL));
|
|
Packit Service |
20376f |
cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_from_diff(&patch, diff, 0));
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_to_buf(&actual, patch));
|
|
Packit Service |
20376f |
cl_assert_equal_s(expected0, actual.ptr);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_buf_free(&actual);
|
|
Packit Service |
20376f |
git_patch_free(patch);
|
|
Packit Service |
20376f |
git_diff_free(diff);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
/* let's define that driver */
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_repository_config(&cfg, g_repo));
|
|
Packit Service |
20376f |
cl_git_pass(git_config_set_bool(cfg, "diff.kipling0.binary", 1));
|
|
Packit Service |
20376f |
git_config_free(cfg);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, one, NULL));
|
|
Packit Service |
20376f |
cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_from_diff(&patch, diff, 0));
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_to_buf(&actual, patch));
|
|
Packit Service |
20376f |
cl_assert_equal_s(expected1, actual.ptr);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_buf_free(&actual);
|
|
Packit Service |
20376f |
git_patch_free(patch);
|
|
Packit Service |
20376f |
git_diff_free(diff);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
/* let's use a real driver with some regular expressions */
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_diff_driver_registry_free(g_repo->diff_drivers);
|
|
Packit Service |
20376f |
g_repo->diff_drivers = NULL;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_repository_config(&cfg, g_repo));
|
|
Packit Service |
20376f |
cl_git_pass(git_config_set_bool(cfg, "diff.kipling0.binary", 0));
|
|
Packit Service |
20376f |
cl_git_pass(git_config_set_string(cfg, "diff.kipling0.xfuncname", "^H.*$"));
|
|
Packit Service |
20376f |
git_config_free(cfg);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, one, NULL));
|
|
Packit Service |
20376f |
cl_assert_equal_i(1, (int)git_diff_num_deltas(diff));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_from_diff(&patch, diff, 0));
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_to_buf(&actual, patch));
|
|
Packit Service |
20376f |
cl_assert_equal_s(expected2, actual.ptr);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_buf_free(&actual);
|
|
Packit Service |
20376f |
git_patch_free(patch);
|
|
Packit Service |
20376f |
git_diff_free(diff);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_tree_free(one);
|
|
Packit Service |
20376f |
}
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
void test_diff_drivers__long_lines(void)
|
|
Packit Service |
20376f |
{
|
|
Packit Service |
20376f |
const char *base = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non nisi ligula. Ut viverra enim sed lobortis suscipit.\nPhasellus eget erat odio. Praesent at est iaculis, ultricies augue vel, dignissim risus. Suspendisse at nisi quis turpis fringilla rutrum id sit amet nulla.\nNam eget dolor fermentum, aliquet nisl at, convallis tellus. Pellentesque rhoncus erat enim, id porttitor elit euismod quis.\nMauris sollicitudin magna odio, non egestas libero vehicula ut. Etiam et quam velit. Fusce eget libero rhoncus, ultricies felis sit amet, egestas purus.\nAliquam in semper tellus. Pellentesque adipiscing rutrum velit, quis malesuada lacus consequat eget.\n";
|
|
Packit Service |
20376f |
git_index *idx;
|
|
Packit Service |
20376f |
git_diff *diff;
|
|
Packit Service |
20376f |
git_patch *patch;
|
|
Packit Service |
20376f |
git_buf actual = GIT_BUF_INIT;
|
|
Packit Service |
20376f |
const char *expected = "diff --git a/longlines.txt b/longlines.txt\nindex c1ce6ef..0134431 100644\n--- a/longlines.txt\n+++ b/longlines.txt\n@@ -3,3 +3,5 @@ Phasellus eget erat odio. Praesent at est iaculis, ultricies augue vel, dignissi\n Nam eget dolor fermentum, aliquet nisl at, convallis tellus. Pellentesque rhoncus erat enim, id porttitor elit euismod quis.\n Mauris sollicitudin magna odio, non egestas libero vehicula ut. Etiam et quam velit. Fusce eget libero rhoncus, ultricies felis sit amet, egestas purus.\n Aliquam in semper tellus. Pellentesque adipiscing rutrum velit, quis malesuada lacus consequat eget.\n+newline\n+newline\n";
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
g_repo = cl_git_sandbox_init("empty_standard_repo");
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_mkfile("empty_standard_repo/longlines.txt", base);
|
|
Packit Service |
20376f |
cl_git_pass(git_repository_index(&idx, g_repo));
|
|
Packit Service |
20376f |
cl_git_pass(git_index_add_bypath(idx, "longlines.txt"));
|
|
Packit Service |
20376f |
cl_git_pass(git_index_write(idx));
|
|
Packit Service |
20376f |
git_index_free(idx);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_append2file("empty_standard_repo/longlines.txt", "newline\nnewline\n");
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL));
|
|
Packit Service |
20376f |
cl_assert_equal_sz(1, git_diff_num_deltas(diff));
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_from_diff(&patch, diff, 0));
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_to_buf(&actual, patch));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
/* if chmod not supported, overwrite mode bits since anything is possible */
|
|
Packit Service |
20376f |
overwrite_filemode(expected, &actual);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_assert_equal_s(expected, actual.ptr);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_buf_free(&actual);
|
|
Packit Service |
20376f |
git_patch_free(patch);
|
|
Packit Service |
20376f |
git_diff_free(diff);
|
|
Packit Service |
20376f |
}
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
void test_diff_drivers__builtins(void)
|
|
Packit Service |
20376f |
{
|
|
Packit Service |
20376f |
git_diff *diff;
|
|
Packit Service |
20376f |
git_patch *patch;
|
|
Packit Service |
20376f |
git_buf file = GIT_BUF_INIT, actual = GIT_BUF_INIT, expected = GIT_BUF_INIT;
|
|
Packit Service |
20376f |
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
|
|
Packit Service |
20376f |
git_vector files = GIT_VECTOR_INIT;
|
|
Packit Service |
20376f |
size_t i;
|
|
Packit Service |
20376f |
char *path, *extension;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
g_repo = cl_git_sandbox_init("userdiff");
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_path_dirload(&files, "userdiff/files", 9, 0));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
opts.interhunk_lines = 1;
|
|
Packit Service |
20376f |
opts.context_lines = 1;
|
|
Packit Service |
20376f |
opts.pathspec.count = 1;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_vector_foreach(&files, i, path) {
|
|
Packit Service |
20376f |
if (git__prefixcmp(path, "files/file."))
|
|
Packit Service |
20376f |
continue;
|
|
Packit Service |
20376f |
extension = path + strlen("files/file.");
|
|
Packit Service |
20376f |
opts.pathspec.strings = &pat;;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
/* do diff with no special driver */
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
|
|
Packit Service |
20376f |
cl_assert_equal_sz(1, git_diff_num_deltas(diff));
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_from_diff(&patch, diff, 0));
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_to_buf(&actual, patch));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_buf_sets(&expected, "userdiff/expected/nodriver/diff.");
|
|
Packit Service |
20376f |
git_buf_puts(&expected, extension);
|
|
Packit Service |
20376f |
cl_git_pass(git_futils_readbuffer(&expected, expected.ptr));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
overwrite_filemode(expected.ptr, &actual);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_assert_equal_s(expected.ptr, actual.ptr);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_buf_clear(&actual);
|
|
Packit Service |
20376f |
git_patch_free(patch);
|
|
Packit Service |
20376f |
git_diff_free(diff);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
/* do diff with driver */
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
{
|
|
Packit Service |
20376f |
FILE *fp = fopen("userdiff/.gitattributes", "w");
|
|
Packit Service |
20376f |
fprintf(fp, "*.%s diff=%s\n", extension, extension);
|
|
Packit Service |
20376f |
fclose(fp);
|
|
Packit Service |
20376f |
}
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
|
|
Packit Service |
20376f |
cl_assert_equal_sz(1, git_diff_num_deltas(diff));
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_from_diff(&patch, diff, 0));
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_to_buf(&actual, patch));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_buf_sets(&expected, "userdiff/expected/driver/diff.");
|
|
Packit Service |
20376f |
git_buf_puts(&expected, extension);
|
|
Packit Service |
20376f |
cl_git_pass(git_futils_readbuffer(&expected, expected.ptr));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
overwrite_filemode(expected.ptr, &actual);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_assert_equal_s(expected.ptr, actual.ptr);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_buf_clear(&actual);
|
|
Packit Service |
20376f |
git_patch_free(patch);
|
|
Packit Service |
20376f |
git_diff_free(diff);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git__free(path);
|
|
Packit Service |
20376f |
}
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_buf_free(&file;;
|
|
Packit Service |
20376f |
git_buf_free(&actual);
|
|
Packit Service |
20376f |
git_buf_free(&expected);
|
|
Packit Service |
20376f |
git_vector_free(&files);
|
|
Packit Service |
20376f |
}
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
void test_diff_drivers__invalid_pattern(void)
|
|
Packit Service |
20376f |
{
|
|
Packit Service |
20376f |
git_config *cfg;
|
|
Packit Service |
20376f |
git_index *idx;
|
|
Packit Service |
20376f |
git_diff *diff;
|
|
Packit Service |
20376f |
git_patch *patch;
|
|
Packit Service |
20376f |
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
g_repo = cl_git_sandbox_init("userdiff");
|
|
Packit Service |
20376f |
cl_git_mkfile("userdiff/.gitattributes", "*.storyboard diff=storyboard\n");
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_repository_config__weakptr(&cfg, g_repo));
|
|
Packit Service |
20376f |
cl_git_pass(git_config_set_string(cfg, "diff.storyboard.xfuncname", ""));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_mkfile("userdiff/dummy.storyboard", "");
|
|
Packit Service |
20376f |
cl_git_pass(git_repository_index__weakptr(&idx, g_repo));
|
|
Packit Service |
20376f |
cl_git_pass(git_index_add_bypath(idx, "dummy.storyboard"));
|
|
Packit Service |
20376f |
cl_git_mkfile("userdiff/dummy.storyboard", "some content\n");
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));
|
|
Packit Service |
20376f |
cl_git_pass(git_patch_from_diff(&patch, diff, 0));
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
git_patch_free(patch);
|
|
Packit Service |
20376f |
git_diff_free(diff);
|
|
Packit Service |
20376f |
}
|