tests/apply/index.c

   1 #include "clar_libgit2.h"
   2 #include "apply_helpers.h"
   3
   4 static git_repository *repo;
   5
   6 #define TEST_REPO_PATH "merge-recursive"
   7
   8 void test_apply_index__initialize(void)
   9 {
  10         git_oid oid;
  11         git_commit *commit;
  12
  13         repo = cl_git_sandbox_init(TEST_REPO_PATH);
  14
  15         git_oid_fromstr(&oid, "539bd011c4822c560c1d17cab095006b7a10f707");
  16         cl_git_pass(git_commit_lookup(&commit, repo, &oid));
  17         cl_git_pass(git_reset(repo, (git_object *)commit, GIT_RESET_HARD, NULL));
  18         git_commit_free(commit);
  19 }
  20
  21 void test_apply_index__cleanup(void)
  22 {
  23         cl_git_sandbox_cleanup();
  24 }
  25
  26 void test_apply_index__generate_diff(void)
  27 {
  28         git_oid a_oid, b_oid;
  29         git_commit *a_commit, *b_commit;
  30         git_tree *a_tree, *b_tree;
  31         git_diff *diff;
  32         git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
  33
  34         struct merge_index_entry index_expected[] = {
  35                 { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
  36                 { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  37                 { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  38                 { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  39                 { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  40                 { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
  41         };
  42         size_t index_expected_cnt = sizeof(index_expected) /
  43                 sizeof(struct merge_index_entry);
  44
  45         git_oid_fromstr(&a_oid, "539bd011c4822c560c1d17cab095006b7a10f707");
  46         git_oid_fromstr(&b_oid, "7c7bf85e978f1d18c0566f702d2cb7766b9c8d4f");
  47         cl_git_pass(git_commit_lookup(&a_commit, repo, &a_oid));
  48         cl_git_pass(git_commit_lookup(&b_commit, repo, &b_oid));
  49
  50         cl_git_pass(git_commit_tree(&a_tree, a_commit));
  51         cl_git_pass(git_commit_tree(&b_tree, b_commit));
  52
  53         cl_git_pass(git_diff_tree_to_tree(&diff, repo, a_tree, b_tree, &diff_opts));
  54         cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
  55
  56         validate_apply_index(repo, index_expected, index_expected_cnt);
  57         validate_workdir_unchanged(repo);
  58
  59         git_diff_free(diff);
  60         git_tree_free(a_tree);
  61         git_tree_free(b_tree);
  62         git_commit_free(a_commit);
  63         git_commit_free(b_commit);
  64 }
  65
  66 void test_apply_index__parsed_diff(void)
  67 {
  68         git_diff *diff;
  69
  70         struct merge_index_entry index_expected[] = {
  71                 { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
  72                 { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  73                 { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  74                 { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  75                 { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  76                 { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
  77         };
  78         size_t index_expected_cnt = sizeof(index_expected) /
  79                 sizeof(struct merge_index_entry);
  80
  81         cl_git_pass(git_diff_from_buffer(&diff,
  82                 DIFF_MODIFY_TWO_FILES, strlen(DIFF_MODIFY_TWO_FILES)));
  83         cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
  84
  85         validate_apply_index(repo, index_expected, index_expected_cnt);
  86         validate_workdir_unchanged(repo);
  87
  88         git_diff_free(diff);
  89 }
  90
  91 void test_apply_index__removes_file(void)
  92 {
  93         git_diff *diff;
  94
  95         struct merge_index_entry index_expected[] = {
  96                 { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
  97                 { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  98                 { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  99                 { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
 100                 { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
 101         };
 102         size_t index_expected_cnt = sizeof(index_expected) /
 103             sizeof(struct merge_index_entry);
 104
 105         cl_git_pass(git_diff_from_buffer(&diff, DIFF_DELETE_FILE,
 106                 strlen(DIFF_DELETE_FILE)));
 107         cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
 108
 109         validate_apply_index(repo, index_expected, index_expected_cnt);
 110         validate_workdir_unchanged(repo);
 111
 112         git_diff_free(diff);
 113 }
 114
 115 void test_apply_index__adds_file(void)
 116 {
 117         git_diff *diff;
 118
 119         struct merge_index_entry index_expected[] = {
 120                 { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
 121                 { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
 122                 { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
 123                 { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
 124                 { 0100644, "6370543fcfedb3e6516ec53b06158f3687dc1447", 0, "newfile.txt" },
 125                 { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
 126                 { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
 127         };
 128         size_t index_expected_cnt = sizeof(index_expected) /
 129             sizeof(struct merge_index_entry);
 130
 131         cl_git_pass(git_diff_from_buffer(&diff,
 132                 DIFF_ADD_FILE, strlen(DIFF_ADD_FILE)));
 133         cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
 134
 135         validate_apply_index(repo, index_expected, index_expected_cnt);
 136         validate_workdir_unchanged(repo);
 137
 138         git_diff_free(diff);
 139 }
 140
 141 void test_apply_index__modified_workdir_with_unmodified_index_is_ok(void)
 142 {
 143         git_diff *diff;
 144
 145         const char *diff_file = DIFF_MODIFY_TWO_FILES;
 146
 147         struct merge_index_entry index_expected[] = {
 148                 { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
 149                 { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
 150                 { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
 151                 { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
 152                 { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
 153                 { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
 154         };
 155         size_t index_expected_cnt = sizeof(index_expected) /
 156                 sizeof(struct merge_index_entry);
 157
 158         struct merge_index_entry workdir_expected[] = {
 159                 { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
 160                 { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
 161                 { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
 162                 { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
 163                 { 0100644, "f75ba05f340c51065cbea2e1fdbfe5fe13144c97", 0, "veal.txt" }
 164         };
 165         size_t workdir_expected_cnt = sizeof(workdir_expected) /
 166                 sizeof(struct merge_index_entry);
 167
 168         /* mutate the workdir and leave the index matching HEAD */
 169         cl_git_rmfile("merge-recursive/asparagus.txt");
 170         cl_git_rewritefile("merge-recursive/veal.txt", "Hello, world.\n");
 171
 172         cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
 173         cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
 174
 175         validate_apply_index(repo, index_expected, index_expected_cnt);
 176         validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
 177
 178         git_diff_free(diff);
 179 }
 180
 181 void test_apply_index__application_failure_leaves_index_unmodified(void)
 182 {
 183         git_diff *diff;
 184         git_index *index;
 185
 186         const char *diff_file = DIFF_MODIFY_TWO_FILES;
 187
 188         struct merge_index_entry index_expected[] = {
 189                 { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
 190                 { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
 191                 { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
 192                 { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
 193                 { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
 194         };
 195         size_t index_expected_cnt = sizeof(index_expected) /
 196                 sizeof(struct merge_index_entry);
 197
 198         /* mutate the index */
 199         cl_git_pass(git_repository_index(&index, repo));
 200         cl_git_pass(git_index_remove(index, "veal.txt", 0));
 201         cl_git_pass(git_index_write(index));
 202         git_index_free(index);
 203
 204         cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
 205         cl_git_fail_with(GIT_EAPPLYFAIL, git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
 206
 207         validate_apply_index(repo, index_expected, index_expected_cnt);
 208
 209         git_diff_free(diff);
 210 }
 211
 212 void test_apply_index__keeps_nonconflicting_changes(void)
 213 {
 214         git_diff *diff;
 215         git_index *index;
 216         git_index_entry idx_entry;
 217
 218         const char *diff_file = DIFF_MODIFY_TWO_FILES;
 219
 220         struct merge_index_entry index_expected[] = {
 221                 { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
 222                 { 0100644, "898d12687fb35be271c27c795a6b32c8b51da79e", 0, "beef.txt" },
 223                 { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
 224                 { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
 225                 { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
 226         };
 227         size_t index_expected_cnt = sizeof(index_expected) /
 228                 sizeof(struct merge_index_entry);
 229
 230         /* mutate the index */
 231         cl_git_pass(git_repository_index(&index, repo));
 232
 233         memset(&idx_entry, 0, sizeof(git_index_entry));
 234         idx_entry.mode = 0100644;
 235         idx_entry.path = "beef.txt";
 236         cl_git_pass(git_oid_fromstr(&idx_entry.id, "898d12687fb35be271c27c795a6b32c8b51da79e"));
 237         cl_git_pass(git_index_add(index, &idx_entry));
 238
 239         cl_git_pass(git_index_remove(index, "bouilli.txt", 0));
 240         cl_git_pass(git_index_write(index));
 241         git_index_free(index);
 242
 243         cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
 244         cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
 245
 246         validate_apply_index(repo, index_expected, index_expected_cnt);
 247         validate_workdir_unchanged(repo);
 248
 249         git_diff_free(diff);
 250 }
 251
 252 void test_apply_index__can_apply_nonconflicting_file_changes(void)
 253 {
 254         git_diff *diff;
 255         git_index *index;
 256         git_index_entry idx_entry;
 257
 258         const char *diff_file = DIFF_MODIFY_TWO_FILES;
 259
 260         struct merge_index_entry index_expected[] = {
 261                 { 0100644, "4f2d1645dee99ced096877911de540c65ade2ef8", 0, "asparagus.txt" },
 262                 { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
 263                 { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
 264                 { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
 265                 { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
 266                 { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
 267         };
 268         size_t index_expected_cnt = sizeof(index_expected) /
 269                 sizeof(struct merge_index_entry);
 270
 271         /*
 272          * Replace the index entry with a version that is different than
 273          * HEAD but such that the patch still applies cleanly.  This item
 274          * has a new line appended.
 275          */
 276
 277         cl_git_pass(git_repository_index(&index, repo));
 278
 279         memset(&idx_entry, 0, sizeof(git_index_entry));
 280         idx_entry.mode = 0100644;
 281         idx_entry.path = "asparagus.txt";
 282         cl_git_pass(git_oid_fromstr(&idx_entry.id, "06d3fefb8726ab1099acc76e02dfb85e034b2538"));
 283         cl_git_pass(git_index_add(index, &idx_entry));
 284
 285         cl_git_pass(git_index_write(index));
 286         git_index_free(index);
 287
 288         cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
 289         cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
 290
 291         validate_apply_index(repo, index_expected, index_expected_cnt);
 292         validate_workdir_unchanged(repo);
 293
 294         git_diff_free(diff);
 295 }
 296
 297 void test_apply_index__change_mode(void)
 298 {
 299         git_diff *diff;
 300
 301         const char *diff_file = DIFF_EXECUTABLE_FILE;
 302
 303         struct merge_index_entry index_expected[] = {
 304                 { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
 305                 { 0100755, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
 306                 { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
 307                 { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
 308                 { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
 309                 { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
 310         };
 311         size_t index_expected_cnt = sizeof(index_expected) /
 312                 sizeof(struct merge_index_entry);
 313
 314         cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
 315         cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
 316
 317         validate_apply_index(repo, index_expected, index_expected_cnt);
 318         validate_workdir_unchanged(repo);
 319
 320         git_diff_free(diff);
 321 }