tests/merge/trees/automerge.c

   1 #include "clar_libgit2.h"
   2 #include "git2/repository.h"
   3 #include "git2/merge.h"
   4 #include "buffer.h"
   5 #include "merge.h"
   6 #include "../merge_helpers.h"
   7 #include "fileops.h"
   8
   9 static git_repository *repo;
  10
  11 #define TEST_REPO_PATH "merge-resolve"
  12 #define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index"
  13
  14 #define THEIRS_AUTOMERGE_BRANCH        "branch"
  15
  16 #define THEIRS_UNRELATED_BRANCH         "unrelated"
  17 #define THEIRS_UNRELATED_OID            "55b4e4687e7a0d9ca367016ed930f385d4022e6f"
  18 #define THEIRS_UNRELATED_PARENT         "d6cf6c7741b3316826af1314042550c97ded1d50"
  19
  20 #define OURS_DIRECTORY_FILE                     "df_side1"
  21 #define THEIRS_DIRECTORY_FILE           "df_side2"
  22
  23 /* Non-conflicting files, index entries are common to every merge operation */
  24 #define ADDED_IN_MASTER_INDEX_ENTRY     \
  25         { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0,  "added-in-master.txt" }
  26 #define AUTOMERGEABLE_INDEX_ENTRY \
  27         { 0100644, "f2e1550a0c9e53d5811175864a29536642ae3821", 0,  "automergeable.txt" }
  28 #define CHANGED_IN_BRANCH_INDEX_ENTRY \
  29         { 0100644, "4eb04c9e79e88f6640d01ff5b25ca2a60764f216", 0,  "changed-in-branch.txt" }
  30 #define CHANGED_IN_MASTER_INDEX_ENTRY \
  31         { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0,  "changed-in-master.txt" }
  32 #define UNCHANGED_INDEX_ENTRY \
  33         { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0,  "unchanged.txt" }
  34
  35 /* Expected REUC entries */
  36 #define AUTOMERGEABLE_REUC_ENTRY \
  37         { "automergeable.txt", 0100644, 0100644, 0100644, \
  38           "6212c31dab5e482247d7977e4f0dd3601decf13b", \
  39           "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", \
  40           "058541fc37114bfc1dddf6bd6bffc7fae5c2e6fe" }
  41 #define CONFLICTING_REUC_ENTRY \
  42         { "conflicting.txt", 0100644, 0100644, 0100644, \
  43           "d427e0b2e138501a3d15cc376077a3631e15bd46", \
  44           "4e886e602529caa9ab11d71f86634bd1b6e0de10", \
  45           "2bd0a343aeef7a2cf0d158478966a6e587ff3863" }
  46 #define REMOVED_IN_BRANCH_REUC_ENTRY \
  47         { "removed-in-branch.txt", 0100644, 0100644, 0, \
  48           "dfe3f22baa1f6fce5447901c3086bae368de6bdd", \
  49           "dfe3f22baa1f6fce5447901c3086bae368de6bdd", \
  50           "" }
  51 #define REMOVED_IN_MASTER_REUC_ENTRY \
  52         { "removed-in-master.txt", 0100644, 0, 0100644, \
  53           "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", \
  54           "", \
  55           "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5" }
  56
  57 #define AUTOMERGEABLE_MERGED_FILE \
  58         "this file is changed in master\n" \
  59         "this file is automergeable\n" \
  60         "this file is automergeable\n" \
  61         "this file is automergeable\n" \
  62         "this file is automergeable\n" \
  63         "this file is automergeable\n" \
  64         "this file is automergeable\n" \
  65         "this file is automergeable\n" \
  66         "this file is changed in branch\n"
  67
  68 #define AUTOMERGEABLE_MERGED_FILE_CRLF \
  69         "this file is changed in master\r\n" \
  70         "this file is automergeable\r\n" \
  71         "this file is automergeable\r\n" \
  72         "this file is automergeable\r\n" \
  73         "this file is automergeable\r\n" \
  74         "this file is automergeable\r\n" \
  75         "this file is automergeable\r\n" \
  76         "this file is automergeable\r\n" \
  77         "this file is changed in branch\r\n"
  78
  79 // Fixture setup and teardown
  80 void test_merge_trees_automerge__initialize(void)
  81 {
  82         repo = cl_git_sandbox_init(TEST_REPO_PATH);
  83 }
  84
  85 void test_merge_trees_automerge__cleanup(void)
  86 {
  87         cl_git_sandbox_cleanup();
  88 }
  89
  90 void test_merge_trees_automerge__automerge(void)
  91 {
  92         git_index *index;
  93         const git_index_entry *entry;
  94         git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
  95         git_blob *blob;
  96
  97         struct merge_index_entry merge_index_entries[] = {
  98                 ADDED_IN_MASTER_INDEX_ENTRY,
  99                 AUTOMERGEABLE_INDEX_ENTRY,
 100                 CHANGED_IN_BRANCH_INDEX_ENTRY,
 101                 CHANGED_IN_MASTER_INDEX_ENTRY,
 102
 103                 { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" },
 104                 { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" },
 105                 { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" },
 106
 107                 UNCHANGED_INDEX_ENTRY,
 108         };
 109
 110         struct merge_reuc_entry merge_reuc_entries[] = {
 111                 AUTOMERGEABLE_REUC_ENTRY,
 112                 REMOVED_IN_BRANCH_REUC_ENTRY,
 113                 REMOVED_IN_MASTER_REUC_ENTRY
 114         };
 115
 116         cl_git_pass(merge_trees_from_branches(&index, repo, "master", THEIRS_AUTOMERGE_BRANCH, &opts));
 117
 118         cl_assert(merge_test_index(index, merge_index_entries, 8));
 119         cl_assert(merge_test_reuc(index, merge_reuc_entries, 3));
 120
 121         cl_assert((entry = git_index_get_bypath(index, "automergeable.txt", 0)) != NULL);
 122         cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE));
 123
 124         cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->oid, GIT_OBJ_BLOB));
 125         cl_assert(memcmp(git_blob_rawcontent(blob), AUTOMERGEABLE_MERGED_FILE, (size_t)entry->file_size) == 0);
 126
 127         git_index_free(index);
 128         git_blob_free(blob);
 129 }
 130
 131 void test_merge_trees_automerge__favor_ours(void)
 132 {
 133         git_index *index;
 134         git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
 135
 136         struct merge_index_entry merge_index_entries[] = {
 137                 ADDED_IN_MASTER_INDEX_ENTRY,
 138                 AUTOMERGEABLE_INDEX_ENTRY,
 139                 CHANGED_IN_BRANCH_INDEX_ENTRY,
 140                 CHANGED_IN_MASTER_INDEX_ENTRY,
 141                 { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 0, "conflicting.txt" },
 142                 UNCHANGED_INDEX_ENTRY,
 143         };
 144
 145         struct merge_reuc_entry merge_reuc_entries[] = {
 146                 AUTOMERGEABLE_REUC_ENTRY,
 147                 CONFLICTING_REUC_ENTRY,
 148                 REMOVED_IN_BRANCH_REUC_ENTRY,
 149                 REMOVED_IN_MASTER_REUC_ENTRY,
 150         };
 151
 152         opts.file_favor = GIT_MERGE_FILE_FAVOR_OURS;
 153
 154         cl_git_pass(merge_trees_from_branches(&index, repo, "master", THEIRS_AUTOMERGE_BRANCH, &opts));
 155
 156         cl_assert(merge_test_index(index, merge_index_entries, 6));
 157         cl_assert(merge_test_reuc(index, merge_reuc_entries, 4));
 158
 159         git_index_free(index);
 160 }
 161
 162 void test_merge_trees_automerge__favor_theirs(void)
 163 {
 164         git_index *index;
 165         git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
 166
 167         struct merge_index_entry merge_index_entries[] = {
 168                 ADDED_IN_MASTER_INDEX_ENTRY,
 169                 AUTOMERGEABLE_INDEX_ENTRY,
 170                 CHANGED_IN_BRANCH_INDEX_ENTRY,
 171                 CHANGED_IN_MASTER_INDEX_ENTRY,
 172                 { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 0, "conflicting.txt" },
 173                 UNCHANGED_INDEX_ENTRY,
 174         };
 175
 176         struct merge_reuc_entry merge_reuc_entries[] = {
 177                 AUTOMERGEABLE_REUC_ENTRY,
 178                 CONFLICTING_REUC_ENTRY,
 179                 REMOVED_IN_BRANCH_REUC_ENTRY,
 180                 REMOVED_IN_MASTER_REUC_ENTRY,
 181         };
 182
 183         opts.file_favor = GIT_MERGE_FILE_FAVOR_THEIRS;
 184
 185         cl_git_pass(merge_trees_from_branches(&index, repo, "master", THEIRS_AUTOMERGE_BRANCH, &opts));
 186
 187         cl_assert(merge_test_index(index, merge_index_entries, 6));
 188         cl_assert(merge_test_reuc(index, merge_reuc_entries, 4));
 189
 190         git_index_free(index);
 191 }
 192
 193 void test_merge_trees_automerge__unrelated(void)
 194 {
 195         git_index *index;
 196         git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
 197
 198         struct merge_index_entry merge_index_entries[] = {
 199                 { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" },
 200                 { 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 2, "automergeable.txt" },
 201                 { 0100644, "d07ec190c306ec690bac349e87d01c4358e49bb2", 3, "automergeable.txt" },
 202                 { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt" },
 203                 { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt" },
 204                 { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" },
 205                 { 0100644, "4b253da36a0ae8bfce63aeabd8c5b58429925594", 3, "conflicting.txt" },
 206                 { 0100644, "ef58fdd8086c243bdc81f99e379acacfd21d32d6", 0, "new-in-unrelated1.txt" },
 207                 { 0100644, "948ba6e701c1edab0c2d394fb7c5538334129793", 0, "new-in-unrelated2.txt" },
 208                 { 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt" },
 209                 { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "unchanged.txt" },
 210         };
 211
 212         cl_git_pass(merge_trees_from_branches(&index, repo, "master", THEIRS_UNRELATED_BRANCH, &opts));
 213
 214         cl_assert(merge_test_index(index, merge_index_entries, 11));
 215
 216         git_index_free(index);
 217 }