New upstream version 1.4.3+dfsg.1

[libgit2.git] / tests / merge / workdir / simple.c

diff --git a/tests/merge/workdir/simple.c b/tests/merge/workdir/simple.c
index 6b4e174921a138c7d8081a4b3563c1f531348902..b9d3fc24ca2fce775ff9f31b526399720683eab1 100644 (file)
--- a/tests/merge/workdir/simple.c
+++ b/tests/merge/workdir/simple.c
@@ -1,7 +1,6 @@
 #include "clar_libgit2.h"
 #include "git2/repository.h"
 #include "git2/merge.h"
-#include "buffer.h"
 #include "merge.h"
 #include "../merge_helpers.h"
 #include "../conflict_data.h"
@@ -126,7 +125,7 @@ void test_merge_workdir_simple__automerge(void)
 {
        git_index *index;
        const git_index_entry *entry;
-       git_buf automergeable_buf = GIT_BUF_INIT;
+       git_str automergeable_buf = GIT_STR_INIT;
 
        struct merge_index_entry merge_index_entries[] = {
                ADDED_IN_MASTER_INDEX_ENTRY,
@@ -155,7 +154,7 @@ void test_merge_workdir_simple__automerge(void)
        cl_git_pass(git_futils_readbuffer(&automergeable_buf,
                TEST_REPO_PATH "/automergeable.txt"));
        cl_assert(strcmp(automergeable_buf.ptr, AUTOMERGEABLE_MERGED_FILE) == 0);
-       git_buf_dispose(&automergeable_buf);
+       git_str_dispose(&automergeable_buf);
 
        cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
        cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
@@ -202,7 +201,7 @@ void test_merge_workdir_simple__automerge_crlf(void)
 #ifdef GIT_WIN32
        git_index *index;
        const git_index_entry *entry;
-       git_buf automergeable_buf = GIT_BUF_INIT;
+       git_str automergeable_buf = GIT_STR_INIT;
 
        struct merge_index_entry merge_index_entries[] = {
                ADDED_IN_MASTER_INDEX_ENTRY,
@@ -230,7 +229,7 @@ void test_merge_workdir_simple__automerge_crlf(void)
        cl_git_pass(git_futils_readbuffer(&automergeable_buf,
                TEST_REPO_PATH "/automergeable.txt"));
        cl_assert(strcmp(automergeable_buf.ptr, AUTOMERGEABLE_MERGED_FILE_CRLF) == 0);
-       git_buf_dispose(&automergeable_buf);
+       git_str_dispose(&automergeable_buf);
 
        cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
        cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
@@ -246,7 +245,7 @@ void test_merge_workdir_simple__automerge_crlf(void)
 
 void test_merge_workdir_simple__mergefile(void)
 {
-       git_buf conflicting_buf = GIT_BUF_INIT, mergemsg_buf = GIT_BUF_INIT;
+       git_str conflicting_buf = GIT_STR_INIT, mergemsg_buf = GIT_STR_INIT;
 
        struct merge_index_entry merge_index_entries[] = {
                ADDED_IN_MASTER_INDEX_ENTRY,
@@ -276,13 +275,13 @@ void test_merge_workdir_simple__mergefile(void)
        cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_MERGE_FILE) == 0);
        cl_git_pass(git_futils_readbuffer(&mergemsg_buf,
                TEST_REPO_PATH "/.git/MERGE_MSG"));
-       cl_assert(strcmp(git_buf_cstr(&mergemsg_buf),
+       cl_assert(strcmp(git_str_cstr(&mergemsg_buf),
                "Merge commit '7cb63eed597130ba4abb87b3e544b85021905520'\n" \
                "\n" \
-               "Conflicts:\n" \
-               "\tconflicting.txt\n") == 0);
-       git_buf_dispose(&conflicting_buf);
-       git_buf_dispose(&mergemsg_buf);
+               "#Conflicts:\n" \
+               "#\tconflicting.txt\n") == 0);
+       git_str_dispose(&conflicting_buf);
+       git_str_dispose(&mergemsg_buf);
 
        cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
        cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
@@ -290,7 +289,7 @@ void test_merge_workdir_simple__mergefile(void)
 
 void test_merge_workdir_simple__diff3(void)
 {
-       git_buf conflicting_buf = GIT_BUF_INIT;
+       git_str conflicting_buf = GIT_STR_INIT;
 
        struct merge_index_entry merge_index_entries[] = {
                ADDED_IN_MASTER_INDEX_ENTRY,
@@ -318,7 +317,43 @@ void test_merge_workdir_simple__diff3(void)
        cl_git_pass(git_futils_readbuffer(&conflicting_buf,
                TEST_REPO_PATH "/conflicting.txt"));
        cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_DIFF3_FILE) == 0);
-       git_buf_dispose(&conflicting_buf);
+       git_str_dispose(&conflicting_buf);
+
+       cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
+       cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
+}
+
+void test_merge_workdir_simple__zdiff3(void)
+{
+       git_str conflicting_buf = GIT_STR_INIT;
+
+       struct merge_index_entry merge_index_entries[] = {
+               ADDED_IN_MASTER_INDEX_ENTRY,
+               AUTOMERGEABLE_INDEX_ENTRY,
+               CHANGED_IN_BRANCH_INDEX_ENTRY,
+               CHANGED_IN_MASTER_INDEX_ENTRY,
+
+               { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" },
+               { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" },
+               { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" },
+
+               UNCHANGED_INDEX_ENTRY,
+       };
+
+       struct merge_reuc_entry merge_reuc_entries[] = {
+               AUTOMERGEABLE_REUC_ENTRY,
+               REMOVED_IN_BRANCH_REUC_ENTRY,
+               REMOVED_IN_MASTER_REUC_ENTRY
+       };
+
+       set_core_autocrlf_to(repo, false);
+
+       merge_simple_branch(0, GIT_CHECKOUT_CONFLICT_STYLE_ZDIFF3);
+
+       cl_git_pass(git_futils_readbuffer(&conflicting_buf,
+               TEST_REPO_PATH "/conflicting.txt"));
+       cl_assert_equal_s(CONFLICTING_ZDIFF3_FILE, conflicting_buf.ptr);
+       git_str_dispose(&conflicting_buf);
 
        cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
        cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
@@ -326,7 +361,7 @@ void test_merge_workdir_simple__diff3(void)
 
 void test_merge_workdir_simple__union(void)
 {
-       git_buf conflicting_buf = GIT_BUF_INIT;
+       git_str conflicting_buf = GIT_STR_INIT;
 
        struct merge_index_entry merge_index_entries[] = {
                ADDED_IN_MASTER_INDEX_ENTRY,
@@ -353,7 +388,7 @@ void test_merge_workdir_simple__union(void)
        cl_git_pass(git_futils_readbuffer(&conflicting_buf,
                TEST_REPO_PATH "/conflicting.txt"));
        cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_UNION_FILE) == 0);
-       git_buf_dispose(&conflicting_buf);
+       git_str_dispose(&conflicting_buf);
 
        cl_assert(merge_test_index(repo_index, merge_index_entries, 6));
        cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 4));
@@ -361,7 +396,7 @@ void test_merge_workdir_simple__union(void)
 
 void test_merge_workdir_simple__gitattributes_union(void)
 {
-       git_buf conflicting_buf = GIT_BUF_INIT;
+       git_str conflicting_buf = GIT_STR_INIT;
 
        struct merge_index_entry merge_index_entries[] = {
                ADDED_IN_MASTER_INDEX_ENTRY,
@@ -389,7 +424,7 @@ void test_merge_workdir_simple__gitattributes_union(void)
        cl_git_pass(git_futils_readbuffer(&conflicting_buf,
                TEST_REPO_PATH "/conflicting.txt"));
        cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_UNION_FILE) == 0);
-       git_buf_dispose(&conflicting_buf);
+       git_str_dispose(&conflicting_buf);
 
        cl_assert(merge_test_index(repo_index, merge_index_entries, 6));
        cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 4));
@@ -398,7 +433,7 @@ void test_merge_workdir_simple__gitattributes_union(void)
 void test_merge_workdir_simple__diff3_from_config(void)
 {
        git_config *config;
-       git_buf conflicting_buf = GIT_BUF_INIT;
+       git_str conflicting_buf = GIT_STR_INIT;
 
        struct merge_index_entry merge_index_entries[] = {
                ADDED_IN_MASTER_INDEX_ENTRY,
@@ -429,7 +464,49 @@ void test_merge_workdir_simple__diff3_from_config(void)
        cl_git_pass(git_futils_readbuffer(&conflicting_buf,
                TEST_REPO_PATH "/conflicting.txt"));
        cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_DIFF3_FILE) == 0);
-       git_buf_dispose(&conflicting_buf);
+       git_str_dispose(&conflicting_buf);
+
+       cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
+       cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
+
+       git_config_free(config);
+}
+
+void test_merge_workdir_simple__zdiff3_from_config(void)
+{
+       git_config *config;
+       git_str conflicting_buf = GIT_STR_INIT;
+
+       struct merge_index_entry merge_index_entries[] = {
+               ADDED_IN_MASTER_INDEX_ENTRY,
+               AUTOMERGEABLE_INDEX_ENTRY,
+               CHANGED_IN_BRANCH_INDEX_ENTRY,
+               CHANGED_IN_MASTER_INDEX_ENTRY,
+
+               { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" },
+               { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" },
+               { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" },
+
+               UNCHANGED_INDEX_ENTRY,
+       };
+
+       struct merge_reuc_entry merge_reuc_entries[] = {
+               AUTOMERGEABLE_REUC_ENTRY,
+               REMOVED_IN_BRANCH_REUC_ENTRY,
+               REMOVED_IN_MASTER_REUC_ENTRY
+       };
+
+       cl_git_pass(git_repository_config(&config, repo));
+       cl_git_pass(git_config_set_string(config, "merge.conflictstyle", "zdiff3"));
+
+       set_core_autocrlf_to(repo, false);
+
+       merge_simple_branch(0, 0);
+
+       cl_git_pass(git_futils_readbuffer(&conflicting_buf,
+               TEST_REPO_PATH "/conflicting.txt"));
+       cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_ZDIFF3_FILE) == 0);
+       git_str_dispose(&conflicting_buf);
 
        cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
        cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
@@ -440,7 +517,7 @@ void test_merge_workdir_simple__diff3_from_config(void)
 void test_merge_workdir_simple__merge_overrides_config(void)
 {
        git_config *config;
-       git_buf conflicting_buf = GIT_BUF_INIT;
+       git_str conflicting_buf = GIT_STR_INIT;
 
        struct merge_index_entry merge_index_entries[] = {
                ADDED_IN_MASTER_INDEX_ENTRY,
@@ -471,7 +548,7 @@ void test_merge_workdir_simple__merge_overrides_config(void)
        cl_git_pass(git_futils_readbuffer(&conflicting_buf,
                TEST_REPO_PATH "/conflicting.txt"));
        cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_MERGE_FILE) == 0);
-       git_buf_dispose(&conflicting_buf);
+       git_str_dispose(&conflicting_buf);
 
        cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
        cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
@@ -505,7 +582,7 @@ void test_merge_workdir_simple__checkout_ours(void)
        cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
        cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
 
-       cl_assert(git_path_exists(TEST_REPO_PATH "/conflicting.txt"));
+       cl_assert(git_fs_path_exists(TEST_REPO_PATH "/conflicting.txt"));
 }
 
 void test_merge_workdir_simple__favor_ours(void)