Line Flow Count Block(s) Source
1 - /*
2 - * Copyright (C) the libgit2 contributors. All rights reserved.
3 - *
4 - * This file is part of libgit2, distributed under the GNU GPL v2 with
5 - * a Linking Exception. For full terms see the included COPYING file.
6 - */
7 -
8 - #include "common.h"
9 -
10 - #include "repository.h"
11 - #include "filebuf.h"
12 - #include "merge.h"
13 - #include "vector.h"
14 - #include "index.h"
15 -
16 - #include "git2/types.h"
17 - #include "git2/merge.h"
18 - #include "git2/cherrypick.h"
19 - #include "git2/commit.h"
20 - #include "git2/sys/commit.h"
21 -
22 - #define GIT_CHERRYPICK_FILE_MODE 0666
23 -
24 13 2 static int write_cherrypick_head(
25 - git_repository *repo,
26 - const char *commit_oidstr)
27 - {
28 13 2 git_filebuf file = GIT_FILEBUF_INIT;
29 13 2 git_buf file_path = GIT_BUF_INIT;
30 13 2 int error = 0;
31 -
32 13 2-5 if ((error = git_buf_joinpath(&file_path, repo->gitdir, GIT_CHERRYPICK_HEAD_FILE)) >= 0 &&
33 13 4,6,7 (error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_CREATE_LEADING_DIRS, GIT_CHERRYPICK_FILE_MODE)) >= 0 &&
34 - (error = git_filebuf_printf(&file, "%s\n", commit_oidstr)) >= 0)
35 13 8 error = git_filebuf_commit(&file);
36 -
37 13 9 if (error < 0)
38 ##### 10 git_filebuf_cleanup(&file);
39 -
40 13 11 git_buf_dispose(&file_path);
41 -
42 13 12 return error;
43 - }
44 -
45 13 2 static int write_merge_msg(
46 - git_repository *repo,
47 - const char *commit_msg)
48 - {
49 13 2 git_filebuf file = GIT_FILEBUF_INIT;
50 13 2 git_buf file_path = GIT_BUF_INIT;
51 13 2 int error = 0;
52 -
53 13 2-5 if ((error = git_buf_joinpath(&file_path, repo->gitdir, GIT_MERGE_MSG_FILE)) < 0 ||
54 13 4,6,7 (error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_CREATE_LEADING_DIRS, GIT_CHERRYPICK_FILE_MODE)) < 0 ||
55 - (error = git_filebuf_printf(&file, "%s", commit_msg)) < 0)
56 - goto cleanup;
57 -
58 13 8 error = git_filebuf_commit(&file);
59 -
60 - cleanup:
61 13 9 if (error < 0)
62 ##### 10 git_filebuf_cleanup(&file);
63 -
64 13 11 git_buf_dispose(&file_path);
65 -
66 13 12 return error;
67 - }
68 -
69 13 2 static int cherrypick_normalize_opts(
70 - git_repository *repo,
71 - git_cherrypick_options *opts,
72 - const git_cherrypick_options *given,
73 - const char *their_label)
74 - {
75 13 2 int error = 0;
76 13 2 unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE |
77 - GIT_CHECKOUT_ALLOW_CONFLICTS;
78 -
79 - GIT_UNUSED(repo);
80 -
81 13 2 if (given != NULL)
82 7 3 memcpy(opts, given, sizeof(git_cherrypick_options));
83 - else {
84 6 4 git_cherrypick_options default_opts = GIT_CHERRYPICK_OPTIONS_INIT;
85 6 4 memcpy(opts, &default_opts, sizeof(git_cherrypick_options));
86 - }
87 -
88 13 5 if (!opts->checkout_opts.checkout_strategy)
89 ##### 6 opts->checkout_opts.checkout_strategy = default_checkout_strategy;
90 -
91 13 7 if (!opts->checkout_opts.our_label)
92 13 8 opts->checkout_opts.our_label = "HEAD";
93 -
94 13 9 if (!opts->checkout_opts.their_label)
95 13 10 opts->checkout_opts.their_label = their_label;
96 -
97 13 11 return error;
98 - }
99 -
100 2 2 static int cherrypick_state_cleanup(git_repository *repo)
101 - {
102 2 2 const char *state_files[] = { GIT_CHERRYPICK_HEAD_FILE, GIT_MERGE_MSG_FILE };
103 -
104 2 2 return git_repository__cleanup_files(repo, state_files, ARRAY_SIZE(state_files));
105 - }
106 -
107 2 2 static int cherrypick_seterr(git_commit *commit, const char *fmt)
108 - {
109 - char commit_oidstr[GIT_OID_HEXSZ + 1];
110 -
111 2 2-4 git_error_set(GIT_ERROR_CHERRYPICK, fmt,
112 - git_oid_tostr(commit_oidstr, GIT_OID_HEXSZ + 1, git_commit_id(commit)));
113 -
114 2 5 return -1;
115 - }
116 -
117 16 2 int git_cherrypick_commit(
118 - git_index **out,
119 - git_repository *repo,
120 - git_commit *cherrypick_commit,
121 - git_commit *our_commit,
122 - unsigned int mainline,
123 - const git_merge_options *merge_opts)
124 - {
125 16 2 git_commit *parent_commit = NULL;
126 16 2 git_tree *parent_tree = NULL, *our_tree = NULL, *cherrypick_tree = NULL;
127 16 2 int parent = 0, error = 0;
128 -
129 16 2-6 assert(out && repo && cherrypick_commit && our_commit);
130 -
131 16 7,8 if (git_commit_parentcount(cherrypick_commit) > 1) {
132 3 9 if (!mainline)
133 1 10 return cherrypick_seterr(cherrypick_commit,
134 - "mainline branch is not specified but %s is a merge commit");
135 -
136 2 11 parent = mainline;
137 - } else {
138 13 12 if (mainline)
139 1 13 return cherrypick_seterr(cherrypick_commit,
140 - "mainline branch specified but %s is not a merge commit");
141 -
142 12 14,15 parent = git_commit_parentcount(cherrypick_commit);
143 - }
144 -
145 14 16-18 if (parent &&
146 13 17,19,20 ((error = git_commit_parent(&parent_commit, cherrypick_commit, (parent - 1))) < 0 ||
147 13 19 (error = git_commit_tree(&parent_tree, parent_commit)) < 0))
148 - goto done;
149 -
150 14 21-24 if ((error = git_commit_tree(&cherrypick_tree, cherrypick_commit)) < 0 ||
151 - (error = git_commit_tree(&our_tree, our_commit)) < 0)
152 - goto done;
153 -
154 14 25 error = git_merge_trees(out, repo, parent_tree, our_tree, cherrypick_tree, merge_opts);
155 -
156 - done:
157 14 26 git_tree_free(parent_tree);
158 14 27 git_tree_free(our_tree);
159 14 28 git_tree_free(cherrypick_tree);
160 14 29 git_commit_free(parent_commit);
161 -
162 14 30 return error;
163 - }
164 -
165 13 2 int git_cherrypick(
166 - git_repository *repo,
167 - git_commit *commit,
168 - const git_cherrypick_options *given_opts)
169 - {
170 - git_cherrypick_options opts;
171 13 2 git_reference *our_ref = NULL;
172 13 2 git_commit *our_commit = NULL;
173 - char commit_oidstr[GIT_OID_HEXSZ + 1];
174 - const char *commit_msg, *commit_summary;
175 13 2 git_buf their_label = GIT_BUF_INIT;
176 13 2 git_index *index = NULL;
177 13 2 git_indexwriter indexwriter = GIT_INDEXWRITER_INIT;
178 13 2 int error = 0;
179 -
180 13 2-4 assert(repo && commit);
181 -
182 13 5-7 GIT_ERROR_CHECK_VERSION(given_opts, GIT_CHERRYPICK_OPTIONS_VERSION, "git_cherrypick_options");
183 -
184 13 8,9 if ((error = git_repository__ensure_not_bare(repo, "cherry-pick")) < 0)
185 ##### 10 return error;
186 -
187 13 11-14 if ((commit_msg = git_commit_message(commit)) == NULL ||
188 - (commit_summary = git_commit_summary(commit)) == NULL) {
189 ##### 15 error = -1;
190 ##### 15 goto on_error;
191 - }
192 -
193 13 16,17 git_oid_nfmt(commit_oidstr, sizeof(commit_oidstr), git_commit_id(commit));
194 -
195 13 18-21 if ((error = write_merge_msg(repo, commit_msg)) < 0 ||
196 13 23,24 (error = git_buf_printf(&their_label, "%.7s... %s", commit_oidstr, commit_summary)) < 0 ||
197 13 22,25,26 (error = cherrypick_normalize_opts(repo, &opts, given_opts, git_buf_cstr(&their_label))) < 0 ||
198 13 27,28 (error = git_indexwriter_init_for_operation(&indexwriter, repo, &opts.checkout_opts.checkout_strategy)) < 0 ||
199 13 29,30 (error = write_cherrypick_head(repo, commit_oidstr)) < 0 ||
200 13 31,32 (error = git_repository_head(&our_ref, repo)) < 0 ||
201 13 31,33,34 (error = git_reference_peel((git_object **)&our_commit, our_ref, GIT_OBJECT_COMMIT)) < 0 ||
202 13 33,35,36 (error = git_cherrypick_commit(&index, repo, commit, our_commit, opts.mainline, &opts.merge_opts)) < 0 ||
203 11 35,37,38 (error = git_merge__check_result(repo, index)) < 0 ||
204 11 37,39,40 (error = git_merge__append_conflicts_to_merge_msg(repo, index)) < 0 ||
205 11 39,41,42 (error = git_checkout_index(repo, index, &opts.checkout_opts)) < 0 ||
206 - (error = git_indexwriter_commit(&indexwriter)) < 0)
207 - goto on_error;
208 -
209 11 43 goto done;
210 -
211 - on_error:
212 2 44 cherrypick_state_cleanup(repo);
213 -
214 - done:
215 13 45 git_indexwriter_cleanup(&indexwriter);
216 13 46 git_index_free(index);
217 13 47 git_commit_free(our_commit);
218 13 48 git_reference_free(our_ref);
219 13 49 git_buf_dispose(&their_label);
220 -
221 13 50 return error;
222 - }
223 -
224 ##### 2 int git_cherrypick_options_init(
225 - git_cherrypick_options *opts, unsigned int version)
226 - {
227 ##### 2-4 GIT_INIT_STRUCTURE_FROM_TEMPLATE(
228 - opts, version, git_cherrypick_options, GIT_CHERRYPICK_OPTIONS_INIT);
229 ##### 5 return 0;
230 - }
231 -
232 - #ifndef GIT_DEPRECATE_HARD
233 ##### 2 int git_cherrypick_init_options(
234 - git_cherrypick_options *opts, unsigned int version)
235 - {
236 ##### 2 return git_cherrypick_options_init(opts, version);
237 - }
238 - #endif