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