New upstream version 1.4.3+dfsg.1

[libgit2.git] / tests / revert / workdir.c

diff --git a/tests/revert/workdir.c b/tests/revert/workdir.c
index 7ccf0f937da2bfdef418e906e858e4548f340420..3f54280caf6f2171fadc4128189024266c7b8daa 100644 (file)
--- a/tests/revert/workdir.c
+++ b/tests/revert/workdir.c
@@ -1,8 +1,7 @@
 #include "clar.h"
 #include "clar_libgit2.h"
 
-#include "buffer.h"
-#include "fileops.h"
+#include "futils.h"
 #include "git2/revert.h"
 
 #include "../merge/merge_helpers.h"
@@ -12,7 +11,7 @@
 static git_repository *repo;
 static git_index *repo_index;
 
-// Fixture setup and teardown
+/* Fixture setup and teardown */
 void test_revert_workdir__initialize(void)
 {
        git_config *cfg;
@@ -66,7 +65,7 @@ void test_revert_workdir__conflicts(void)
        git_reference *head_ref;
        git_commit *head, *commit;
        git_oid revert_oid;
-       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[] = {
                { 0100644, "7731926a337c4eaba1e2187d90ebfa0a93659382", 1, "file1.txt" },
@@ -80,7 +79,7 @@ void test_revert_workdir__conflicts(void)
        git_oid_fromstr(&revert_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45");
 
        cl_git_pass(git_repository_head(&head_ref, repo));
-       cl_git_pass(git_reference_peel((git_object **)&head, head_ref, GIT_OBJ_COMMIT));
+       cl_git_pass(git_reference_peel((git_object **)&head, head_ref, GIT_OBJECT_COMMIT));
        cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL));
 
        cl_git_pass(git_commit_lookup(&commit, repo, &revert_oid));
@@ -112,7 +111,7 @@ void test_revert_workdir__conflicts(void)
                "File one\n" \
                ">>>>>>> parent of 72333f4... automergeable changes\n") == 0);
 
-       cl_assert(git_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG"));
+       cl_assert(git_fs_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG"));
        cl_git_pass(git_futils_readbuffer(&mergemsg_buf,
                TEST_REPO_PATH "/.git/MERGE_MSG"));
        cl_assert(strcmp(mergemsg_buf.ptr,
@@ -120,14 +119,14 @@ void test_revert_workdir__conflicts(void)
                "\n" \
                "This reverts commit 72333f47d4e83616630ff3b0ffe4c0faebcc3c45.\n"
                "\n" \
-               "Conflicts:\n" \
-               "\tfile1.txt\n") == 0);
+               "#Conflicts:\n" \
+               "#\tfile1.txt\n") == 0);
 
        git_commit_free(commit);
        git_commit_free(head);
        git_reference_free(head_ref);
