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