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