tests/merge/trees/renames.c

   1 #include "clar_libgit2.h"
   2 #include "git2/repository.h"
   3 #include "git2/merge.h"
   4 #include "merge.h"
   5 #include "../merge_helpers.h"
   6 #include "futils.h"
   7
   8 static git_repository *repo;
   9
  10 #define TEST_REPO_PATH "merge-resolve"
  11
  12 #define BRANCH_RENAME_OURS                                      "rename_conflict_ours"
  13 #define BRANCH_RENAME_THEIRS                            "rename_conflict_theirs"
  14
  15 /* Fixture setup and teardown */
  16 void test_merge_trees_renames__initialize(void)
  17 {
  18         repo = cl_git_sandbox_init(TEST_REPO_PATH);
  19 }
  20
  21 void test_merge_trees_renames__cleanup(void)
  22 {
  23         cl_git_sandbox_cleanup();
  24 }
  25
  26 void test_merge_trees_renames__index(void)
  27 {
  28         git_index *index;
  29         git_merge_options *opts = NULL;
  30
  31         struct merge_index_entry merge_index_entries[] = {
  32                 { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" },
  33                 { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 0, "0b-duplicated-in-ours.txt" },
  34                 { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 1, "0b-rewritten-in-ours.txt" },
  35                 { 0100644, "e376fbdd06ebf021c92724da9f26f44212734e3e", 2, "0b-rewritten-in-ours.txt" },
  36                 { 0100644, "b2d399ae15224e1d58066e3c8df70ce37de7a656", 3, "0b-rewritten-in-ours.txt" },
  37                 { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 0, "0c-duplicated-in-theirs.txt" },
  38                 { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 1, "0c-rewritten-in-theirs.txt" },
  39                 { 0100644, "efc9121fdedaf08ba180b53ebfbcf71bd488ed09", 2, "0c-rewritten-in-theirs.txt" },
  40                 { 0100644, "712ebba6669ea847d9829e4f1059d6c830c8b531", 3, "0c-rewritten-in-theirs.txt" },
  41                 { 0100644, "0d872f8e871a30208305978ecbf9e66d864f1638", 0, "1a-newname-in-ours-edited-in-theirs.txt" },
  42                 { 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", 0, "1a-newname-in-ours.txt" },
  43                 { 0100644, "ed9523e62e453e50dd9be1606af19399b96e397a", 0, "1b-newname-in-theirs-edited-in-ours.txt" },
  44                 { 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", 0, "1b-newname-in-theirs.txt" },
  45                 { 0100644, "178940b450f238a56c0d75b7955cb57b38191982", 0, "2-newname-in-both.txt" },
  46                 { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 2, "3a-newname-in-ours-deleted-in-theirs.txt" },
  47                 { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 1, "3a-renamed-in-ours-deleted-in-theirs.txt" },
  48                 { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 3, "3b-newname-in-theirs-deleted-in-ours.txt" },
  49                 { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 1, "3b-renamed-in-theirs-deleted-in-ours.txt" },
  50                 { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 2, "4a-newname-in-ours-added-in-theirs.txt" },
  51                 { 0100644, "8b5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a", 3, "4a-newname-in-ours-added-in-theirs.txt" },
  52                 { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 1, "4a-renamed-in-ours-added-in-theirs.txt" },
  53                 { 0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9", 2, "4b-newname-in-theirs-added-in-ours.txt" },
  54                 { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 3, "4b-newname-in-theirs-added-in-ours.txt" },
  55                 { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 1, "4b-renamed-in-theirs-added-in-ours.txt" },
  56                 { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 2, "5a-newname-in-ours-added-in-theirs.txt" },
  57                 { 0100644, "98ba4205fcf31f5dd93c916d35fe3f3b3d0e6714", 3, "5a-newname-in-ours-added-in-theirs.txt" },
  58                 { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 1, "5a-renamed-in-ours-added-in-theirs.txt" },
  59                 { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 3, "5a-renamed-in-ours-added-in-theirs.txt" },
  60                 { 0100644, "385c8a0f26ddf79e9041e15e17dc352ed2c4cced", 2, "5b-newname-in-theirs-added-in-ours.txt" },
  61                 { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 3, "5b-newname-in-theirs-added-in-ours.txt" },
  62                 { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 1, "5b-renamed-in-theirs-added-in-ours.txt" },
  63                 { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 2, "5b-renamed-in-theirs-added-in-ours.txt" },
  64                 { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 2, "6-both-renamed-1-to-2-ours.txt" },
  65                 { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 3, "6-both-renamed-1-to-2-theirs.txt" },
  66                 { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 1, "6-both-renamed-1-to-2.txt" },
  67                 { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 1, "7-both-renamed-side-1.txt" },
  68                 { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 3, "7-both-renamed-side-1.txt" },
  69                 { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 1, "7-both-renamed-side-2.txt" },
  70                 { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 2, "7-both-renamed-side-2.txt" },
  71                 { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 2, "7-both-renamed.txt" },
  72                 { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 3, "7-both-renamed.txt" },
  73         };
  74
  75         struct merge_name_entry merge_name_entries[] = {
  76                 {
  77                         "3a-renamed-in-ours-deleted-in-theirs.txt",
  78                         "3a-newname-in-ours-deleted-in-theirs.txt",
  79                         ""
  80                 },
  81
  82                 {
  83                         "3b-renamed-in-theirs-deleted-in-ours.txt",
  84                         "",
  85                         "3b-newname-in-theirs-deleted-in-ours.txt",
  86                 },
  87
  88                 {
  89                         "4a-renamed-in-ours-added-in-theirs.txt",
  90                         "4a-newname-in-ours-added-in-theirs.txt",
  91                         "",
  92                 },
  93
  94                 {
  95                         "4b-renamed-in-theirs-added-in-ours.txt",
  96                         "",
  97                         "4b-newname-in-theirs-added-in-ours.txt",
  98                 },
  99
 100                 {
 101                         "5a-renamed-in-ours-added-in-theirs.txt",
 102                         "5a-newname-in-ours-added-in-theirs.txt",
 103                         "5a-renamed-in-ours-added-in-theirs.txt",
 104                 },
 105
 106                 {
 107                         "5b-renamed-in-theirs-added-in-ours.txt",
 108                         "5b-renamed-in-theirs-added-in-ours.txt",
 109                         "5b-newname-in-theirs-added-in-ours.txt",
 110                 },
 111
 112                 {
 113                         "6-both-renamed-1-to-2.txt",
 114                         "6-both-renamed-1-to-2-ours.txt",
 115                         "6-both-renamed-1-to-2-theirs.txt",
 116                 },
 117
 118                 {
 119                         "7-both-renamed-side-1.txt",
 120                         "7-both-renamed.txt",
 121                         "7-both-renamed-side-1.txt",
 122                 },
 123
 124                 {
 125                         "7-both-renamed-side-2.txt",
 126                         "7-both-renamed-side-2.txt",
 127                         "7-both-renamed.txt",
 128                 },
 129         };
 130
 131         struct merge_reuc_entry merge_reuc_entries[] = {
 132                 { "1a-newname-in-ours-edited-in-theirs.txt",
 133                         0, 0100644, 0,
 134                         "",
 135                         "c3d02eeef75183df7584d8d13ac03053910c1301",
 136                         "" },
 137
 138                 { "1a-newname-in-ours.txt",
 139                         0, 0100644, 0,
 140                         "",
 141                         "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb",
 142                         "" },
 143
 144                 { "1a-renamed-in-ours-edited-in-theirs.txt",
 145                         0100644, 0, 0100644,
 146                         "c3d02eeef75183df7584d8d13ac03053910c1301",
 147                         "",
 148                         "0d872f8e871a30208305978ecbf9e66d864f1638" },
 149
 150                 { "1a-renamed-in-ours.txt",
 151                         0100644, 0, 0100644,
 152                         "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb",
 153                         "",
 154                         "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb" },
 155
 156                 { "1b-newname-in-theirs-edited-in-ours.txt",
 157                         0, 0, 0100644,
 158                         "",
 159                         "",
 160                         "241a1005cd9b980732741b74385b891142bcba28" },
 161
 162                 { "1b-newname-in-theirs.txt",
 163                         0, 0, 0100644,
 164                         "",
 165                         "",
 166                         "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136" },
 167
 168                 { "1b-renamed-in-theirs-edited-in-ours.txt",
 169                         0100644, 0100644, 0,
 170                         "241a1005cd9b980732741b74385b891142bcba28",
 171                         "ed9523e62e453e50dd9be1606af19399b96e397a",
 172                         "" },
 173
 174                 { "1b-renamed-in-theirs.txt",
 175                         0100644, 0100644, 0,
 176                         "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136",
 177                         "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136",
 178                         "" },
 179
 180                 { "2-newname-in-both.txt",
 181                         0, 0100644, 0100644,
 182                         "",
 183                         "178940b450f238a56c0d75b7955cb57b38191982",
 184                         "178940b450f238a56c0d75b7955cb57b38191982" },
 185
 186                 { "2-renamed-in-both.txt",
 187                         0100644, 0, 0,
 188                         "178940b450f238a56c0d75b7955cb57b38191982",
 189                         "",
 190                         "" },
 191         };
 192
 193         cl_git_pass(merge_trees_from_branches(&index, repo,
 194                 BRANCH_RENAME_OURS, BRANCH_RENAME_THEIRS,
 195                 opts));
 196
 197         cl_assert(merge_test_index(index, merge_index_entries, 41));
 198         cl_assert(merge_test_names(index, merge_name_entries, 9));
 199         cl_assert(merge_test_reuc(index, merge_reuc_entries, 10));
 200
 201         git_index_free(index);
 202 }
 203
 204 void test_merge_trees_renames__no_rename_index(void)
 205 {
 206         git_index *index;
 207         git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
 208
 209         struct merge_index_entry merge_index_entries[] = {
 210                 { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" },
 211                 { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 0, "0b-duplicated-in-ours.txt" },
 212                 { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 1, "0b-rewritten-in-ours.txt" },
 213                 { 0100644, "e376fbdd06ebf021c92724da9f26f44212734e3e", 2, "0b-rewritten-in-ours.txt" },
 214                 { 0100644, "b2d399ae15224e1d58066e3c8df70ce37de7a656", 3, "0b-rewritten-in-ours.txt" },
 215                 { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 0, "0c-duplicated-in-theirs.txt" },
 216                 { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 1, "0c-rewritten-in-theirs.txt" },
 217                 { 0100644, "efc9121fdedaf08ba180b53ebfbcf71bd488ed09", 2, "0c-rewritten-in-theirs.txt" },
 218                 { 0100644, "712ebba6669ea847d9829e4f1059d6c830c8b531", 3, "0c-rewritten-in-theirs.txt" },
 219                 { 0100644, "c3d02eeef75183df7584d8d13ac03053910c1301", 0, "1a-newname-in-ours-edited-in-theirs.txt" },
 220                 { 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", 0, "1a-newname-in-ours.txt" },
 221                 { 0100644, "c3d02eeef75183df7584d8d13ac03053910c1301", 1, "1a-renamed-in-ours-edited-in-theirs.txt" },
 222                 { 0100644, "0d872f8e871a30208305978ecbf9e66d864f1638", 3, "1a-renamed-in-ours-edited-in-theirs.txt" },
 223                 { 0100644, "241a1005cd9b980732741b74385b891142bcba28", 0, "1b-newname-in-theirs-edited-in-ours.txt" },
 224                 { 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", 0, "1b-newname-in-theirs.txt" },
 225                 { 0100644, "241a1005cd9b980732741b74385b891142bcba28", 1, "1b-renamed-in-theirs-edited-in-ours.txt" },
 226                 { 0100644, "ed9523e62e453e50dd9be1606af19399b96e397a", 2, "1b-renamed-in-theirs-edited-in-ours.txt" },
 227                 { 0100644, "178940b450f238a56c0d75b7955cb57b38191982", 0, "2-newname-in-both.txt" },
 228                 { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 0, "3a-newname-in-ours-deleted-in-theirs.txt" },
 229                 { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 0, "3b-newname-in-theirs-deleted-in-ours.txt" },
 230                 { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 2, "4a-newname-in-ours-added-in-theirs.txt" },
 231                 { 0100644, "8b5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a", 3, "4a-newname-in-ours-added-in-theirs.txt" },
 232                 { 0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9", 2, "4b-newname-in-theirs-added-in-ours.txt" },
 233                 { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 3, "4b-newname-in-theirs-added-in-ours.txt" },
 234                 { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 2, "5a-newname-in-ours-added-in-theirs.txt" },
 235                 { 0100644, "98ba4205fcf31f5dd93c916d35fe3f3b3d0e6714", 3, "5a-newname-in-ours-added-in-theirs.txt" },
 236                 { 0100644, "385c8a0f26ddf79e9041e15e17dc352ed2c4cced", 2, "5b-newname-in-theirs-added-in-ours.txt" },
 237                 { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 3, "5b-newname-in-theirs-added-in-ours.txt" },
 238                 { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 0, "6-both-renamed-1-to-2-ours.txt" },
 239                 { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 0, "6-both-renamed-1-to-2-theirs.txt" },
 240                 { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 2, "7-both-renamed.txt" },
 241                 { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 3, "7-both-renamed.txt" },
 242         };
 243
 244         opts.flags &= ~GIT_MERGE_FIND_RENAMES;
 245
 246         cl_git_pass(merge_trees_from_branches(&index, repo,
 247                 BRANCH_RENAME_OURS, BRANCH_RENAME_THEIRS,
 248                 &opts));
 249
 250         cl_assert(merge_test_index(index, merge_index_entries, 32));
 251
 252         git_index_free(index);
 253 }
 254
 255 void test_merge_trees_renames__submodules(void)
 256 {
 257         git_index *index;
 258         git_merge_options *opts = NULL;
 259
 260         struct merge_index_entry merge_index_entries[] = {
 261                 { 0100644, "cd3e8d4aa06bdc781f264171030bc28f2b370fee", 0, ".gitmodules" },
 262                 { 0100644, "4dd1ef7569b18d92d93c0a35bb6b93049137b355", 1, "file.txt" },
 263                 { 0100644, "a2d8d1824c68541cca94ffb90f79291eba495921", 2, "file.txt" },
 264                 { 0100644, "63ec604d491161ddafdae4179843c26d54bd999a", 3, "file.txt" },
 265                 { 0160000, "0000000000000000000000000000000000000001", 1, "submodule1" },
 266                 { 0160000, "0000000000000000000000000000000000000002", 3, "submodule1" },
 267                 { 0160000, "0000000000000000000000000000000000000003", 0, "submodule2" },
 268         };
 269
 270         cl_git_pass(merge_trees_from_branches(&index, repo,
 271                 "submodule_rename1", "submodule_rename2",
 272                 opts));
 273         cl_assert(merge_test_index(index, merge_index_entries, 7));
 274         git_index_free(index);
 275 }
 276
 277 void test_merge_trees_renames__cache_recomputation(void)
 278 {
 279         git_oid blob, binary, ancestor_oid, theirs_oid, ours_oid;
 280         git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
 281         git_str path = GIT_STR_INIT;
 282         git_treebuilder *builder;
 283         git_tree *ancestor_tree, *their_tree, *our_tree;
 284         git_index *index;
 285         size_t blob_size;
 286         void *data;
 287         size_t i;
 288
 289         cl_git_pass(git_oid_fromstr(&blob, "a2d8d1824c68541cca94ffb90f79291eba495921"));
 290
 291         /*
 292          * Create a 50MB blob that consists of NUL bytes only. It is important
 293          * that this blob is of a special format, most importantly it cannot
 294          * contain more than four non-consecutive newlines or NUL bytes. This
 295          * is because of git_hashsig's inner workings where all files with less
 296          * than four "lines" are deemed to small.
 297          */
 298         blob_size = 50 * 1024 * 1024;
 299         cl_assert(data = git__calloc(blob_size, 1));
 300         cl_git_pass(git_blob_create_from_buffer(&binary, repo, data, blob_size));
 301
 302         /*
 303          * Create the common ancestor, which has 1000 dummy blobs and the binary
 304          * blob. The dummy blobs serve as potential rename targets for the
 305          * dummy blob.
 306          */
 307         cl_git_pass(git_treebuilder_new(&builder, repo, NULL));
 308         for (i = 0; i < 1000; i++) {
 309                 cl_git_pass(git_str_printf(&path, "%"PRIuZ".txt", i));
 310                 cl_git_pass(git_treebuilder_insert(NULL, builder, path.ptr, &blob, GIT_FILEMODE_BLOB));
 311                 git_str_clear(&path);
 312         }
 313         cl_git_pass(git_treebuilder_insert(NULL, builder, "original.bin", &binary, GIT_FILEMODE_BLOB));
 314         cl_git_pass(git_treebuilder_write(&ancestor_oid, builder));
 315
 316         /* We now the binary blob in our tree. */
 317         cl_git_pass(git_treebuilder_remove(builder, "original.bin"));
 318         cl_git_pass(git_treebuilder_insert(NULL, builder, "renamed.bin", &binary, GIT_FILEMODE_BLOB));
 319         cl_git_pass(git_treebuilder_write(&ours_oid, builder));
 320
 321         git_treebuilder_free(builder);
 322
 323         /* And move everything into a subdirectory in their tree. */
 324         cl_git_pass(git_treebuilder_new(&builder, repo, NULL));
 325         cl_git_pass(git_treebuilder_insert(NULL, builder, "subdir", &ancestor_oid, GIT_FILEMODE_TREE));
 326         cl_git_pass(git_treebuilder_write(&theirs_oid, builder));
 327
 328         /*
 329          * Now merge ancestor, ours and theirs. As `git_hashsig` refuses to
 330          * create a hash signature for the 50MB binary file, we historically
 331          * didn't cache the hashsig computation for it. As a result, we now
 332          * started looking up the 50MB blob and scanning it at least 1000
 333          * times, which takes a long time.
 334          *
 335          * The number of 1000 blobs is chosen in such a way that it's
 336          * noticeable when the bug creeps in again, as it takes around 12
 337          * minutes on my machine to compute the following merge.
 338          */
 339         opts.target_limit = 5000;
 340         cl_git_pass(git_tree_lookup(&ancestor_tree, repo, &ancestor_oid));
 341         cl_git_pass(git_tree_lookup(&their_tree, repo, &theirs_oid));
 342         cl_git_pass(git_tree_lookup(&our_tree, repo, &ours_oid));
 343         cl_git_pass(git_merge_trees(&index, repo, ancestor_tree, our_tree, their_tree, &opts));
 344
 345         git_treebuilder_free(builder);
 346         git_str_dispose(&path);
 347         git_index_free(index);
 348         git_tree_free(ancestor_tree);
 349         git_tree_free(their_tree);
 350         git_tree_free(our_tree);
 351         git__free(data);
 352 }