tests/merge/merge_helpers.c

   1 #include "clar_libgit2.h"
   2 #include "fileops.h"
   3 #include "refs.h"
   4 #include "tree.h"
   5 #include "merge_helpers.h"
   6 #include "merge.h"
   7 #include "git2/merge.h"
   8 #include "git2/sys/index.h"
   9
  10 int merge_trees_from_branches(
  11         git_index **index, git_repository *repo,
  12         const char *ours_name, const char *theirs_name,
  13         git_merge_tree_opts *opts)
  14 {
  15         git_commit *our_commit, *their_commit, *ancestor_commit = NULL;
  16         git_tree *our_tree, *their_tree, *ancestor_tree = NULL;
  17         git_oid our_oid, their_oid, ancestor_oid;
  18         git_buf branch_buf = GIT_BUF_INIT;
  19         int error;
  20
  21         git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, ours_name);
  22         cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr));
  23         cl_git_pass(git_commit_lookup(&our_commit, repo, &our_oid));
  24
  25         git_buf_clear(&branch_buf);
  26         git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, theirs_name);
  27         cl_git_pass(git_reference_name_to_id(&their_oid, repo, branch_buf.ptr));
  28         cl_git_pass(git_commit_lookup(&their_commit, repo, &their_oid));
  29
  30         error = git_merge_base(&ancestor_oid, repo, git_commit_id(our_commit), git_commit_id(their_commit));
  31
  32         if (error != GIT_ENOTFOUND) {
  33                 cl_git_pass(error);
  34
  35                 cl_git_pass(git_commit_lookup(&ancestor_commit, repo, &ancestor_oid));
  36                 cl_git_pass(git_commit_tree(&ancestor_tree, ancestor_commit));
  37         }
  38
  39         cl_git_pass(git_commit_tree(&our_tree, our_commit));
  40         cl_git_pass(git_commit_tree(&their_tree, their_commit));
  41
  42         cl_git_pass(git_merge_trees(index, repo, ancestor_tree, our_tree, their_tree, opts));
  43
  44         git_buf_free(&branch_buf);
  45         git_tree_free(our_tree);
  46         git_tree_free(their_tree);
  47         git_tree_free(ancestor_tree);
  48         git_commit_free(our_commit);
  49         git_commit_free(their_commit);
  50         git_commit_free(ancestor_commit);
  51
  52         return 0;
  53 }
  54
  55 int merge_commits_from_branches(
  56         git_index **index, git_repository *repo,
  57         const char *ours_name, const char *theirs_name,
  58         git_merge_tree_opts *opts)
  59 {
  60         git_commit *our_commit, *their_commit;
  61         git_oid our_oid, their_oid;
  62         git_buf branch_buf = GIT_BUF_INIT;
  63
  64         git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, ours_name);
  65         cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr));
  66         cl_git_pass(git_commit_lookup(&our_commit, repo, &our_oid));
  67
  68         git_buf_clear(&branch_buf);
  69         git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, theirs_name);
  70         cl_git_pass(git_reference_name_to_id(&their_oid, repo, branch_buf.ptr));
  71         cl_git_pass(git_commit_lookup(&their_commit, repo, &their_oid));
  72
  73         cl_git_pass(git_merge_commits(index, repo, our_commit, their_commit, opts));
  74
  75         git_buf_free(&branch_buf);
  76         git_commit_free(our_commit);
  77         git_commit_free(their_commit);
  78
  79         return 0;
  80 }
  81
  82 int merge_branches(git_merge_result **result, git_repository *repo, const char *ours_branch, const char *theirs_branch, git_merge_opts *opts)
  83 {
  84         git_reference *head_ref, *theirs_ref;
  85         git_merge_head *theirs_head;
  86         git_checkout_options head_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
  87
  88         head_checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
  89
  90         cl_git_pass(git_reference_symbolic_create(&head_ref, repo, "HEAD", ours_branch, 1, NULL, NULL));
  91         cl_git_pass(git_checkout_head(repo, &head_checkout_opts));
  92
  93         cl_git_pass(git_reference_lookup(&theirs_ref, repo, theirs_branch));
  94         cl_git_pass(git_merge_head_from_ref(&theirs_head, repo, theirs_ref));
  95
  96         cl_git_pass(git_merge(result, repo, (const git_merge_head **)&theirs_head, 1, opts));
  97
  98         git_reference_free(head_ref);
  99         git_reference_free(theirs_ref);
 100         git_merge_head_free(theirs_head);
 101
 102         return 0;
 103 }
 104
 105 void merge__dump_index_entries(git_vector *index_entries)
 106 {
 107         size_t i;
 108         const git_index_entry *index_entry;
 109
 110         printf ("\nINDEX [%d]:\n", (int)index_entries->length);
 111         for (i = 0; i < index_entries->length; i++) {
 112                 index_entry = index_entries->contents[i];
 113
 114                 printf("%o ", index_entry->mode);
 115                 printf("%s ", git_oid_allocfmt(&index_entry->id));
 116                 printf("%d ", git_index_entry_stage(index_entry));
 117                 printf("%s ", index_entry->path);
 118                 printf("\n");
 119         }
 120         printf("\n");
 121 }
 122
 123 void merge__dump_names(git_index *index)
 124 {
 125         size_t i;
 126         const git_index_name_entry *conflict_name;
 127
 128         for (i = 0; i < git_index_name_entrycount(index); i++) {
 129                 conflict_name = git_index_name_get_byindex(index, i);
 130
 131                 printf("%s %s %s\n", conflict_name->ancestor, conflict_name->ours, conflict_name->theirs);
 132         }
 133         printf("\n");
 134 }
 135
 136 void merge__dump_reuc(git_index *index)
 137 {
 138         size_t i;
 139         const git_index_reuc_entry *reuc;
 140
 141         printf ("\nREUC:\n");
 142         for (i = 0; i < git_index_reuc_entrycount(index); i++) {
 143                 reuc = git_index_reuc_get_byindex(index, i);
 144
 145                 printf("%s ", reuc->path);
 146                 printf("%o ", reuc->mode[0]);
 147                 printf("%s\n", git_oid_allocfmt(&reuc->oid[0]));
 148                 printf("          %o ", reuc->mode[1]);
 149                 printf("          %s\n", git_oid_allocfmt(&reuc->oid[1]));
 150                 printf("          %o ", reuc->mode[2]);
 151                 printf("          %s ", git_oid_allocfmt(&reuc->oid[2]));
 152                 printf("\n");
 153         }
 154         printf("\n");
 155 }
 156
 157 static int index_entry_eq_merge_index_entry(const struct merge_index_entry *expected, const git_index_entry *actual)
 158 {
 159         git_oid expected_oid;
 160         bool test_oid;
 161
 162         if (strlen(expected->oid_str) != 0) {
 163                 cl_git_pass(git_oid_fromstr(&expected_oid, expected->oid_str));
 164                 test_oid = 1;
 165         } else
 166                 test_oid = 0;
 167
 168         if (actual->mode != expected->mode ||
 169                 (test_oid && git_oid_cmp(&actual->id, &expected_oid) != 0) ||
 170                 git_index_entry_stage(actual) != expected->stage)
 171                 return 0;
 172
 173         if (actual->mode == 0 && (actual->path != NULL || strlen(expected->path) > 0))
 174                 return 0;
 175
 176         if (actual->mode != 0 && (strcmp(actual->path, expected->path) != 0))
 177                 return 0;
 178
 179         return 1;
 180 }
 181
 182 static int name_entry_eq(const char *expected, const char *actual)
 183 {
 184         if (strlen(expected) == 0)
 185                 return (actual == NULL) ? 1 : 0;
 186
 187         return (strcmp(expected, actual) == 0) ? 1 : 0;
 188 }
 189
 190 static int name_entry_eq_merge_name_entry(const struct merge_name_entry *expected, const git_index_name_entry *actual)
 191 {
 192         if (name_entry_eq(expected->ancestor_path, actual->ancestor) == 0 ||
 193                 name_entry_eq(expected->our_path, actual->ours) == 0 ||
 194                 name_entry_eq(expected->their_path, actual->theirs) == 0)
 195                 return 0;
 196
 197         return 1;
 198 }
 199
 200 static int index_conflict_data_eq_merge_diff(const struct merge_index_conflict_data *expected, git_merge_diff *actual)
 201 {
 202         if (!index_entry_eq_merge_index_entry(&expected->ancestor.entry, &actual->ancestor_entry) ||
 203                 !index_entry_eq_merge_index_entry(&expected->ours.entry, &actual->our_entry) ||
 204                 !index_entry_eq_merge_index_entry(&expected->theirs.entry, &actual->their_entry))
 205                 return 0;
 206
 207         if (expected->ours.status != actual->our_status ||
 208                 expected->theirs.status != actual->their_status)
 209                 return 0;
 210
 211         return 1;
 212 }
 213
 214 int merge_test_merge_conflicts(git_vector *conflicts, const struct merge_index_conflict_data expected[], size_t expected_len)
 215 {
 216         git_merge_diff *actual;
 217         size_t i;
 218
 219         if (conflicts->length != expected_len)
 220                 return 0;
 221
 222         for (i = 0; i < expected_len; i++) {
 223                 actual = conflicts->contents[i];
 224
 225                 if (!index_conflict_data_eq_merge_diff(&expected[i], actual))
 226                         return 0;
 227         }
 228
 229         return 1;
 230 }
 231
 232 int merge_test_index(git_index *index, const struct merge_index_entry expected[], size_t expected_len)
 233 {
 234         size_t i;
 235         const git_index_entry *index_entry;
 236
 237         /*
 238         dump_index_entries(&index->entries);
 239         */
 240
 241         if (git_index_entrycount(index) != expected_len)
 242                 return 0;
 243
 244         for (i = 0; i < expected_len; i++) {
 245                 if ((index_entry = git_index_get_byindex(index, i)) == NULL)
 246                         return 0;
 247
 248                 if (!index_entry_eq_merge_index_entry(&expected[i], index_entry))
 249                         return 0;
 250         }
 251
 252         return 1;
 253 }
 254
 255 int merge_test_names(git_index *index, const struct merge_name_entry expected[], size_t expected_len)
 256 {
 257         size_t i;
 258         const git_index_name_entry *name_entry;
 259
 260         /*
 261         dump_names(index);
 262         */
 263
 264         if (git_index_name_entrycount(index) != expected_len)
 265                 return 0;
 266
 267         for (i = 0; i < expected_len; i++) {
 268                 if ((name_entry = git_index_name_get_byindex(index, i)) == NULL)
 269                         return 0;
 270
 271                 if (! name_entry_eq_merge_name_entry(&expected[i], name_entry))
 272                         return 0;
 273         }
 274
 275         return 1;
 276 }
 277
 278 int merge_test_reuc(git_index *index, const struct merge_reuc_entry expected[], size_t expected_len)
 279 {
 280         size_t i;
 281         const git_index_reuc_entry *reuc_entry;
 282         git_oid expected_oid;
 283
 284         /*
 285         dump_reuc(index);
 286         */
 287
 288         if (git_index_reuc_entrycount(index) != expected_len)
 289                 return 0;
 290
 291         for (i = 0; i < expected_len; i++) {
 292                 if ((reuc_entry = git_index_reuc_get_byindex(index, i)) == NULL)
 293                         return 0;
 294
 295                 if (strcmp(reuc_entry->path, expected[i].path) != 0 ||
 296                         reuc_entry->mode[0] != expected[i].ancestor_mode ||
 297                         reuc_entry->mode[1] != expected[i].our_mode ||
 298                         reuc_entry->mode[2] != expected[i].their_mode)
 299                         return 0;
 300
 301                 if (expected[i].ancestor_mode > 0) {
 302                         cl_git_pass(git_oid_fromstr(&expected_oid, expected[i].ancestor_oid_str));
 303
 304                         if (git_oid_cmp(&reuc_entry->oid[0], &expected_oid) != 0)
 305                                 return 0;
 306                 }
 307
 308                 if (expected[i].our_mode > 0) {
 309                         cl_git_pass(git_oid_fromstr(&expected_oid, expected[i].our_oid_str));
 310
 311                         if (git_oid_cmp(&reuc_entry->oid[1], &expected_oid) != 0)
 312                                 return 0;
 313                 }
 314
 315                 if (expected[i].their_mode > 0) {
 316                         cl_git_pass(git_oid_fromstr(&expected_oid, expected[i].their_oid_str));
 317
 318                         if (git_oid_cmp(&reuc_entry->oid[2], &expected_oid) != 0)
 319                                 return 0;
 320                 }
 321         }
 322
 323         return 1;
 324 }
 325
 326 int dircount(void *payload, git_buf *pathbuf)
 327 {
 328         int *entries = payload;
 329         size_t len = git_buf_len(pathbuf);
 330
 331         if (len < 5 || strcmp(pathbuf->ptr + (git_buf_len(pathbuf) - 5), "/.git") != 0)
 332                 (*entries)++;
 333
 334         return 0;
 335 }
 336
 337 int merge_test_workdir(git_repository *repo, const struct merge_index_entry expected[], size_t expected_len)
 338 {
 339         size_t actual_len = 0, i;
 340         git_oid actual_oid, expected_oid;
 341         git_buf wd = GIT_BUF_INIT;
 342
 343         git_buf_puts(&wd, repo->workdir);
 344         git_path_direach(&wd, 0, dircount, &actual_len);
 345
 346         if (actual_len != expected_len)
 347                 return 0;
 348
 349         for (i = 0; i < expected_len; i++) {
 350                 git_blob_create_fromworkdir(&actual_oid, repo, expected[i].path);
 351                 git_oid_fromstr(&expected_oid, expected[i].oid_str);
 352
 353                 if (git_oid_cmp(&actual_oid, &expected_oid) != 0)
 354                         return 0;
 355         }
 356
 357         git_buf_free(&wd);
 358
 359         return 1;
 360 }