-       git_buf_free(&mergemsg_buf);
-       git_buf_free(&conflicting_buf);
+       git_str_dispose(&mergemsg_buf);
+       git_str_dispose(&conflicting_buf);
 }
 
 /* git reset --hard 39467716290f6df775a91cdb9a4eb39295018145
@@ -178,7 +177,7 @@ void test_revert_workdir__again(void)
        };
 
        cl_git_pass(git_repository_head(&head_ref, repo));
-       cl_git_pass(git_reference_peel((git_object **)&orig_head, head_ref, GIT_OBJ_COMMIT));
+       cl_git_pass(git_reference_peel((git_object **)&orig_head, head_ref, GIT_OBJECT_COMMIT));
        cl_git_pass(git_reset(repo, (git_object *)orig_head, GIT_RESET_HARD, NULL));
 
        cl_git_pass(git_revert(repo, orig_head, NULL));
@@ -308,7 +307,7 @@ void test_revert_workdir__again_after_edit(void)
  */
 void test_revert_workdir__again_after_edit_two(void)
 {
-       git_buf diff_buf = GIT_BUF_INIT;
+       git_str diff_buf = GIT_STR_INIT;
        git_config *config;
        git_oid head_commit_oid, revert_commit_oid;
        git_commit *head_commit, *revert_commit;
@@ -334,21 +333,23 @@ void test_revert_workdir__again_after_edit_two(void)
        cl_assert(merge_test_index(repo_index, merge_index_entries, 3));
 
        cl_git_pass(git_futils_readbuffer(&diff_buf, "revert/file.txt"));
-       cl_assert(strcmp(diff_buf.ptr,  "a\n" \
-               "<<<<<<< HEAD\n" \
-               "=======\n" \
-               "a\n" \
-               ">>>>>>> parent of 97e52d5... Revert me\n" \
-               "a\n" \
-               "a\n" \
-               "a\n" \
-               "a\n" \
-               "ab\n") == 0);
+       cl_assert_equal_s(
+                       "a\n" \
+                       "<<<<<<< HEAD\n" \
+                       "=======\n" \
+                       "a\n" \
+                       ">>>>>>> parent of 97e52d5... Revert me\n" \
+                       "a\n" \
+                       "a\n" \
+                       "a\n" \
+                       "a\n" \
+                       "ab",
+               diff_buf.ptr);
 
        git_commit_free(revert_commit);
        git_commit_free(head_commit);
        git_config_free(config);
-       git_buf_free(&diff_buf);
+       git_str_dispose(&diff_buf);
 }
 
 /* git reset --hard 72333f47d4e83616630ff3b0ffe4c0faebcc3c45
@@ -408,7 +409,7 @@ void test_revert_workdir__rename_1_of_2(void)
                { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 2, "file6.txt" },
        };
 
-       opts.merge_opts.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES;
+       opts.merge_opts.flags |= GIT_MERGE_FIND_RENAMES;
        opts.merge_opts.rename_threshold = 50;
 
        git_oid_fromstr(&head_oid, "cef56612d71a6af8d8015691e4865f7fece905b5");
@@ -442,7 +443,7 @@ void test_revert_workdir__rename(void)
                { "file4.txt", "file5.txt", "" },
        };
 
-       opts.merge_opts.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES;
+       opts.merge_opts.flags |= GIT_MERGE_FIND_RENAMES;
        opts.merge_opts.rename_threshold = 50;
 
        git_oid_fromstr(&head_oid, "55568c8de5322ff9a95d72747a239cdb64a19965");
@@ -475,7 +476,7 @@ void test_revert_workdir__head(void)
 
        /* HEAD is 2d440f2b3147d3dc7ad1085813478d6d869d5a4d */
        cl_git_pass(git_repository_head(&head, repo));
-       cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJ_COMMIT));
+       cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJECT_COMMIT));
        cl_git_pass(git_reset(repo, (git_object *)commit, GIT_RESET_HARD, NULL));
        cl_git_pass(git_revert(repo, commit, NULL));
 
@@ -493,12 +494,12 @@ void test_revert_workdir__nonmerge_fails_mainline_specified(void)
        git_revert_options opts = GIT_REVERT_OPTIONS_INIT;
 
        cl_git_pass(git_repository_head(&head, repo));
-       cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJ_COMMIT));
+       cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJECT_COMMIT));
 
        opts.mainline = 1;
        cl_must_fail(git_revert(repo, commit, &opts));
-       cl_assert(!git_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG"));
-       cl_assert(!git_path_exists(TEST_REPO_PATH "/.git/REVERT_HEAD"));
+       cl_assert(!git_fs_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG"));
+       cl_assert(!git_fs_path_exists(TEST_REPO_PATH "/.git/REVERT_HEAD"));
 
        git_reference_free(head);
        git_commit_free(commit);
@@ -516,8 +517,8 @@ void test_revert_workdir__merge_fails_without_mainline_specified(void)
        cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL));
 
        cl_must_fail(git_revert(repo, head, NULL));
-       cl_assert(!git_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG"));
-       cl_assert(!git_path_exists(TEST_REPO_PATH "/.git/REVERT_HEAD"));
+       cl_assert(!git_fs_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG"));
+       cl_assert(!git_fs_path_exists(TEST_REPO_PATH "/.git/REVERT_HEAD"));
 
        git_commit_free(head);
 }