merge-recursive: Speed up commit graph construction
[git/git.git] / commit.c
CommitLineData
8f1d2e6f 1#include "cache.h"
961784ee 2#include "tag.h"
175785e5 3#include "commit.h"
175785e5 4
60ab26de
LT
5int save_commit_buffer = 1;
6
ab580ace
JS
7struct sort_node
8{
9 /*
10 * the number of children of the associated commit
11 * that also occur in the list being sorted.
12 */
13 unsigned int indegree;
14
15 /*
16 * reference to original list item that we will re-use
17 * on output.
18 */
19 struct commit_list * list_item;
20
21};
22
175785e5
DB
23const char *commit_type = "commit";
24
9b66ec04
LT
25enum cmit_fmt get_commit_format(const char *arg)
26{
27 if (!*arg)
28 return CMIT_FMT_DEFAULT;
29 if (!strcmp(arg, "=raw"))
30 return CMIT_FMT_RAW;
31 if (!strcmp(arg, "=medium"))
32 return CMIT_FMT_MEDIUM;
33 if (!strcmp(arg, "=short"))
34 return CMIT_FMT_SHORT;
35 if (!strcmp(arg, "=full"))
36 return CMIT_FMT_FULL;
ff56fe1c
JH
37 if (!strcmp(arg, "=fuller"))
38 return CMIT_FMT_FULLER;
d87449c5
JH
39 if (!strcmp(arg, "=oneline"))
40 return CMIT_FMT_ONELINE;
9b66ec04
LT
41 die("invalid --pretty format");
42}
43
f76412ed
JH
44static struct commit *check_commit(struct object *obj,
45 const unsigned char *sha1,
46 int quiet)
961784ee
LT
47{
48 if (obj->type != commit_type) {
f76412ed
JH
49 if (!quiet)
50 error("Object %s is a %s, not a commit",
51 sha1_to_hex(sha1), obj->type);
961784ee
LT
52 return NULL;
53 }
54 return (struct commit *) obj;
55}
56
f76412ed
JH
57struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
58 int quiet)
961784ee 59{
9534f40b 60 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
961784ee
LT
61
62 if (!obj)
63 return NULL;
f76412ed
JH
64 return check_commit(obj, sha1, quiet);
65}
66
67struct commit *lookup_commit_reference(const unsigned char *sha1)
68{
69 return lookup_commit_reference_gently(sha1, 0);
961784ee
LT
70}
71
5d6ccf5c 72struct commit *lookup_commit(const unsigned char *sha1)
175785e5
DB
73{
74 struct object *obj = lookup_object(sha1);
75 if (!obj) {
812666c8 76 struct commit *ret = xmalloc(sizeof(struct commit));
175785e5
DB
77 memset(ret, 0, sizeof(struct commit));
78 created_object(sha1, &ret->object);
d32987be 79 ret->object.type = commit_type;
175785e5
DB
80 return ret;
81 }
d1af002d
NP
82 if (!obj->type)
83 obj->type = commit_type;
f76412ed 84 return check_commit(obj, sha1, 0);
175785e5
DB
85}
86
87static unsigned long parse_commit_date(const char *buf)
88{
89 unsigned long date;
90
91 if (memcmp(buf, "author", 6))
92 return 0;
93 while (*buf++ != '\n')
94 /* nada */;
95 if (memcmp(buf, "committer", 9))
96 return 0;
97 while (*buf++ != '>')
98 /* nada */;
99 date = strtoul(buf, NULL, 10);
100 if (date == ULONG_MAX)
101 date = 0;
102 return date;
103}
104
5da5c8f4
JH
105static struct commit_graft {
106 unsigned char sha1[20];
107 int nr_parent;
2c04662d 108 unsigned char parent[0][20]; /* more */
5da5c8f4
JH
109} **commit_graft;
110static int commit_graft_alloc, commit_graft_nr;
111
112static int commit_graft_pos(const unsigned char *sha1)
113{
114 int lo, hi;
115 lo = 0;
116 hi = commit_graft_nr;
117 while (lo < hi) {
118 int mi = (lo + hi) / 2;
119 struct commit_graft *graft = commit_graft[mi];
120 int cmp = memcmp(sha1, graft->sha1, 20);
121 if (!cmp)
122 return mi;
123 if (cmp < 0)
124 hi = mi;
125 else
126 lo = mi + 1;
127 }
128 return -lo - 1;
129}
130
131static void prepare_commit_graft(void)
132{
133 char *graft_file = get_graft_file();
134 FILE *fp = fopen(graft_file, "r");
135 char buf[1024];
136 if (!fp) {
137 commit_graft = (struct commit_graft **) "hack";
138 return;
139 }
140 while (fgets(buf, sizeof(buf), fp)) {
141 /* The format is just "Commit Parent1 Parent2 ...\n" */
142 int len = strlen(buf);
143 int i;
144 struct commit_graft *graft = NULL;
145
146 if (buf[len-1] == '\n')
147 buf[--len] = 0;
148 if (buf[0] == '#')
149 continue;
150 if ((len + 1) % 41) {
151 bad_graft_data:
152 error("bad graft data: %s", buf);
153 free(graft);
154 continue;
155 }
156 i = (len + 1) / 41 - 1;
157 graft = xmalloc(sizeof(*graft) + 20 * i);
158 graft->nr_parent = i;
159 if (get_sha1_hex(buf, graft->sha1))
160 goto bad_graft_data;
161 for (i = 40; i < len; i += 41) {
162 if (buf[i] != ' ')
163 goto bad_graft_data;
164 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
165 goto bad_graft_data;
166 }
167 i = commit_graft_pos(graft->sha1);
168 if (0 <= i) {
169 error("duplicate graft data: %s", buf);
170 free(graft);
171 continue;
172 }
173 i = -i - 1;
174 if (commit_graft_alloc <= ++commit_graft_nr) {
175 commit_graft_alloc = alloc_nr(commit_graft_alloc);
176 commit_graft = xrealloc(commit_graft,
177 sizeof(*commit_graft) *
178 commit_graft_alloc);
179 }
180 if (i < commit_graft_nr)
181 memmove(commit_graft + i + 1,
182 commit_graft + i,
183 (commit_graft_nr - i - 1) *
184 sizeof(*commit_graft));
185 commit_graft[i] = graft;
186 }
187 fclose(fp);
188}
189
190static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
191{
192 int pos;
193 if (!commit_graft)
194 prepare_commit_graft();
195 pos = commit_graft_pos(sha1);
196 if (pos < 0)
197 return NULL;
198 return commit_graft[pos];
199}
200
bd2c39f5 201int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
175785e5 202{
f7cc77d7 203 char *bufptr = buffer;
175785e5 204 unsigned char parent[20];
6c88be16 205 struct commit_list **pptr;
5da5c8f4 206 struct commit_graft *graft;
27dedf0c 207 unsigned n_refs = 0;
bd2c39f5 208
175785e5
DB
209 if (item->object.parsed)
210 return 0;
211 item->object.parsed = 1;
f7cc77d7
LT
212 if (memcmp(bufptr, "tree ", 5))
213 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
214 if (get_sha1_hex(bufptr + 5, parent) < 0)
215 return error("bad tree pointer in commit %s\n", sha1_to_hex(item->object.sha1));
175785e5 216 item->tree = lookup_tree(parent);
235ac407 217 if (item->tree)
27dedf0c 218 n_refs++;
175785e5 219 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
6c88be16 220 pptr = &item->parents;
5da5c8f4
JH
221
222 graft = lookup_commit_graft(item->object.sha1);
f7cc77d7
LT
223 while (!memcmp(bufptr, "parent ", 7)) {
224 struct commit *new_parent;
225
226 if (get_sha1_hex(bufptr + 7, parent) || bufptr[47] != '\n')
227 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
5da5c8f4
JH
228 bufptr += 48;
229 if (graft)
230 continue;
f7cc77d7 231 new_parent = lookup_commit(parent);
235ac407 232 if (new_parent) {
6c88be16 233 pptr = &commit_list_insert(new_parent, pptr)->next;
27dedf0c 234 n_refs++;
235ac407 235 }
5da5c8f4
JH
236 }
237 if (graft) {
238 int i;
239 struct commit *new_parent;
240 for (i = 0; i < graft->nr_parent; i++) {
241 new_parent = lookup_commit(graft->parent[i]);
242 if (!new_parent)
243 continue;
244 pptr = &commit_list_insert(new_parent, pptr)->next;
27dedf0c 245 n_refs++;
5da5c8f4 246 }
175785e5
DB
247 }
248 item->date = parse_commit_date(bufptr);
27dedf0c
JH
249
250 if (track_object_refs) {
251 unsigned i = 0;
252 struct commit_list *p;
253 struct object_refs *refs = alloc_object_refs(n_refs);
254 if (item->tree)
255 refs->ref[i++] = &item->tree->object;
256 for (p = item->parents; p; p = p->next)
257 refs->ref[i++] = &p->item->object;
258 set_object_refs(&item->object, refs);
259 }
260
175785e5
DB
261 return 0;
262}
263
bd2c39f5
NP
264int parse_commit(struct commit *item)
265{
266 char type[20];
267 void *buffer;
268 unsigned long size;
269 int ret;
270
271 if (item->object.parsed)
272 return 0;
273 buffer = read_sha1_file(item->object.sha1, type, &size);
274 if (!buffer)
275 return error("Could not read %s",
276 sha1_to_hex(item->object.sha1));
277 if (strcmp(type, commit_type)) {
278 free(buffer);
279 return error("Object %s not a commit",
280 sha1_to_hex(item->object.sha1));
281 }
282 ret = parse_commit_buffer(item, buffer, size);
60ab26de 283 if (save_commit_buffer && !ret) {
3ff1fbbb
LT
284 item->buffer = buffer;
285 return 0;
286 }
bd2c39f5
NP
287 free(buffer);
288 return ret;
289}
290
ac5155ef 291struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
dd97f850 292{
812666c8 293 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
dd97f850
DB
294 new_list->item = item;
295 new_list->next = *list_p;
296 *list_p = new_list;
ac5155ef 297 return new_list;
dd97f850
DB
298}
299
175785e5
DB
300void free_commit_list(struct commit_list *list)
301{
302 while (list) {
303 struct commit_list *temp = list;
304 list = temp->next;
305 free(temp);
306 }
307}
dd97f850 308
f755494c 309struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
dd97f850
DB
310{
311 struct commit_list **pp = list;
312 struct commit_list *p;
313 while ((p = *pp) != NULL) {
314 if (p->item->date < item->date) {
315 break;
316 }
317 pp = &p->next;
318 }
f755494c 319 return commit_list_insert(item, pp);
dd97f850
DB
320}
321
322
323void sort_by_date(struct commit_list **list)
324{
325 struct commit_list *ret = NULL;
326 while (*list) {
f755494c 327 insert_by_date((*list)->item, &ret);
dd97f850
DB
328 *list = (*list)->next;
329 }
330 *list = ret;
331}
332
58e28af6
DB
333struct commit *pop_most_recent_commit(struct commit_list **list,
334 unsigned int mark)
dd97f850
DB
335{
336 struct commit *ret = (*list)->item;
337 struct commit_list *parents = ret->parents;
338 struct commit_list *old = *list;
339
340 *list = (*list)->next;
341 free(old);
342
343 while (parents) {
4056c091 344 struct commit *commit = parents->item;
58e28af6
DB
345 parse_commit(commit);
346 if (!(commit->object.flags & mark)) {
347 commit->object.flags |= mark;
f755494c 348 insert_by_date(commit, list);
4056c091 349 }
dd97f850
DB
350 parents = parents->next;
351 }
352 return ret;
353}
e3bc7a3b 354
f8f9c73c
JH
355void clear_commit_marks(struct commit *commit, unsigned int mark)
356{
357 struct commit_list *parents;
358
359 parents = commit->parents;
360 commit->object.flags &= ~mark;
361 while (parents) {
181dc776
JH
362 struct commit *parent = parents->item;
363 if (parent && parent->object.parsed &&
364 (parent->object.flags & mark))
365 clear_commit_marks(parent, mark);
f8f9c73c
JH
366 parents = parents->next;
367 }
368}
369
e3bc7a3b
LT
370/*
371 * Generic support for pretty-printing the header
372 */
373static int get_one_line(const char *msg, unsigned long len)
374{
375 int ret = 0;
376
377 while (len--) {
378 char c = *msg++;
379 ret++;
380 if (c == '\n')
381 break;
382 if (!c)
383 return 0;
384 }
385 return ret;
386}
387
9b66ec04 388static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const char *line)
e3bc7a3b
LT
389{
390 char *date;
5de36bfe 391 int namelen;
e3bc7a3b 392 unsigned long time;
000182ea 393 int tz, ret;
ff56fe1c 394 const char *filler = " ";
e3bc7a3b 395
d87449c5
JH
396 if (fmt == CMIT_FMT_ONELINE)
397 return 0;
e3bc7a3b
LT
398 date = strchr(line, '>');
399 if (!date)
400 return 0;
401 namelen = ++date - line;
402 time = strtoul(date, &date, 10);
403 tz = strtol(date, NULL, 10);
404
ff56fe1c
JH
405 ret = sprintf(buf, "%s: %.*s%.*s\n", what,
406 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
407 filler, namelen, line);
408 switch (fmt) {
409 case CMIT_FMT_MEDIUM:
000182ea 410 ret += sprintf(buf + ret, "Date: %s\n", show_date(time, tz));
ff56fe1c
JH
411 break;
412 case CMIT_FMT_FULLER:
413 ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
414 break;
415 default:
416 /* notin' */
417 break;
418 }
000182ea
LT
419 return ret;
420}
421
422static int is_empty_line(const char *line, int len)
423{
424 while (len && isspace(line[len-1]))
425 len--;
426 return !len;
e3bc7a3b
LT
427}
428
f2d42275 429static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
28342a5d 430{
f2d42275
JH
431 struct commit_list *parent = commit->parents;
432 int offset;
d87449c5 433
f2d42275
JH
434 if ((fmt == CMIT_FMT_ONELINE) || !parent || !parent->next)
435 return 0;
436
437 offset = sprintf(buf, "Merge:");
438
439 while (parent) {
440 struct commit *p = parent->item;
441 parent = parent->next;
442
443 offset += sprintf(buf + offset,
444 abbrev ? " %s..." : " %s",
445 abbrev
446 ? find_unique_abbrev(p->object.sha1, abbrev)
447 : sha1_to_hex(p->object.sha1));
28342a5d 448 }
f2d42275 449 buf[offset++] = '\n';
28342a5d
LT
450 return offset;
451}
452
3815f423 453unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit, unsigned long len, char *buf, unsigned long space, int abbrev)
e3bc7a3b 454{
000182ea 455 int hdr = 1, body = 0;
e3bc7a3b 456 unsigned long offset = 0;
d87449c5 457 int indent = (fmt == CMIT_FMT_ONELINE) ? 0 : 4;
f2d42275 458 int parents_shown = 0;
3815f423 459 const char *msg = commit->buffer;
e3bc7a3b
LT
460
461 for (;;) {
462 const char *line = msg;
463 int linelen = get_one_line(msg, len);
464
465 if (!linelen)
466 break;
467
468 /*
469 * We want some slop for indentation and a possible
470 * final "...". Thus the "+ 20".
471 */
472 if (offset + linelen + 20 > space) {
473 memcpy(buf + offset, " ...\n", 8);
474 offset += 8;
475 break;
476 }
477
478 msg += linelen;
479 len -= linelen;
e3bc7a3b 480 if (hdr) {
000182ea
LT
481 if (linelen == 1) {
482 hdr = 0;
d87449c5
JH
483 if (fmt != CMIT_FMT_ONELINE)
484 buf[offset++] = '\n';
000182ea
LT
485 continue;
486 }
487 if (fmt == CMIT_FMT_RAW) {
488 memcpy(buf + offset, line, linelen);
489 offset += linelen;
490 continue;
491 }
28342a5d
LT
492 if (!memcmp(line, "parent ", 7)) {
493 if (linelen != 48)
494 die("bad parent line in commit");
f2d42275 495 continue;
28342a5d 496 }
ff56fe1c 497
f2d42275
JH
498 if (!parents_shown) {
499 offset += add_merge_info(fmt, buf + offset,
500 commit, abbrev);
501 parents_shown = 1;
502 continue;
503 }
ff56fe1c
JH
504 /*
505 * MEDIUM == DEFAULT shows only author with dates.
506 * FULL shows both authors but not dates.
507 * FULLER shows both authors and dates.
508 */
e3bc7a3b 509 if (!memcmp(line, "author ", 7))
ff56fe1c
JH
510 offset += add_user_info("Author", fmt,
511 buf + offset,
512 line + 7);
513 if (!memcmp(line, "committer ", 10) &&
514 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
515 offset += add_user_info("Commit", fmt,
516 buf + offset,
517 line + 10);
e3bc7a3b
LT
518 continue;
519 }
000182ea
LT
520
521 if (is_empty_line(line, linelen)) {
522 if (!body)
523 continue;
524 if (fmt == CMIT_FMT_SHORT)
525 break;
526 } else {
527 body = 1;
528 }
d87449c5
JH
529
530 memset(buf + offset, ' ', indent);
531 memcpy(buf + offset + indent, line, linelen);
532 offset += linelen + indent;
533 if (fmt == CMIT_FMT_ONELINE)
534 break;
535 }
536 if (fmt == CMIT_FMT_ONELINE) {
537 /* We do not want the terminating newline */
538 if (buf[offset - 1] == '\n')
539 offset--;
540 }
541 else {
542 /* Make sure there is an EOLN */
543 if (buf[offset - 1] != '\n')
544 buf[offset++] = '\n';
e3bc7a3b 545 }
e3bc7a3b
LT
546 buf[offset] = '\0';
547 return offset;
548}
a3437b8c
JS
549
550struct commit *pop_commit(struct commit_list **stack)
551{
552 struct commit_list *top = *stack;
553 struct commit *item = top ? top->item : NULL;
554
555 if (top) {
556 *stack = top->next;
557 free(top);
558 }
559 return item;
560}
561
562int count_parents(struct commit * commit)
563{
564 int count = 0;
565 struct commit_list * parents = commit->parents;
566 for (count=0;parents; parents=parents->next,count++)
567 ;
568 return count;
569}
570
ab580ace
JS
571/*
572 * Performs an in-place topological sort on the list supplied.
573 */
574void sort_in_topological_order(struct commit_list ** list)
575{
576 struct commit_list * next = *list;
2ed02887 577 struct commit_list * work = NULL, **insert;
ab580ace
JS
578 struct commit_list ** pptr = list;
579 struct sort_node * nodes;
580 struct sort_node * next_nodes;
581 int count = 0;
582
583 /* determine the size of the list */
584 while (next) {
585 next = next->next;
586 count++;
587 }
7d6fb370
EW
588
589 if (!count)
590 return;
ab580ace
JS
591 /* allocate an array to help sort the list */
592 nodes = xcalloc(count, sizeof(*nodes));
593 /* link the list to the array */
594 next_nodes = nodes;
595 next=*list;
596 while (next) {
597 next_nodes->list_item = next;
598 next->item->object.util = next_nodes;
599 next_nodes++;
600 next = next->next;
601 }
602 /* update the indegree */
603 next=*list;
604 while (next) {
605 struct commit_list * parents = next->item->parents;
606 while (parents) {
607 struct commit * parent=parents->item;
608 struct sort_node * pn = (struct sort_node *)parent->object.util;
609
610 if (pn)
611 pn->indegree++;
612 parents=parents->next;
613 }
614 next=next->next;
615 }
616 /*
617 * find the tips
618 *
619 * tips are nodes not reachable from any other node in the list
620 *
621 * the tips serve as a starting set for the work queue.
622 */
623 next=*list;
2ed02887 624 insert = &work;
ab580ace
JS
625 while (next) {
626 struct sort_node * node = (struct sort_node *)next->item->object.util;
627
628 if (node->indegree == 0) {
2ed02887 629 insert = &commit_list_insert(next->item, insert)->next;
ab580ace
JS
630 }
631 next=next->next;
632 }
633 /* process the list in topological order */
634 while (work) {
635 struct commit * work_item = pop_commit(&work);
636 struct sort_node * work_node = (struct sort_node *)work_item->object.util;
637 struct commit_list * parents = work_item->parents;
638
639 while (parents) {
640 struct commit * parent=parents->item;
641 struct sort_node * pn = (struct sort_node *)parent->object.util;
642
643 if (pn) {
644 /*
645 * parents are only enqueued for emission
646 * when all their children have been emitted thereby
647 * guaranteeing topological order.
648 */
649 pn->indegree--;
650 if (!pn->indegree)
651 commit_list_insert(parent, &work);
652 }
653 parents=parents->next;
654 }
655 /*
656 * work_item is a commit all of whose children
657 * have already been emitted. we can emit it now.
658 */
659 *pptr = work_node->list_item;
660 pptr = &(*pptr)->next;
661 *pptr = NULL;
662 work_item->object.util = NULL;
663 }
664 free(nodes);
665}