]>
Commit | Line | Data |
---|---|---|
8f1d2e6f | 1 | #include "cache.h" |
961784ee | 2 | #include "tag.h" |
175785e5 | 3 | #include "commit.h" |
6a1a79fd | 4 | #include "repository.h" |
cbd53a21 | 5 | #include "object-store.h" |
ed09aef0 | 6 | #include "pkt-line.h" |
52883fbd | 7 | #include "utf8.h" |
199c45bf JH |
8 | #include "diff.h" |
9 | #include "revision.h" | |
a97a7468 | 10 | #include "notes.h" |
14ba97f8 | 11 | #include "alloc.h" |
ba3c69a9 | 12 | #include "gpg-interface.h" |
46905893 | 13 | #include "mergesort.h" |
a84b794a | 14 | #include "commit-slab.h" |
da24b104 | 15 | #include "prio-queue.h" |
0a9136f3 | 16 | #include "sha1-lookup.h" |
d76650b8 | 17 | #include "wt-status.h" |
175785e5 | 18 | |
82a75299 JH |
19 | static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **); |
20 | ||
60ab26de LT |
21 | int save_commit_buffer = 1; |
22 | ||
175785e5 DB |
23 | const char *commit_type = "commit"; |
24 | ||
bc83266a | 25 | struct commit *lookup_commit_reference_gently(const struct object_id *oid, |
f76412ed | 26 | int quiet) |
961784ee | 27 | { |
c251c83d | 28 | struct object *obj = deref_tag(parse_object(oid), NULL, 0); |
961784ee LT |
29 | |
30 | if (!obj) | |
31 | return NULL; | |
8ff226a9 | 32 | return object_as_type(obj, OBJ_COMMIT, quiet); |
f76412ed JH |
33 | } |
34 | ||
bc83266a | 35 | struct commit *lookup_commit_reference(const struct object_id *oid) |
f76412ed | 36 | { |
bc83266a | 37 | return lookup_commit_reference_gently(oid, 0); |
961784ee LT |
38 | } |
39 | ||
bc83266a | 40 | struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name) |
baf18fc2 | 41 | { |
bc83266a | 42 | struct commit *c = lookup_commit_reference(oid); |
baf18fc2 NTND |
43 | if (!c) |
44 | die(_("could not parse %s"), ref_name); | |
bc83266a | 45 | if (oidcmp(oid, &c->object.oid)) { |
baf18fc2 | 46 | warning(_("%s %s is not a commit!"), |
bc83266a | 47 | ref_name, oid_to_hex(oid)); |
baf18fc2 NTND |
48 | } |
49 | return c; | |
50 | } | |
51 | ||
bc83266a | 52 | struct commit *lookup_commit(const struct object_id *oid) |
175785e5 | 53 | { |
bc83266a | 54 | struct object *obj = lookup_object(oid->hash); |
d36f51c1 | 55 | if (!obj) |
68f95d38 | 56 | return create_object(the_repository, oid->hash, |
8ba0e5ec | 57 | alloc_commit_node(the_repository)); |
8ff226a9 | 58 | return object_as_type(obj, OBJ_COMMIT, 0); |
175785e5 DB |
59 | } |
60 | ||
a6fa5992 PN |
61 | struct commit *lookup_commit_reference_by_name(const char *name) |
62 | { | |
7683e2e6 | 63 | struct object_id oid; |
a6fa5992 PN |
64 | struct commit *commit; |
65 | ||
e82caf38 | 66 | if (get_oid_committish(name, &oid)) |
a6fa5992 | 67 | return NULL; |
bc83266a | 68 | commit = lookup_commit_reference(&oid); |
5e7d4d3e | 69 | if (parse_commit(commit)) |
a6fa5992 PN |
70 | return NULL; |
71 | return commit; | |
72 | } | |
73 | ||
dddbad72 | 74 | static timestamp_t parse_commit_date(const char *buf, const char *tail) |
175785e5 | 75 | { |
0a617799 | 76 | const char *dateptr; |
175785e5 | 77 | |
0a617799 MK |
78 | if (buf + 6 >= tail) |
79 | return 0; | |
175785e5 DB |
80 | if (memcmp(buf, "author", 6)) |
81 | return 0; | |
0a617799 | 82 | while (buf < tail && *buf++ != '\n') |
175785e5 | 83 | /* nada */; |
0a617799 MK |
84 | if (buf + 9 >= tail) |
85 | return 0; | |
175785e5 DB |
86 | if (memcmp(buf, "committer", 9)) |
87 | return 0; | |
0a617799 | 88 | while (buf < tail && *buf++ != '>') |
175785e5 | 89 | /* nada */; |
0a617799 MK |
90 | if (buf >= tail) |
91 | return 0; | |
92 | dateptr = buf; | |
93 | while (buf < tail && *buf++ != '\n') | |
94 | /* nada */; | |
95 | if (buf >= tail) | |
96 | return 0; | |
1aeb7e75 JS |
97 | /* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */ |
98 | return parse_timestamp(dateptr, NULL, 10); | |
175785e5 DB |
99 | } |
100 | ||
0a9136f3 DD |
101 | static const unsigned char *commit_graft_sha1_access(size_t index, void *table) |
102 | { | |
103 | struct commit_graft **commit_graft_table = table; | |
7683e2e6 | 104 | return commit_graft_table[index]->oid.hash; |
0a9136f3 DD |
105 | } |
106 | ||
e808656c | 107 | static int commit_graft_pos(struct repository *r, const unsigned char *sha1) |
5da5c8f4 | 108 | { |
e808656c BW |
109 | return sha1_pos(sha1, r->parsed_objects->grafts, |
110 | r->parsed_objects->grafts_nr, | |
0a9136f3 | 111 | commit_graft_sha1_access); |
5da5c8f4 JH |
112 | } |
113 | ||
a3b78e83 BW |
114 | int register_commit_graft(struct repository *r, struct commit_graft *graft, |
115 | int ignore_dups) | |
5040f17e | 116 | { |
a3b78e83 | 117 | int pos = commit_graft_pos(r, graft->oid.hash); |
a6080a0a | 118 | |
5040f17e JH |
119 | if (0 <= pos) { |
120 | if (ignore_dups) | |
121 | free(graft); | |
122 | else { | |
a3b78e83 BW |
123 | free(r->parsed_objects->grafts[pos]); |
124 | r->parsed_objects->grafts[pos] = graft; | |
5040f17e JH |
125 | } |
126 | return 1; | |
127 | } | |
128 | pos = -pos - 1; | |
a3b78e83 BW |
129 | ALLOC_GROW(r->parsed_objects->grafts, |
130 | r->parsed_objects->grafts_nr + 1, | |
131 | r->parsed_objects->grafts_alloc); | |
132 | r->parsed_objects->grafts_nr++; | |
133 | if (pos < r->parsed_objects->grafts_nr) | |
134 | memmove(r->parsed_objects->grafts + pos + 1, | |
135 | r->parsed_objects->grafts + pos, | |
136 | (r->parsed_objects->grafts_nr - pos - 1) * | |
137 | sizeof(*r->parsed_objects->grafts)); | |
138 | r->parsed_objects->grafts[pos] = graft; | |
5040f17e JH |
139 | return 0; |
140 | } | |
141 | ||
9a934032 | 142 | struct commit_graft *read_graft_line(struct strbuf *line) |
5040f17e JH |
143 | { |
144 | /* The format is just "Commit Parent1 Parent2 ...\n" */ | |
cfa5bf16 PO |
145 | int i, phase; |
146 | const char *tail = NULL; | |
5040f17e | 147 | struct commit_graft *graft = NULL; |
cfa5bf16 | 148 | struct object_id dummy_oid, *oid; |
5040f17e | 149 | |
9a934032 PO |
150 | strbuf_rtrim(line); |
151 | if (!line->len || line->buf[0] == '#') | |
5bc4ce58 | 152 | return NULL; |
cfa5bf16 PO |
153 | /* |
154 | * phase 0 verifies line, counts hashes in line and allocates graft | |
155 | * phase 1 fills graft | |
156 | */ | |
157 | for (phase = 0; phase < 2; phase++) { | |
158 | oid = graft ? &graft->oid : &dummy_oid; | |
159 | if (parse_oid_hex(line->buf, oid, &tail)) | |
5040f17e | 160 | goto bad_graft_data; |
cfa5bf16 PO |
161 | for (i = 0; *tail != '\0'; i++) { |
162 | oid = graft ? &graft->parent[i] : &dummy_oid; | |
163 | if (!isspace(*tail++) || parse_oid_hex(tail, oid, &tail)) | |
164 | goto bad_graft_data; | |
165 | } | |
166 | if (!graft) { | |
167 | graft = xmalloc(st_add(sizeof(*graft), | |
168 | st_mult(sizeof(struct object_id), i))); | |
169 | graft->nr_parent = i; | |
170 | } | |
5040f17e JH |
171 | } |
172 | return graft; | |
df5d43be RT |
173 | |
174 | bad_graft_data: | |
9a934032 | 175 | error("bad graft data: %s", line->buf); |
cfa5bf16 | 176 | assert(!graft); |
df5d43be | 177 | return NULL; |
5040f17e JH |
178 | } |
179 | ||
d0e5dd0e | 180 | static int read_graft_file(struct repository *r, const char *graft_file) |
5da5c8f4 | 181 | { |
e9d983f1 | 182 | FILE *fp = fopen_or_warn(graft_file, "r"); |
e228c173 | 183 | struct strbuf buf = STRBUF_INIT; |
5040f17e JH |
184 | if (!fp) |
185 | return -1; | |
e228c173 | 186 | while (!strbuf_getwholeline(&buf, fp, '\n')) { |
5da5c8f4 | 187 | /* The format is just "Commit Parent1 Parent2 ...\n" */ |
9a934032 | 188 | struct commit_graft *graft = read_graft_line(&buf); |
5bc4ce58 JH |
189 | if (!graft) |
190 | continue; | |
d0e5dd0e | 191 | if (register_commit_graft(r, graft, 1)) |
e228c173 | 192 | error("duplicate graft data: %s", buf.buf); |
5da5c8f4 JH |
193 | } |
194 | fclose(fp); | |
e228c173 | 195 | strbuf_release(&buf); |
5040f17e JH |
196 | return 0; |
197 | } | |
198 | ||
2f6c767f | 199 | static void prepare_commit_graft(struct repository *r) |
5040f17e | 200 | { |
5040f17e JH |
201 | char *graft_file; |
202 | ||
2f6c767f | 203 | if (r->parsed_objects->commit_graft_prepared) |
5040f17e | 204 | return; |
2f6c767f SB |
205 | graft_file = get_graft_file(r); |
206 | read_graft_file(r, graft_file); | |
ed09aef0 | 207 | /* make sure shallows are read */ |
2f6c767f SB |
208 | is_repository_shallow(r); |
209 | r->parsed_objects->commit_graft_prepared = 1; | |
5da5c8f4 JH |
210 | } |
211 | ||
1f93ecd1 | 212 | struct commit_graft *lookup_commit_graft_the_repository(const struct object_id *oid) |
5da5c8f4 JH |
213 | { |
214 | int pos; | |
3ee37656 | 215 | prepare_commit_graft(the_repository); |
be479e80 | 216 | pos = commit_graft_pos(the_repository, oid->hash); |
5da5c8f4 JH |
217 | if (pos < 0) |
218 | return NULL; | |
6a1a79fd | 219 | return the_repository->parsed_objects->grafts[pos]; |
5da5c8f4 JH |
220 | } |
221 | ||
09d46644 | 222 | int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data) |
ed09aef0 | 223 | { |
09d46644 | 224 | int i, ret; |
6a1a79fd JN |
225 | for (i = ret = 0; i < the_repository->parsed_objects->grafts_nr && !ret; i++) |
226 | ret = fn(the_repository->parsed_objects->grafts[i], cb_data); | |
09d46644 | 227 | return ret; |
ed09aef0 JS |
228 | } |
229 | ||
e92b848c | 230 | int unregister_shallow(const struct object_id *oid) |
f53514bc | 231 | { |
be479e80 | 232 | int pos = commit_graft_pos(the_repository, oid->hash); |
f53514bc JS |
233 | if (pos < 0) |
234 | return -1; | |
6a1a79fd JN |
235 | if (pos + 1 < the_repository->parsed_objects->grafts_nr) |
236 | MOVE_ARRAY(the_repository->parsed_objects->grafts + pos, | |
237 | the_repository->parsed_objects->grafts + pos + 1, | |
238 | the_repository->parsed_objects->grafts_nr - pos - 1); | |
239 | the_repository->parsed_objects->grafts_nr--; | |
f53514bc JS |
240 | return 0; |
241 | } | |
242 | ||
8597ea3a JK |
243 | struct commit_buffer { |
244 | void *buffer; | |
245 | unsigned long size; | |
246 | }; | |
247 | define_commit_slab(buffer_slab, struct commit_buffer); | |
c1b3c71f JK |
248 | static struct buffer_slab buffer_slab = COMMIT_SLAB_INIT(1, buffer_slab); |
249 | ||
8597ea3a | 250 | void set_commit_buffer(struct commit *commit, void *buffer, unsigned long size) |
66c2827e | 251 | { |
8597ea3a JK |
252 | struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit); |
253 | v->buffer = buffer; | |
254 | v->size = size; | |
66c2827e JK |
255 | } |
256 | ||
8597ea3a | 257 | const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep) |
152ff1cc | 258 | { |
862e730e JH |
259 | struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit); |
260 | if (!v) { | |
261 | if (sizep) | |
262 | *sizep = 0; | |
263 | return NULL; | |
264 | } | |
8597ea3a JK |
265 | if (sizep) |
266 | *sizep = v->size; | |
267 | return v->buffer; | |
152ff1cc JK |
268 | } |
269 | ||
8597ea3a | 270 | const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep) |
152ff1cc | 271 | { |
8597ea3a | 272 | const void *ret = get_cached_commit_buffer(commit, sizep); |
152ff1cc JK |
273 | if (!ret) { |
274 | enum object_type type; | |
275 | unsigned long size; | |
b4f5aca4 | 276 | ret = read_object_file(&commit->object.oid, &type, &size); |
152ff1cc JK |
277 | if (!ret) |
278 | die("cannot read commit object %s", | |
f2fd0760 | 279 | oid_to_hex(&commit->object.oid)); |
152ff1cc JK |
280 | if (type != OBJ_COMMIT) |
281 | die("expected commit for %s, got %s", | |
debca9d2 | 282 | oid_to_hex(&commit->object.oid), type_name(type)); |
8597ea3a JK |
283 | if (sizep) |
284 | *sizep = size; | |
152ff1cc JK |
285 | } |
286 | return ret; | |
287 | } | |
288 | ||
289 | void unuse_commit_buffer(const struct commit *commit, const void *buffer) | |
290 | { | |
862e730e JH |
291 | struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit); |
292 | if (!(v && v->buffer == buffer)) | |
152ff1cc JK |
293 | free((void *)buffer); |
294 | } | |
295 | ||
0fb370da JK |
296 | void free_commit_buffer(struct commit *commit) |
297 | { | |
862e730e JH |
298 | struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit); |
299 | if (v) { | |
6a83d902 | 300 | FREE_AND_NULL(v->buffer); |
862e730e JH |
301 | v->size = 0; |
302 | } | |
0fb370da JK |
303 | } |
304 | ||
14ba97f8 SB |
305 | void release_commit_memory(struct commit *c) |
306 | { | |
307 | c->tree = NULL; | |
308 | c->index = 0; | |
309 | free_commit_buffer(c); | |
310 | free_commit_list(c->parents); | |
311 | /* TODO: what about commit->util? */ | |
312 | ||
313 | c->object.parsed = 0; | |
314 | } | |
315 | ||
8597ea3a | 316 | const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep) |
0fb370da | 317 | { |
862e730e | 318 | struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit); |
8597ea3a JK |
319 | void *ret; |
320 | ||
862e730e JH |
321 | if (!v) { |
322 | if (sizep) | |
323 | *sizep = 0; | |
324 | return NULL; | |
325 | } | |
8597ea3a JK |
326 | ret = v->buffer; |
327 | if (sizep) | |
328 | *sizep = v->size; | |
329 | ||
330 | v->buffer = NULL; | |
331 | v->size = 0; | |
0fb370da JK |
332 | return ret; |
333 | } | |
334 | ||
cf7b1cad | 335 | int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size) |
175785e5 | 336 | { |
cf7b1cad NTND |
337 | const char *tail = buffer; |
338 | const char *bufptr = buffer; | |
7683e2e6 | 339 | struct object_id parent; |
6c88be16 | 340 | struct commit_list **pptr; |
5da5c8f4 | 341 | struct commit_graft *graft; |
7683e2e6 | 342 | const int tree_entry_len = GIT_SHA1_HEXSZ + 5; |
343 | const int parent_entry_len = GIT_SHA1_HEXSZ + 7; | |
bd2c39f5 | 344 | |
175785e5 DB |
345 | if (item->object.parsed) |
346 | return 0; | |
347 | item->object.parsed = 1; | |
3b44f15a | 348 | tail += size; |
7683e2e6 | 349 | if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) || |
350 | bufptr[tree_entry_len] != '\n') | |
f2fd0760 | 351 | return error("bogus commit object %s", oid_to_hex(&item->object.oid)); |
7683e2e6 | 352 | if (get_sha1_hex(bufptr + 5, parent.hash) < 0) |
bd2afde8 | 353 | return error("bad tree pointer in commit %s", |
f2fd0760 | 354 | oid_to_hex(&item->object.oid)); |
740ee055 | 355 | item->tree = lookup_tree(&parent); |
7683e2e6 | 356 | bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */ |
6c88be16 | 357 | pptr = &item->parents; |
5da5c8f4 | 358 | |
1f93ecd1 | 359 | graft = lookup_commit_graft(the_repository, &item->object.oid); |
7683e2e6 | 360 | while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) { |
f7cc77d7 LT |
361 | struct commit *new_parent; |
362 | ||
7683e2e6 | 363 | if (tail <= bufptr + parent_entry_len + 1 || |
364 | get_sha1_hex(bufptr + 7, parent.hash) || | |
365 | bufptr[parent_entry_len] != '\n') | |
f2fd0760 | 366 | return error("bad parents in commit %s", oid_to_hex(&item->object.oid)); |
7683e2e6 | 367 | bufptr += parent_entry_len + 1; |
7f3140cd JS |
368 | /* |
369 | * The clone is shallow if nr_parent < 0, and we must | |
370 | * not traverse its real parents even when we unhide them. | |
371 | */ | |
372 | if (graft && (graft->nr_parent < 0 || grafts_replace_parents)) | |
5da5c8f4 | 373 | continue; |
bc83266a | 374 | new_parent = lookup_commit(&parent); |
39468def | 375 | if (new_parent) |
6c88be16 | 376 | pptr = &commit_list_insert(new_parent, pptr)->next; |
5da5c8f4 JH |
377 | } |
378 | if (graft) { | |
379 | int i; | |
380 | struct commit *new_parent; | |
381 | for (i = 0; i < graft->nr_parent; i++) { | |
bc83266a | 382 | new_parent = lookup_commit(&graft->parent[i]); |
5da5c8f4 JH |
383 | if (!new_parent) |
384 | continue; | |
385 | pptr = &commit_list_insert(new_parent, pptr)->next; | |
5da5c8f4 | 386 | } |
175785e5 | 387 | } |
0a617799 | 388 | item->date = parse_commit_date(bufptr, tail); |
27dedf0c | 389 | |
175785e5 DB |
390 | return 0; |
391 | } | |
392 | ||
9cc2b07a | 393 | int parse_commit_gently(struct commit *item, int quiet_on_missing) |
bd2c39f5 | 394 | { |
21666f1a | 395 | enum object_type type; |
bd2c39f5 NP |
396 | void *buffer; |
397 | unsigned long size; | |
398 | int ret; | |
399 | ||
9786f68b MK |
400 | if (!item) |
401 | return -1; | |
bd2c39f5 NP |
402 | if (item->object.parsed) |
403 | return 0; | |
b4f5aca4 | 404 | buffer = read_object_file(&item->object.oid, &type, &size); |
bd2c39f5 | 405 | if (!buffer) |
9cc2b07a JK |
406 | return quiet_on_missing ? -1 : |
407 | error("Could not read %s", | |
f2fd0760 | 408 | oid_to_hex(&item->object.oid)); |
21666f1a | 409 | if (type != OBJ_COMMIT) { |
bd2c39f5 NP |
410 | free(buffer); |
411 | return error("Object %s not a commit", | |
f2fd0760 | 412 | oid_to_hex(&item->object.oid)); |
bd2c39f5 NP |
413 | } |
414 | ret = parse_commit_buffer(item, buffer, size); | |
60ab26de | 415 | if (save_commit_buffer && !ret) { |
8597ea3a | 416 | set_commit_buffer(item, buffer, size); |
3ff1fbbb LT |
417 | return 0; |
418 | } | |
bd2c39f5 NP |
419 | free(buffer); |
420 | return ret; | |
421 | } | |
422 | ||
7059dccc JK |
423 | void parse_commit_or_die(struct commit *item) |
424 | { | |
425 | if (parse_commit(item)) | |
426 | die("unable to parse commit %s", | |
f2fd0760 | 427 | item ? oid_to_hex(&item->object.oid) : "(null)"); |
7059dccc JK |
428 | } |
429 | ||
11af2aae CC |
430 | int find_commit_subject(const char *commit_buffer, const char **subject) |
431 | { | |
432 | const char *eol; | |
433 | const char *p = commit_buffer; | |
434 | ||
435 | while (*p && (*p != '\n' || p[1] != '\n')) | |
436 | p++; | |
437 | if (*p) { | |
4e1b06da | 438 | p = skip_blank_lines(p + 2); |
9c9b03b1 | 439 | eol = strchrnul(p, '\n'); |
11af2aae CC |
440 | } else |
441 | eol = p; | |
442 | ||
443 | *subject = p; | |
444 | ||
445 | return eol - p; | |
446 | } | |
447 | ||
ac5155ef | 448 | struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p) |
dd97f850 | 449 | { |
812666c8 | 450 | struct commit_list *new_list = xmalloc(sizeof(struct commit_list)); |
dd97f850 DB |
451 | new_list->item = item; |
452 | new_list->next = *list_p; | |
453 | *list_p = new_list; | |
ac5155ef | 454 | return new_list; |
dd97f850 DB |
455 | } |
456 | ||
65319475 MV |
457 | unsigned commit_list_count(const struct commit_list *l) |
458 | { | |
459 | unsigned c = 0; | |
460 | for (; l; l = l->next ) | |
461 | c++; | |
462 | return c; | |
463 | } | |
464 | ||
53d00b39 TR |
465 | struct commit_list *copy_commit_list(struct commit_list *list) |
466 | { | |
467 | struct commit_list *head = NULL; | |
468 | struct commit_list **pp = &head; | |
469 | while (list) { | |
cb979dbd | 470 | pp = commit_list_append(list->item, pp); |
53d00b39 TR |
471 | list = list->next; |
472 | } | |
473 | return head; | |
474 | } | |
475 | ||
175785e5 DB |
476 | void free_commit_list(struct commit_list *list) |
477 | { | |
e510ab89 RS |
478 | while (list) |
479 | pop_commit(&list); | |
175785e5 | 480 | } |
dd97f850 | 481 | |
47e44ed1 | 482 | struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list) |
dd97f850 DB |
483 | { |
484 | struct commit_list **pp = list; | |
485 | struct commit_list *p; | |
486 | while ((p = *pp) != NULL) { | |
487 | if (p->item->date < item->date) { | |
488 | break; | |
489 | } | |
490 | pp = &p->next; | |
491 | } | |
f755494c | 492 | return commit_list_insert(item, pp); |
dd97f850 DB |
493 | } |
494 | ||
46905893 RS |
495 | static int commit_list_compare_by_date(const void *a, const void *b) |
496 | { | |
dddbad72 JS |
497 | timestamp_t a_date = ((const struct commit_list *)a)->item->date; |
498 | timestamp_t b_date = ((const struct commit_list *)b)->item->date; | |
46905893 RS |
499 | if (a_date < b_date) |
500 | return 1; | |
501 | if (a_date > b_date) | |
502 | return -1; | |
503 | return 0; | |
504 | } | |
505 | ||
506 | static void *commit_list_get_next(const void *a) | |
507 | { | |
508 | return ((const struct commit_list *)a)->next; | |
509 | } | |
510 | ||
511 | static void commit_list_set_next(void *a, void *next) | |
512 | { | |
513 | ((struct commit_list *)a)->next = next; | |
514 | } | |
a6080a0a | 515 | |
47e44ed1 | 516 | void commit_list_sort_by_date(struct commit_list **list) |
dd97f850 | 517 | { |
7365c95d JH |
518 | *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next, |
519 | commit_list_compare_by_date); | |
dd97f850 DB |
520 | } |
521 | ||
58e28af6 DB |
522 | struct commit *pop_most_recent_commit(struct commit_list **list, |
523 | unsigned int mark) | |
dd97f850 | 524 | { |
e510ab89 | 525 | struct commit *ret = pop_commit(list); |
dd97f850 | 526 | struct commit_list *parents = ret->parents; |
dd97f850 DB |
527 | |
528 | while (parents) { | |
4056c091 | 529 | struct commit *commit = parents->item; |
dec38c81 | 530 | if (!parse_commit(commit) && !(commit->object.flags & mark)) { |
58e28af6 | 531 | commit->object.flags |= mark; |
47e44ed1 | 532 | commit_list_insert_by_date(commit, list); |
4056c091 | 533 | } |
dd97f850 DB |
534 | parents = parents->next; |
535 | } | |
536 | return ret; | |
537 | } | |
e3bc7a3b | 538 | |
941ba8db NTND |
539 | static void clear_commit_marks_1(struct commit_list **plist, |
540 | struct commit *commit, unsigned int mark) | |
f8f9c73c | 541 | { |
60fcc2e6 JS |
542 | while (commit) { |
543 | struct commit_list *parents; | |
f8f9c73c | 544 | |
60fcc2e6 JS |
545 | if (!(mark & commit->object.flags)) |
546 | return; | |
58ecf5c1 | 547 | |
60fcc2e6 JS |
548 | commit->object.flags &= ~mark; |
549 | ||
550 | parents = commit->parents; | |
551 | if (!parents) | |
552 | return; | |
553 | ||
554 | while ((parents = parents->next)) | |
941ba8db | 555 | commit_list_insert(parents->item, plist); |
60fcc2e6 JS |
556 | |
557 | commit = commit->parents->item; | |
f8f9c73c JH |
558 | } |
559 | } | |
560 | ||
e895cb51 | 561 | void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark) |
941ba8db NTND |
562 | { |
563 | struct commit_list *list = NULL; | |
e895cb51 JH |
564 | |
565 | while (nr--) { | |
07f7d55a | 566 | clear_commit_marks_1(&list, *commit, mark); |
e895cb51 JH |
567 | commit++; |
568 | } | |
941ba8db NTND |
569 | while (list) |
570 | clear_commit_marks_1(&list, pop_commit(&list), mark); | |
571 | } | |
572 | ||
e895cb51 JH |
573 | void clear_commit_marks(struct commit *commit, unsigned int mark) |
574 | { | |
575 | clear_commit_marks_many(1, &commit, mark); | |
576 | } | |
577 | ||
a3437b8c JS |
578 | struct commit *pop_commit(struct commit_list **stack) |
579 | { | |
580 | struct commit_list *top = *stack; | |
581 | struct commit *item = top ? top->item : NULL; | |
582 | ||
583 | if (top) { | |
584 | *stack = top->next; | |
585 | free(top); | |
586 | } | |
587 | return item; | |
588 | } | |
589 | ||
a84b794a JH |
590 | /* |
591 | * Topological sort support | |
592 | */ | |
96c4f4a3 | 593 | |
a84b794a JH |
594 | /* count number of children that have not been emitted */ |
595 | define_commit_slab(indegree_slab, int); | |
96c4f4a3 | 596 | |
81c6b38b JH |
597 | /* record author-date for each commit object */ |
598 | define_commit_slab(author_date_slab, unsigned long); | |
599 | ||
600 | static void record_author_date(struct author_date_slab *author_date, | |
601 | struct commit *commit) | |
602 | { | |
8597ea3a | 603 | const char *buffer = get_commit_buffer(commit, NULL); |
81c6b38b | 604 | struct ident_split ident; |
ea5517f0 JK |
605 | const char *ident_line; |
606 | size_t ident_len; | |
81c6b38b | 607 | char *date_end; |
dddbad72 | 608 | timestamp_t date; |
81c6b38b | 609 | |
ea5517f0 JK |
610 | ident_line = find_commit_header(buffer, "author", &ident_len); |
611 | if (!ident_line) | |
612 | goto fail_exit; /* no author line */ | |
613 | if (split_ident_line(&ident, ident_line, ident_len) || | |
614 | !ident.date_begin || !ident.date_end) | |
615 | goto fail_exit; /* malformed "author" line */ | |
81c6b38b | 616 | |
1aeb7e75 | 617 | date = parse_timestamp(ident.date_begin, &date_end, 10); |
81c6b38b JH |
618 | if (date_end != ident.date_end) |
619 | goto fail_exit; /* malformed date */ | |
620 | *(author_date_slab_at(author_date, commit)) = date; | |
621 | ||
622 | fail_exit: | |
ba41c1c9 | 623 | unuse_commit_buffer(commit, buffer); |
81c6b38b JH |
624 | } |
625 | ||
626 | static int compare_commits_by_author_date(const void *a_, const void *b_, | |
627 | void *cb_data) | |
628 | { | |
629 | const struct commit *a = a_, *b = b_; | |
630 | struct author_date_slab *author_date = cb_data; | |
dddbad72 JS |
631 | timestamp_t a_date = *(author_date_slab_at(author_date, a)); |
632 | timestamp_t b_date = *(author_date_slab_at(author_date, b)); | |
81c6b38b JH |
633 | |
634 | /* newer commits with larger date first */ | |
635 | if (a_date < b_date) | |
636 | return 1; | |
637 | else if (a_date > b_date) | |
638 | return -1; | |
639 | return 0; | |
640 | } | |
641 | ||
727377ff | 642 | int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused) |
da24b104 JH |
643 | { |
644 | const struct commit *a = a_, *b = b_; | |
645 | /* newer commits with larger date first */ | |
646 | if (a->date < b->date) | |
647 | return 1; | |
648 | else if (a->date > b->date) | |
649 | return -1; | |
650 | return 0; | |
651 | } | |
652 | ||
ab580ace JS |
653 | /* |
654 | * Performs an in-place topological sort on the list supplied. | |
655 | */ | |
da24b104 | 656 | void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order) |
6b6dcfc2 | 657 | { |
23c17d4a | 658 | struct commit_list *next, *orig = *list; |
23c17d4a | 659 | struct commit_list **pptr; |
a84b794a | 660 | struct indegree_slab indegree; |
da24b104 JH |
661 | struct prio_queue queue; |
662 | struct commit *commit; | |
81c6b38b | 663 | struct author_date_slab author_date; |
a6080a0a | 664 | |
23c17d4a | 665 | if (!orig) |
7d6fb370 | 666 | return; |
23c17d4a LT |
667 | *list = NULL; |
668 | ||
a84b794a | 669 | init_indegree_slab(&indegree); |
da24b104 | 670 | memset(&queue, '\0', sizeof(queue)); |
81c6b38b | 671 | |
da24b104 JH |
672 | switch (sort_order) { |
673 | default: /* REV_SORT_IN_GRAPH_ORDER */ | |
674 | queue.compare = NULL; | |
675 | break; | |
676 | case REV_SORT_BY_COMMIT_DATE: | |
677 | queue.compare = compare_commits_by_commit_date; | |
678 | break; | |
81c6b38b JH |
679 | case REV_SORT_BY_AUTHOR_DATE: |
680 | init_author_date_slab(&author_date); | |
681 | queue.compare = compare_commits_by_author_date; | |
682 | queue.cb_data = &author_date; | |
683 | break; | |
da24b104 | 684 | } |
96c4f4a3 | 685 | |
23c17d4a LT |
686 | /* Mark them and clear the indegree */ |
687 | for (next = orig; next; next = next->next) { | |
688 | struct commit *commit = next->item; | |
a84b794a | 689 | *(indegree_slab_at(&indegree, commit)) = 1; |
81c6b38b JH |
690 | /* also record the author dates, if needed */ |
691 | if (sort_order == REV_SORT_BY_AUTHOR_DATE) | |
692 | record_author_date(&author_date, commit); | |
ab580ace | 693 | } |
23c17d4a | 694 | |
ab580ace | 695 | /* update the indegree */ |
23c17d4a | 696 | for (next = orig; next; next = next->next) { |
da24b104 | 697 | struct commit_list *parents = next->item->parents; |
ab580ace | 698 | while (parents) { |
23c17d4a | 699 | struct commit *parent = parents->item; |
a84b794a | 700 | int *pi = indegree_slab_at(&indegree, parent); |
6b6dcfc2 | 701 | |
96c4f4a3 JK |
702 | if (*pi) |
703 | (*pi)++; | |
23c17d4a | 704 | parents = parents->next; |
ab580ace | 705 | } |
ab580ace | 706 | } |
23c17d4a | 707 | |
a6080a0a | 708 | /* |
674d1727 PH |
709 | * find the tips |
710 | * | |
711 | * tips are nodes not reachable from any other node in the list | |
712 | * | |
713 | * the tips serve as a starting set for the work queue. | |
714 | */ | |
23c17d4a LT |
715 | for (next = orig; next; next = next->next) { |
716 | struct commit *commit = next->item; | |
ab580ace | 717 | |
a84b794a | 718 | if (*(indegree_slab_at(&indegree, commit)) == 1) |
da24b104 | 719 | prio_queue_put(&queue, commit); |
ab580ace | 720 | } |
4c8725f1 | 721 | |
da24b104 JH |
722 | /* |
723 | * This is unfortunate; the initial tips need to be shown | |
724 | * in the order given from the revision traversal machinery. | |
725 | */ | |
726 | if (sort_order == REV_SORT_IN_GRAPH_ORDER) | |
727 | prio_queue_reverse(&queue); | |
728 | ||
729 | /* We no longer need the commit list */ | |
730 | free_commit_list(orig); | |
23c17d4a LT |
731 | |
732 | pptr = list; | |
733 | *list = NULL; | |
da24b104 JH |
734 | while ((commit = prio_queue_get(&queue)) != NULL) { |
735 | struct commit_list *parents; | |
23c17d4a | 736 | |
23c17d4a | 737 | for (parents = commit->parents; parents ; parents = parents->next) { |
cd2b8ae9 | 738 | struct commit *parent = parents->item; |
a84b794a | 739 | int *pi = indegree_slab_at(&indegree, parent); |
23c17d4a | 740 | |
96c4f4a3 | 741 | if (!*pi) |
23c17d4a LT |
742 | continue; |
743 | ||
744 | /* | |
745 | * parents are only enqueued for emission | |
746 | * when all their children have been emitted thereby | |
747 | * guaranteeing topological order. | |
748 | */ | |
da24b104 JH |
749 | if (--(*pi) == 1) |
750 | prio_queue_put(&queue, parent); | |
ab580ace JS |
751 | } |
752 | /* | |
da24b104 JH |
753 | * all children of commit have already been |
754 | * emitted. we can emit it now. | |
674d1727 | 755 | */ |
a84b794a | 756 | *(indegree_slab_at(&indegree, commit)) = 0; |
da24b104 JH |
757 | |
758 | pptr = &commit_list_insert(commit, pptr)->next; | |
ab580ace | 759 | } |
96c4f4a3 | 760 | |
a84b794a | 761 | clear_indegree_slab(&indegree); |
da24b104 | 762 | clear_prio_queue(&queue); |
81c6b38b JH |
763 | if (sort_order == REV_SORT_BY_AUTHOR_DATE) |
764 | clear_author_date_slab(&author_date); | |
ab580ace | 765 | } |
7c6f8aaf | 766 | |
1295228d | 767 | /* merge-base stuff */ |
7c6f8aaf | 768 | |
208acbfb | 769 | /* Remember to update object flag allocation in object.h */ |
577ed5c2 JH |
770 | #define PARENT1 (1u<<16) |
771 | #define PARENT2 (1u<<17) | |
772 | #define STALE (1u<<18) | |
773 | #define RESULT (1u<<19) | |
7c6f8aaf | 774 | |
1295228d JH |
775 | static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT); |
776 | ||
73f43f22 | 777 | static int queue_has_nonstale(struct prio_queue *queue) |
7c6f8aaf | 778 | { |
73f43f22 JK |
779 | int i; |
780 | for (i = 0; i < queue->nr; i++) { | |
781 | struct commit *commit = queue->array[i].data; | |
782 | if (!(commit->object.flags & STALE)) | |
783 | return 1; | |
7c6f8aaf | 784 | } |
73f43f22 | 785 | return 0; |
7c6f8aaf JS |
786 | } |
787 | ||
d866924a | 788 | /* all input commits in one and twos[] must have been parsed! */ |
da1f5156 | 789 | static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos) |
7c6f8aaf | 790 | { |
73f43f22 | 791 | struct prio_queue queue = { compare_commits_by_commit_date }; |
7c6f8aaf | 792 | struct commit_list *result = NULL; |
6a938648 | 793 | int i; |
7c6f8aaf | 794 | |
f3249438 | 795 | one->object.flags |= PARENT1; |
73f43f22 JK |
796 | if (!n) { |
797 | commit_list_append(one, &result); | |
798 | return result; | |
799 | } | |
800 | prio_queue_put(&queue, one); | |
801 | ||
6a938648 JH |
802 | for (i = 0; i < n; i++) { |
803 | twos[i]->object.flags |= PARENT2; | |
73f43f22 | 804 | prio_queue_put(&queue, twos[i]); |
6a938648 | 805 | } |
7c6f8aaf | 806 | |
73f43f22 JK |
807 | while (queue_has_nonstale(&queue)) { |
808 | struct commit *commit = prio_queue_get(&queue); | |
7c6f8aaf | 809 | struct commit_list *parents; |
f3249438 | 810 | int flags; |
7c6f8aaf | 811 | |
f3249438 JH |
812 | flags = commit->object.flags & (PARENT1 | PARENT2 | STALE); |
813 | if (flags == (PARENT1 | PARENT2)) { | |
814 | if (!(commit->object.flags & RESULT)) { | |
815 | commit->object.flags |= RESULT; | |
47e44ed1 | 816 | commit_list_insert_by_date(commit, &result); |
f3249438 | 817 | } |
542ccefe JH |
818 | /* Mark parents of a found merge stale */ |
819 | flags |= STALE; | |
7c6f8aaf JS |
820 | } |
821 | parents = commit->parents; | |
822 | while (parents) { | |
823 | struct commit *p = parents->item; | |
824 | parents = parents->next; | |
825 | if ((p->object.flags & flags) == flags) | |
826 | continue; | |
172947e6 MK |
827 | if (parse_commit(p)) |
828 | return NULL; | |
7c6f8aaf | 829 | p->object.flags |= flags; |
73f43f22 | 830 | prio_queue_put(&queue, p); |
7c6f8aaf JS |
831 | } |
832 | } | |
833 | ||
73f43f22 | 834 | clear_prio_queue(&queue); |
da1f5156 JH |
835 | return result; |
836 | } | |
837 | ||
838 | static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos) | |
839 | { | |
840 | struct commit_list *list = NULL; | |
841 | struct commit_list *result = NULL; | |
842 | int i; | |
843 | ||
844 | for (i = 0; i < n; i++) { | |
845 | if (one == twos[i]) | |
846 | /* | |
847 | * We do not mark this even with RESULT so we do not | |
848 | * have to clean it up. | |
849 | */ | |
850 | return commit_list_insert(one, &result); | |
851 | } | |
852 | ||
853 | if (parse_commit(one)) | |
854 | return NULL; | |
855 | for (i = 0; i < n; i++) { | |
856 | if (parse_commit(twos[i])) | |
857 | return NULL; | |
858 | } | |
859 | ||
860 | list = paint_down_to_common(one, n, twos); | |
861 | ||
f3249438 | 862 | while (list) { |
e510ab89 RS |
863 | struct commit *commit = pop_commit(&list); |
864 | if (!(commit->object.flags & STALE)) | |
865 | commit_list_insert_by_date(commit, &result); | |
f3249438 JH |
866 | } |
867 | return result; | |
868 | } | |
7c6f8aaf | 869 | |
5240c9d7 MV |
870 | struct commit_list *get_octopus_merge_bases(struct commit_list *in) |
871 | { | |
872 | struct commit_list *i, *j, *k, *ret = NULL; | |
5240c9d7 | 873 | |
6bc76725 VM |
874 | if (!in) |
875 | return ret; | |
876 | ||
877 | commit_list_insert(in->item, &ret); | |
878 | ||
879 | for (i = in->next; i; i = i->next) { | |
258c03eb | 880 | struct commit_list *new_commits = NULL, *end = NULL; |
6bc76725 VM |
881 | |
882 | for (j = ret; j; j = j->next) { | |
883 | struct commit_list *bases; | |
2ce406cc | 884 | bases = get_merge_bases(i->item, j->item); |
258c03eb BW |
885 | if (!new_commits) |
886 | new_commits = bases; | |
6bc76725 VM |
887 | else |
888 | end->next = bases; | |
889 | for (k = bases; k; k = k->next) | |
890 | end = k; | |
5240c9d7 | 891 | } |
258c03eb | 892 | ret = new_commits; |
5240c9d7 MV |
893 | } |
894 | return ret; | |
895 | } | |
896 | ||
94f0ced0 JH |
897 | static int remove_redundant(struct commit **array, int cnt) |
898 | { | |
899 | /* | |
900 | * Some commit in the array may be an ancestor of | |
901 | * another commit. Move such commit to the end of | |
902 | * the array, and return the number of commits that | |
903 | * are independent from each other. | |
904 | */ | |
905 | struct commit **work; | |
906 | unsigned char *redundant; | |
907 | int *filled_index; | |
908 | int i, j, filled; | |
909 | ||
910 | work = xcalloc(cnt, sizeof(*work)); | |
911 | redundant = xcalloc(cnt, 1); | |
b32fa95f | 912 | ALLOC_ARRAY(filled_index, cnt - 1); |
94f0ced0 | 913 | |
d866924a JH |
914 | for (i = 0; i < cnt; i++) |
915 | parse_commit(array[i]); | |
94f0ced0 JH |
916 | for (i = 0; i < cnt; i++) { |
917 | struct commit_list *common; | |
918 | ||
919 | if (redundant[i]) | |
920 | continue; | |
921 | for (j = filled = 0; j < cnt; j++) { | |
922 | if (i == j || redundant[j]) | |
923 | continue; | |
924 | filled_index[filled] = j; | |
925 | work[filled++] = array[j]; | |
926 | } | |
927 | common = paint_down_to_common(array[i], filled, work); | |
928 | if (array[i]->object.flags & PARENT2) | |
929 | redundant[i] = 1; | |
930 | for (j = 0; j < filled; j++) | |
931 | if (work[j]->object.flags & PARENT1) | |
932 | redundant[filled_index[j]] = 1; | |
933 | clear_commit_marks(array[i], all_flags); | |
abc03512 | 934 | clear_commit_marks_many(filled, work, all_flags); |
94f0ced0 JH |
935 | free_commit_list(common); |
936 | } | |
937 | ||
938 | /* Now collect the result */ | |
45ccef87 | 939 | COPY_ARRAY(work, array, cnt); |
94f0ced0 JH |
940 | for (i = filled = 0; i < cnt; i++) |
941 | if (!redundant[i]) | |
942 | array[filled++] = work[i]; | |
943 | for (j = filled, i = 0; i < cnt; i++) | |
944 | if (redundant[i]) | |
945 | array[j++] = work[i]; | |
946 | free(work); | |
947 | free(redundant); | |
948 | free(filled_index); | |
949 | return filled; | |
950 | } | |
951 | ||
2ce406cc JH |
952 | static struct commit_list *get_merge_bases_many_0(struct commit *one, |
953 | int n, | |
954 | struct commit **twos, | |
955 | int cleanup) | |
f3249438 | 956 | { |
f3249438 JH |
957 | struct commit_list *list; |
958 | struct commit **rslt; | |
959 | struct commit_list *result; | |
94f0ced0 | 960 | int cnt, i; |
f3249438 | 961 | |
6a938648 JH |
962 | result = merge_bases_many(one, n, twos); |
963 | for (i = 0; i < n; i++) { | |
964 | if (one == twos[i]) | |
965 | return result; | |
966 | } | |
f3249438 JH |
967 | if (!result || !result->next) { |
968 | if (cleanup) { | |
969 | clear_commit_marks(one, all_flags); | |
e895cb51 | 970 | clear_commit_marks_many(n, twos, all_flags); |
7c6f8aaf | 971 | } |
f3249438 | 972 | return result; |
7c6f8aaf JS |
973 | } |
974 | ||
f3249438 | 975 | /* There are more than one */ |
4bbaa1eb | 976 | cnt = commit_list_count(result); |
f3249438 JH |
977 | rslt = xcalloc(cnt, sizeof(*rslt)); |
978 | for (list = result, i = 0; list; list = list->next) | |
979 | rslt[i++] = list->item; | |
980 | free_commit_list(result); | |
981 | ||
982 | clear_commit_marks(one, all_flags); | |
e895cb51 | 983 | clear_commit_marks_many(n, twos, all_flags); |
7c6f8aaf | 984 | |
94f0ced0 | 985 | cnt = remove_redundant(rslt, cnt); |
f3249438 | 986 | result = NULL; |
94f0ced0 JH |
987 | for (i = 0; i < cnt; i++) |
988 | commit_list_insert_by_date(rslt[i], &result); | |
f3249438 | 989 | free(rslt); |
7c6f8aaf JS |
990 | return result; |
991 | } | |
2ecd2bbc | 992 | |
2ce406cc JH |
993 | struct commit_list *get_merge_bases_many(struct commit *one, |
994 | int n, | |
995 | struct commit **twos) | |
996 | { | |
997 | return get_merge_bases_many_0(one, n, twos, 1); | |
998 | } | |
999 | ||
1000 | struct commit_list *get_merge_bases_many_dirty(struct commit *one, | |
1001 | int n, | |
1002 | struct commit **twos) | |
1003 | { | |
1004 | return get_merge_bases_many_0(one, n, twos, 0); | |
1005 | } | |
1006 | ||
1007 | struct commit_list *get_merge_bases(struct commit *one, struct commit *two) | |
6a938648 | 1008 | { |
2ce406cc | 1009 | return get_merge_bases_many_0(one, 1, &two, 1); |
6a938648 JH |
1010 | } |
1011 | ||
a20efee9 | 1012 | /* |
41ccfdd9 | 1013 | * Is "commit" a descendant of one of the elements on the "with_commit" list? |
a20efee9 | 1014 | */ |
7fcdb36e JG |
1015 | int is_descendant_of(struct commit *commit, struct commit_list *with_commit) |
1016 | { | |
1017 | if (!with_commit) | |
1018 | return 1; | |
1019 | while (with_commit) { | |
1020 | struct commit *other; | |
1021 | ||
1022 | other = with_commit->item; | |
1023 | with_commit = with_commit->next; | |
a20efee9 | 1024 | if (in_merge_bases(other, commit)) |
7fcdb36e JG |
1025 | return 1; |
1026 | } | |
1027 | return 0; | |
1028 | } | |
1029 | ||
a20efee9 | 1030 | /* |
4c4b27e8 | 1031 | * Is "commit" an ancestor of one of the "references"? |
a20efee9 | 1032 | */ |
4c4b27e8 | 1033 | int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference) |
2ecd2bbc | 1034 | { |
6440fdba | 1035 | struct commit_list *bases; |
4c4b27e8 | 1036 | int ret = 0, i; |
2ecd2bbc | 1037 | |
4c4b27e8 | 1038 | if (parse_commit(commit)) |
6440fdba | 1039 | return ret; |
4c4b27e8 JH |
1040 | for (i = 0; i < nr_reference; i++) |
1041 | if (parse_commit(reference[i])) | |
1042 | return ret; | |
2ecd2bbc | 1043 | |
4c4b27e8 | 1044 | bases = paint_down_to_common(commit, nr_reference, reference); |
6440fdba JH |
1045 | if (commit->object.flags & PARENT2) |
1046 | ret = 1; | |
b0f9e9ee | 1047 | clear_commit_marks(commit, all_flags); |
557899ff | 1048 | clear_commit_marks_many(nr_reference, reference, all_flags); |
2ecd2bbc JH |
1049 | free_commit_list(bases); |
1050 | return ret; | |
1051 | } | |
98cf9c3b | 1052 | |
4c4b27e8 JH |
1053 | /* |
1054 | * Is "commit" an ancestor of (i.e. reachable from) the "reference"? | |
1055 | */ | |
1056 | int in_merge_bases(struct commit *commit, struct commit *reference) | |
1057 | { | |
1058 | return in_merge_bases_many(commit, 1, &reference); | |
1059 | } | |
1060 | ||
98cf9c3b JH |
1061 | struct commit_list *reduce_heads(struct commit_list *heads) |
1062 | { | |
1063 | struct commit_list *p; | |
1064 | struct commit_list *result = NULL, **tail = &result; | |
f37d3c75 JH |
1065 | struct commit **array; |
1066 | int num_head, i; | |
98cf9c3b JH |
1067 | |
1068 | if (!heads) | |
1069 | return NULL; | |
1070 | ||
f37d3c75 JH |
1071 | /* Uniquify */ |
1072 | for (p = heads; p; p = p->next) | |
1073 | p->item->object.flags &= ~STALE; | |
1074 | for (p = heads, num_head = 0; p; p = p->next) { | |
1075 | if (p->item->object.flags & STALE) | |
711f6b29 | 1076 | continue; |
f37d3c75 JH |
1077 | p->item->object.flags |= STALE; |
1078 | num_head++; | |
1079 | } | |
c4a7b009 | 1080 | array = xcalloc(num_head, sizeof(*array)); |
f37d3c75 JH |
1081 | for (p = heads, i = 0; p; p = p->next) { |
1082 | if (p->item->object.flags & STALE) { | |
1083 | array[i++] = p->item; | |
1084 | p->item->object.flags &= ~STALE; | |
98cf9c3b | 1085 | } |
98cf9c3b | 1086 | } |
f37d3c75 JH |
1087 | num_head = remove_redundant(array, num_head); |
1088 | for (i = 0; i < num_head; i++) | |
1089 | tail = &commit_list_insert(array[i], tail)->next; | |
cb7b29eb | 1090 | free(array); |
98cf9c3b JH |
1091 | return result; |
1092 | } | |
40d52ff7 | 1093 | |
4da72644 MÅ |
1094 | void reduce_heads_replace(struct commit_list **heads) |
1095 | { | |
1096 | struct commit_list *result = reduce_heads(*heads); | |
1097 | free_commit_list(*heads); | |
1098 | *heads = result; | |
1099 | } | |
1100 | ||
ba3c69a9 JH |
1101 | static const char gpg_sig_header[] = "gpgsig"; |
1102 | static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1; | |
1103 | ||
1104 | static int do_sign_commit(struct strbuf *buf, const char *keyid) | |
1105 | { | |
1106 | struct strbuf sig = STRBUF_INIT; | |
1107 | int inspos, copypos; | |
3324dd8f | 1108 | const char *eoh; |
ba3c69a9 JH |
1109 | |
1110 | /* find the end of the header */ | |
3324dd8f JS |
1111 | eoh = strstr(buf->buf, "\n\n"); |
1112 | if (!eoh) | |
1113 | inspos = buf->len; | |
1114 | else | |
1115 | inspos = eoh - buf->buf + 1; | |
ba3c69a9 JH |
1116 | |
1117 | if (!keyid || !*keyid) | |
1118 | keyid = get_signing_key(); | |
1119 | if (sign_buffer(buf, &sig, keyid)) { | |
1120 | strbuf_release(&sig); | |
1121 | return -1; | |
1122 | } | |
1123 | ||
1124 | for (copypos = 0; sig.buf[copypos]; ) { | |
1125 | const char *bol = sig.buf + copypos; | |
1126 | const char *eol = strchrnul(bol, '\n'); | |
1127 | int len = (eol - bol) + !!*eol; | |
1128 | ||
1129 | if (!copypos) { | |
1130 | strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len); | |
1131 | inspos += gpg_sig_header_len; | |
1132 | } | |
1133 | strbuf_insert(buf, inspos++, " ", 1); | |
1134 | strbuf_insert(buf, inspos, bol, len); | |
1135 | inspos += len; | |
1136 | copypos += len; | |
1137 | } | |
1138 | strbuf_release(&sig); | |
1139 | return 0; | |
1140 | } | |
1141 | ||
218aa3a6 | 1142 | int parse_signed_commit(const struct commit *commit, |
0c37f1fc JH |
1143 | struct strbuf *payload, struct strbuf *signature) |
1144 | { | |
218aa3a6 | 1145 | |
0c37f1fc | 1146 | unsigned long size; |
218aa3a6 | 1147 | const char *buffer = get_commit_buffer(commit, &size); |
0c37f1fc | 1148 | int in_signature, saw_signature = -1; |
218aa3a6 | 1149 | const char *line, *tail; |
0c37f1fc JH |
1150 | |
1151 | line = buffer; | |
1152 | tail = buffer + size; | |
1153 | in_signature = 0; | |
1154 | saw_signature = 0; | |
1155 | while (line < tail) { | |
1156 | const char *sig = NULL; | |
218aa3a6 | 1157 | const char *next = memchr(line, '\n', tail - line); |
0c37f1fc JH |
1158 | |
1159 | next = next ? next + 1 : tail; | |
1160 | if (in_signature && line[0] == ' ') | |
1161 | sig = line + 1; | |
59556548 | 1162 | else if (starts_with(line, gpg_sig_header) && |
0c37f1fc JH |
1163 | line[gpg_sig_header_len] == ' ') |
1164 | sig = line + gpg_sig_header_len + 1; | |
1165 | if (sig) { | |
1166 | strbuf_add(signature, sig, next - sig); | |
1167 | saw_signature = 1; | |
1168 | in_signature = 1; | |
1169 | } else { | |
1170 | if (*line == '\n') | |
1171 | /* dump the whole remainder of the buffer */ | |
1172 | next = tail; | |
1173 | strbuf_add(payload, line, next - line); | |
1174 | in_signature = 0; | |
1175 | } | |
1176 | line = next; | |
1177 | } | |
218aa3a6 | 1178 | unuse_commit_buffer(commit, buffer); |
0c37f1fc JH |
1179 | return saw_signature; |
1180 | } | |
1181 | ||
0b05ab6f CC |
1182 | int remove_signature(struct strbuf *buf) |
1183 | { | |
1184 | const char *line = buf->buf; | |
1185 | const char *tail = buf->buf + buf->len; | |
1186 | int in_signature = 0; | |
1187 | const char *sig_start = NULL; | |
1188 | const char *sig_end = NULL; | |
1189 | ||
1190 | while (line < tail) { | |
1191 | const char *next = memchr(line, '\n', tail - line); | |
1192 | next = next ? next + 1 : tail; | |
1193 | ||
1194 | if (in_signature && line[0] == ' ') | |
1195 | sig_end = next; | |
1196 | else if (starts_with(line, gpg_sig_header) && | |
1197 | line[gpg_sig_header_len] == ' ') { | |
1198 | sig_start = line; | |
1199 | sig_end = next; | |
1200 | in_signature = 1; | |
1201 | } else { | |
1202 | if (*line == '\n') | |
1203 | /* dump the whole remainder of the buffer */ | |
1204 | next = tail; | |
1205 | in_signature = 0; | |
1206 | } | |
1207 | line = next; | |
1208 | } | |
1209 | ||
1210 | if (sig_start) | |
1211 | strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start); | |
1212 | ||
1213 | return sig_start != NULL; | |
1214 | } | |
1215 | ||
5231c633 JH |
1216 | static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail) |
1217 | { | |
1218 | struct merge_remote_desc *desc; | |
1219 | struct commit_extra_header *mergetag; | |
1220 | char *buf; | |
1221 | unsigned long size, len; | |
1222 | enum object_type type; | |
1223 | ||
1224 | desc = merge_remote_util(parent); | |
1225 | if (!desc || !desc->obj) | |
1226 | return; | |
b4f5aca4 | 1227 | buf = read_object_file(&desc->obj->oid, &type, &size); |
5231c633 JH |
1228 | if (!buf || type != OBJ_TAG) |
1229 | goto free_return; | |
1230 | len = parse_signature(buf, size); | |
1231 | if (size == len) | |
1232 | goto free_return; | |
1233 | /* | |
1234 | * We could verify this signature and either omit the tag when | |
1235 | * it does not validate, but the integrator may not have the | |
1236 | * public key of the signer of the tag he is merging, while a | |
1237 | * later auditor may have it while auditing, so let's not run | |
1238 | * verify-signed-buffer here for now... | |
1239 | * | |
1240 | * if (verify_signed_buffer(buf, len, buf + len, size - len, ...)) | |
1241 | * warn("warning: signed tag unverified."); | |
1242 | */ | |
1243 | mergetag = xcalloc(1, sizeof(*mergetag)); | |
1244 | mergetag->key = xstrdup("mergetag"); | |
1245 | mergetag->value = buf; | |
1246 | mergetag->len = size; | |
1247 | ||
1248 | **tail = mergetag; | |
1249 | *tail = &mergetag->next; | |
1250 | return; | |
1251 | ||
1252 | free_return: | |
1253 | free(buf); | |
1254 | } | |
1255 | ||
434060ec | 1256 | int check_commit_signature(const struct commit *commit, struct signature_check *sigc) |
ffb6d7d5 SG |
1257 | { |
1258 | struct strbuf payload = STRBUF_INIT; | |
1259 | struct strbuf signature = STRBUF_INIT; | |
434060ec | 1260 | int ret = 1; |
ffb6d7d5 SG |
1261 | |
1262 | sigc->result = 'N'; | |
1263 | ||
218aa3a6 | 1264 | if (parse_signed_commit(commit, &payload, &signature) <= 0) |
ffb6d7d5 | 1265 | goto out; |
434060ec | 1266 | ret = check_signature(payload.buf, payload.len, signature.buf, |
1267 | signature.len, sigc); | |
ffb6d7d5 SG |
1268 | |
1269 | out: | |
ffb6d7d5 SG |
1270 | strbuf_release(&payload); |
1271 | strbuf_release(&signature); | |
434060ec | 1272 | |
1273 | return ret; | |
ffb6d7d5 SG |
1274 | } |
1275 | ||
1276 | ||
1277 | ||
5231c633 JH |
1278 | void append_merge_tag_headers(struct commit_list *parents, |
1279 | struct commit_extra_header ***tail) | |
1280 | { | |
1281 | while (parents) { | |
1282 | struct commit *parent = parents->item; | |
1283 | handle_signed_tag(parent, tail); | |
1284 | parents = parents->next; | |
1285 | } | |
1286 | } | |
1287 | ||
1288 | static void add_extra_header(struct strbuf *buffer, | |
1289 | struct commit_extra_header *extra) | |
1290 | { | |
1291 | strbuf_addstr(buffer, extra->key); | |
ed7a42a0 JH |
1292 | if (extra->len) |
1293 | strbuf_add_lines(buffer, " ", extra->value, extra->len); | |
1294 | else | |
1295 | strbuf_addch(buffer, '\n'); | |
1296 | } | |
1297 | ||
c871a1d1 JH |
1298 | struct commit_extra_header *read_commit_extra_headers(struct commit *commit, |
1299 | const char **exclude) | |
ed7a42a0 JH |
1300 | { |
1301 | struct commit_extra_header *extra = NULL; | |
1302 | unsigned long size; | |
218aa3a6 JK |
1303 | const char *buffer = get_commit_buffer(commit, &size); |
1304 | extra = read_commit_extra_header_lines(buffer, size, exclude); | |
1305 | unuse_commit_buffer(commit, buffer); | |
ed7a42a0 JH |
1306 | return extra; |
1307 | } | |
1308 | ||
063da62b CC |
1309 | void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data) |
1310 | { | |
1311 | struct commit_extra_header *extra, *to_free; | |
1312 | ||
1313 | to_free = read_commit_extra_headers(commit, NULL); | |
1314 | for (extra = to_free; extra; extra = extra->next) { | |
1315 | if (strcmp(extra->key, "mergetag")) | |
1316 | continue; /* not a merge tag */ | |
1317 | fn(commit, extra, data); | |
1318 | } | |
1319 | free_commit_extra_headers(to_free); | |
1320 | } | |
1321 | ||
ed7a42a0 JH |
1322 | static inline int standard_header_field(const char *field, size_t len) |
1323 | { | |
b072504c RS |
1324 | return ((len == 4 && !memcmp(field, "tree", 4)) || |
1325 | (len == 6 && !memcmp(field, "parent", 6)) || | |
1326 | (len == 6 && !memcmp(field, "author", 6)) || | |
1327 | (len == 9 && !memcmp(field, "committer", 9)) || | |
1328 | (len == 8 && !memcmp(field, "encoding", 8))); | |
ed7a42a0 JH |
1329 | } |
1330 | ||
c871a1d1 JH |
1331 | static int excluded_header_field(const char *field, size_t len, const char **exclude) |
1332 | { | |
1333 | if (!exclude) | |
1334 | return 0; | |
1335 | ||
1336 | while (*exclude) { | |
1337 | size_t xlen = strlen(*exclude); | |
b072504c | 1338 | if (len == xlen && !memcmp(field, *exclude, xlen)) |
c871a1d1 JH |
1339 | return 1; |
1340 | exclude++; | |
1341 | } | |
1342 | return 0; | |
1343 | } | |
1344 | ||
82a75299 JH |
1345 | static struct commit_extra_header *read_commit_extra_header_lines( |
1346 | const char *buffer, size_t size, | |
1347 | const char **exclude) | |
ed7a42a0 JH |
1348 | { |
1349 | struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL; | |
1350 | const char *line, *next, *eof, *eob; | |
1351 | struct strbuf buf = STRBUF_INIT; | |
1352 | ||
1353 | for (line = buffer, eob = line + size; | |
1354 | line < eob && *line != '\n'; | |
1355 | line = next) { | |
1356 | next = memchr(line, '\n', eob - line); | |
1357 | next = next ? next + 1 : eob; | |
1358 | if (*line == ' ') { | |
1359 | /* continuation */ | |
1360 | if (it) | |
1361 | strbuf_add(&buf, line + 1, next - (line + 1)); | |
1362 | continue; | |
1363 | } | |
1364 | if (it) | |
1365 | it->value = strbuf_detach(&buf, &it->len); | |
1366 | strbuf_reset(&buf); | |
1367 | it = NULL; | |
1368 | ||
50a01cc4 RS |
1369 | eof = memchr(line, ' ', next - line); |
1370 | if (!eof) | |
ed7a42a0 | 1371 | eof = next; |
b072504c RS |
1372 | else if (standard_header_field(line, eof - line) || |
1373 | excluded_header_field(line, eof - line, exclude)) | |
ed7a42a0 JH |
1374 | continue; |
1375 | ||
1376 | it = xcalloc(1, sizeof(*it)); | |
1377 | it->key = xmemdupz(line, eof-line); | |
1378 | *tail = it; | |
1379 | tail = &it->next; | |
1380 | if (eof + 1 < next) | |
1381 | strbuf_add(&buf, eof + 1, next - (eof + 1)); | |
1382 | } | |
1383 | if (it) | |
1384 | it->value = strbuf_detach(&buf, &it->len); | |
1385 | return extra; | |
5231c633 JH |
1386 | } |
1387 | ||
1388 | void free_commit_extra_headers(struct commit_extra_header *extra) | |
1389 | { | |
1390 | while (extra) { | |
1391 | struct commit_extra_header *next = extra->next; | |
1392 | free(extra->key); | |
1393 | free(extra->value); | |
1394 | free(extra); | |
1395 | extra = next; | |
1396 | } | |
1397 | } | |
1398 | ||
5078f344 PO |
1399 | int commit_tree(const char *msg, size_t msg_len, const struct object_id *tree, |
1400 | struct commit_list *parents, struct object_id *ret, | |
ba3c69a9 | 1401 | const char *author, const char *sign_commit) |
5231c633 JH |
1402 | { |
1403 | struct commit_extra_header *extra = NULL, **tail = &extra; | |
1404 | int result; | |
1405 | ||
1406 | append_merge_tag_headers(parents, &tail); | |
3ffefb54 | 1407 | result = commit_tree_extended(msg, msg_len, tree, parents, ret, |
ba3c69a9 | 1408 | author, sign_commit, extra); |
5231c633 JH |
1409 | free_commit_extra_headers(extra); |
1410 | return result; | |
1411 | } | |
1412 | ||
08a94a14 LT |
1413 | static int find_invalid_utf8(const char *buf, int len) |
1414 | { | |
1415 | int offset = 0; | |
e82bd6cc | 1416 | static const unsigned int max_codepoint[] = { |
1417 | 0x7f, 0x7ff, 0xffff, 0x10ffff | |
1418 | }; | |
08a94a14 LT |
1419 | |
1420 | while (len) { | |
1421 | unsigned char c = *buf++; | |
1422 | int bytes, bad_offset; | |
28110d4b | 1423 | unsigned int codepoint; |
e82bd6cc | 1424 | unsigned int min_val, max_val; |
08a94a14 LT |
1425 | |
1426 | len--; | |
1427 | offset++; | |
1428 | ||
1429 | /* Simple US-ASCII? No worries. */ | |
1430 | if (c < 0x80) | |
1431 | continue; | |
1432 | ||
1433 | bad_offset = offset-1; | |
1434 | ||
1435 | /* | |
1436 | * Count how many more high bits set: that's how | |
1437 | * many more bytes this sequence should have. | |
1438 | */ | |
1439 | bytes = 0; | |
1440 | while (c & 0x40) { | |
1441 | c <<= 1; | |
1442 | bytes++; | |
1443 | } | |
1444 | ||
28110d4b | 1445 | /* |
1446 | * Must be between 1 and 3 more bytes. Longer sequences result in | |
1447 | * codepoints beyond U+10FFFF, which are guaranteed never to exist. | |
1448 | */ | |
1449 | if (bytes < 1 || 3 < bytes) | |
08a94a14 LT |
1450 | return bad_offset; |
1451 | ||
1452 | /* Do we *have* that many bytes? */ | |
1453 | if (len < bytes) | |
1454 | return bad_offset; | |
1455 | ||
e82bd6cc | 1456 | /* |
1457 | * Place the encoded bits at the bottom of the value and compute the | |
1458 | * valid range. | |
1459 | */ | |
28110d4b | 1460 | codepoint = (c & 0x7f) >> bytes; |
e82bd6cc | 1461 | min_val = max_codepoint[bytes-1] + 1; |
1462 | max_val = max_codepoint[bytes]; | |
28110d4b | 1463 | |
08a94a14 LT |
1464 | offset += bytes; |
1465 | len -= bytes; | |
1466 | ||
1467 | /* And verify that they are good continuation bytes */ | |
1468 | do { | |
28110d4b | 1469 | codepoint <<= 6; |
1470 | codepoint |= *buf & 0x3f; | |
08a94a14 LT |
1471 | if ((*buf++ & 0xc0) != 0x80) |
1472 | return bad_offset; | |
1473 | } while (--bytes); | |
1474 | ||
e82bd6cc | 1475 | /* Reject codepoints that are out of range for the sequence length. */ |
1476 | if (codepoint < min_val || codepoint > max_val) | |
28110d4b | 1477 | return bad_offset; |
1478 | /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */ | |
1479 | if ((codepoint & 0x1ff800) == 0xd800) | |
1480 | return bad_offset; | |
81050ac6 | 1481 | /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */ |
dc773a67 | 1482 | if ((codepoint & 0xfffe) == 0xfffe) |
81050ac6 PK |
1483 | return bad_offset; |
1484 | /* So are anything in the range U+FDD0..U+FDEF. */ | |
1485 | if (codepoint >= 0xfdd0 && codepoint <= 0xfdef) | |
28110d4b | 1486 | return bad_offset; |
08a94a14 LT |
1487 | } |
1488 | return -1; | |
1489 | } | |
1490 | ||
1491 | /* | |
1492 | * This verifies that the buffer is in proper utf8 format. | |
1493 | * | |
1494 | * If it isn't, it assumes any non-utf8 characters are Latin1, | |
1495 | * and does the conversion. | |
08a94a14 LT |
1496 | */ |
1497 | static int verify_utf8(struct strbuf *buf) | |
1498 | { | |
1499 | int ok = 1; | |
1500 | long pos = 0; | |
1501 | ||
1502 | for (;;) { | |
1503 | int bad; | |
1504 | unsigned char c; | |
1505 | unsigned char replace[2]; | |
1506 | ||
1507 | bad = find_invalid_utf8(buf->buf + pos, buf->len - pos); | |
1508 | if (bad < 0) | |
1509 | return ok; | |
1510 | pos += bad; | |
1511 | ok = 0; | |
1512 | c = buf->buf[pos]; | |
1513 | strbuf_remove(buf, pos, 1); | |
1514 | ||
1515 | /* We know 'c' must be in the range 128-255 */ | |
1516 | replace[0] = 0xc0 + (c >> 6); | |
1517 | replace[1] = 0x80 + (c & 0x3f); | |
1518 | strbuf_insert(buf, pos, replace, 2); | |
1519 | pos += 2; | |
1520 | } | |
1521 | } | |
1522 | ||
40d52ff7 | 1523 | static const char commit_utf8_warn[] = |
4fa4b315 VA |
1524 | N_("Warning: commit message did not conform to UTF-8.\n" |
1525 | "You may want to amend it after fixing the message, or set the config\n" | |
1526 | "variable i18n.commitencoding to the encoding your project uses.\n"); | |
40d52ff7 | 1527 | |
3ffefb54 | 1528 | int commit_tree_extended(const char *msg, size_t msg_len, |
5078f344 PO |
1529 | const struct object_id *tree, |
1530 | struct commit_list *parents, struct object_id *ret, | |
ba3c69a9 JH |
1531 | const char *author, const char *sign_commit, |
1532 | struct commit_extra_header *extra) | |
40d52ff7 JK |
1533 | { |
1534 | int result; | |
1535 | int encoding_is_utf8; | |
1536 | struct strbuf buffer; | |
1537 | ||
e816caa0 | 1538 | assert_oid_type(tree, OBJ_TREE); |
40d52ff7 | 1539 | |
3ffefb54 | 1540 | if (memchr(msg, '\0', msg_len)) |
37576c14 NTND |
1541 | return error("a NUL byte in commit log message not allowed."); |
1542 | ||
40d52ff7 JK |
1543 | /* Not having i18n.commitencoding is the same as having utf-8 */ |
1544 | encoding_is_utf8 = is_encoding_utf8(git_commit_encoding); | |
1545 | ||
1546 | strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */ | |
5078f344 | 1547 | strbuf_addf(&buffer, "tree %s\n", oid_to_hex(tree)); |
40d52ff7 JK |
1548 | |
1549 | /* | |
1550 | * NOTE! This ordering means that the same exact tree merged with a | |
1551 | * different order of parents will be a _different_ changeset even | |
1552 | * if everything else stays the same. | |
1553 | */ | |
1554 | while (parents) { | |
e510ab89 | 1555 | struct commit *parent = pop_commit(&parents); |
40d52ff7 | 1556 | strbuf_addf(&buffer, "parent %s\n", |
f2fd0760 | 1557 | oid_to_hex(&parent->object.oid)); |
40d52ff7 JK |
1558 | } |
1559 | ||
1560 | /* Person/date information */ | |
1561 | if (!author) | |
f9bc573f | 1562 | author = git_author_info(IDENT_STRICT); |
40d52ff7 | 1563 | strbuf_addf(&buffer, "author %s\n", author); |
f9bc573f | 1564 | strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT)); |
40d52ff7 JK |
1565 | if (!encoding_is_utf8) |
1566 | strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding); | |
5231c633 JH |
1567 | |
1568 | while (extra) { | |
1569 | add_extra_header(&buffer, extra); | |
1570 | extra = extra->next; | |
1571 | } | |
40d52ff7 JK |
1572 | strbuf_addch(&buffer, '\n'); |
1573 | ||
1574 | /* And add the comment */ | |
3ffefb54 | 1575 | strbuf_add(&buffer, msg, msg_len); |
40d52ff7 JK |
1576 | |
1577 | /* And check the encoding */ | |
08a94a14 | 1578 | if (encoding_is_utf8 && !verify_utf8(&buffer)) |
4fa4b315 | 1579 | fprintf(stderr, _(commit_utf8_warn)); |
40d52ff7 | 1580 | |
e505146d RS |
1581 | if (sign_commit && do_sign_commit(&buffer, sign_commit)) { |
1582 | result = -1; | |
1583 | goto out; | |
1584 | } | |
ba3c69a9 | 1585 | |
a09c985e | 1586 | result = write_object_file(buffer.buf, buffer.len, commit_type, ret); |
e505146d | 1587 | out: |
40d52ff7 JK |
1588 | strbuf_release(&buffer); |
1589 | return result; | |
1590 | } | |
ae8e4c9c | 1591 | |
beb518c9 RS |
1592 | void set_merge_remote_desc(struct commit *commit, |
1593 | const char *name, struct object *obj) | |
1594 | { | |
1595 | struct merge_remote_desc *desc; | |
5447a76a | 1596 | FLEX_ALLOC_STR(desc, name, name); |
beb518c9 | 1597 | desc->obj = obj; |
beb518c9 RS |
1598 | commit->util = desc; |
1599 | } | |
1600 | ||
ae8e4c9c JH |
1601 | struct commit *get_merge_parent(const char *name) |
1602 | { | |
1603 | struct object *obj; | |
1604 | struct commit *commit; | |
7683e2e6 | 1605 | struct object_id oid; |
e82caf38 | 1606 | if (get_oid(name, &oid)) |
ae8e4c9c | 1607 | return NULL; |
c251c83d | 1608 | obj = parse_object(&oid); |
ae8e4c9c | 1609 | commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT); |
beb518c9 RS |
1610 | if (commit && !commit->util) |
1611 | set_merge_remote_desc(commit, name, obj); | |
ae8e4c9c JH |
1612 | return commit; |
1613 | } | |
89b5f1d9 RS |
1614 | |
1615 | /* | |
1616 | * Append a commit to the end of the commit_list. | |
1617 | * | |
1618 | * next starts by pointing to the variable that holds the head of an | |
1619 | * empty commit_list, and is updated to point to the "next" field of | |
1620 | * the last item on the list as new commits are appended. | |
1621 | * | |
1622 | * Usage example: | |
1623 | * | |
1624 | * struct commit_list *list; | |
1625 | * struct commit_list **next = &list; | |
1626 | * | |
1627 | * next = commit_list_append(c1, next); | |
1628 | * next = commit_list_append(c2, next); | |
1629 | * assert(commit_list_count(list) == 2); | |
1630 | * return list; | |
1631 | */ | |
1632 | struct commit_list **commit_list_append(struct commit *commit, | |
1633 | struct commit_list **next) | |
1634 | { | |
258c03eb BW |
1635 | struct commit_list *new_commit = xmalloc(sizeof(struct commit_list)); |
1636 | new_commit->item = commit; | |
1637 | *next = new_commit; | |
1638 | new_commit->next = NULL; | |
1639 | return &new_commit->next; | |
89b5f1d9 | 1640 | } |
efc7df45 | 1641 | |
fe6eb7f2 JK |
1642 | const char *find_commit_header(const char *msg, const char *key, size_t *out_len) |
1643 | { | |
1644 | int key_len = strlen(key); | |
1645 | const char *line = msg; | |
1646 | ||
1647 | while (line) { | |
1648 | const char *eol = strchrnul(line, '\n'); | |
1649 | ||
1650 | if (line == eol) | |
1651 | return NULL; | |
1652 | ||
1653 | if (eol - line > key_len && | |
1654 | !strncmp(line, key, key_len) && | |
1655 | line[key_len] == ' ') { | |
1656 | *out_len = eol - line - key_len - 1; | |
1657 | return line + key_len + 1; | |
1658 | } | |
1659 | line = *eol ? eol + 1 : NULL; | |
1660 | } | |
1661 | return NULL; | |
1662 | } | |
0ed8a4e1 | 1663 | |
8c384589 | 1664 | /* |
710714aa | 1665 | * Inspect the given string and determine the true "end" of the log message, in |
8c384589 | 1666 | * order to find where to put a new Signed-off-by: line. Ignored are |
d76650b8 BM |
1667 | * trailing comment lines and blank lines. To support "git commit -s |
1668 | * --amend" on an existing commit, we also ignore "Conflicts:". To | |
1669 | * support "git commit -v", we truncate at cut lines. | |
8c384589 CC |
1670 | * |
1671 | * Returns the number of bytes from the tail to ignore, to be fed as | |
1672 | * the second parameter to append_signoff(). | |
1673 | */ | |
710714aa | 1674 | int ignore_non_trailer(const char *buf, size_t len) |
8c384589 CC |
1675 | { |
1676 | int boc = 0; | |
1677 | int bol = 0; | |
1678 | int in_old_conflicts_block = 0; | |
d76650b8 | 1679 | size_t cutoff = wt_status_locate_end(buf, len); |
8c384589 | 1680 | |
d76650b8 | 1681 | while (bol < cutoff) { |
710714aa | 1682 | const char *next_line = memchr(buf + bol, '\n', len - bol); |
8c384589 | 1683 | |
710714aa JT |
1684 | if (!next_line) |
1685 | next_line = buf + len; | |
8c384589 CC |
1686 | else |
1687 | next_line++; | |
1688 | ||
710714aa | 1689 | if (buf[bol] == comment_line_char || buf[bol] == '\n') { |
8c384589 CC |
1690 | /* is this the first of the run of comments? */ |
1691 | if (!boc) | |
1692 | boc = bol; | |
1693 | /* otherwise, it is just continuing */ | |
710714aa | 1694 | } else if (starts_with(buf + bol, "Conflicts:\n")) { |
8c384589 CC |
1695 | in_old_conflicts_block = 1; |
1696 | if (!boc) | |
1697 | boc = bol; | |
710714aa | 1698 | } else if (in_old_conflicts_block && buf[bol] == '\t') { |
8c384589 CC |
1699 | ; /* a pathname in the conflicts block */ |
1700 | } else if (boc) { | |
1701 | /* the previous was not trailing comment */ | |
1702 | boc = 0; | |
1703 | in_old_conflicts_block = 0; | |
1704 | } | |
710714aa | 1705 | bol = next_line - buf; |
8c384589 | 1706 | } |
d76650b8 | 1707 | return boc ? len - boc : len - cutoff; |
8c384589 | 1708 | } |