df4bc0775a5042a353cb37228ff66210f35ed97b
1#include "cache.h"
2#include "tag.h"
3#include "commit.h"
4#include "utf8.h"
5int save_commit_buffer = 1;
7struct sort_node
9{
10 /*
11 * the number of children of the associated commit
12 * that also occur in the list being sorted.
13 */
14 unsigned int indegree;
15 /*
17 * reference to original list item that we will re-use
18 * on output.
19 */
20 struct commit_list * list_item;
21};
23const char *commit_type = "commit";
25struct cmt_fmt_map {
27 const char *n;
28 size_t cmp_len;
29 enum cmit_fmt v;
30} cmt_fmts[] = {
31 { "raw", 1, CMIT_FMT_RAW },
32 { "medium", 1, CMIT_FMT_MEDIUM },
33 { "short", 1, CMIT_FMT_SHORT },
34 { "email", 1, CMIT_FMT_EMAIL },
35 { "full", 5, CMIT_FMT_FULL },
36 { "fuller", 5, CMIT_FMT_FULLER },
37 { "oneline", 1, CMIT_FMT_ONELINE },
38};
39enum cmit_fmt get_commit_format(const char *arg)
41{
42 int i;
43 if (!arg || !*arg)
45 return CMIT_FMT_DEFAULT;
46 if (*arg == '=')
47 arg++;
48 for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
49 if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len))
50 return cmt_fmts[i].v;
51 }
52 die("invalid --pretty format: %s", arg);
54}
55static struct commit *check_commit(struct object *obj,
57 const unsigned char *sha1,
58 int quiet)
59{
60 if (obj->type != OBJ_COMMIT) {
61 if (!quiet)
62 error("Object %s is a %s, not a commit",
63 sha1_to_hex(sha1), typename(obj->type));
64 return NULL;
65 }
66 return (struct commit *) obj;
67}
68struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
70 int quiet)
71{
72 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
73 if (!obj)
75 return NULL;
76 return check_commit(obj, sha1, quiet);
77}
78struct commit *lookup_commit_reference(const unsigned char *sha1)
80{
81 return lookup_commit_reference_gently(sha1, 0);
82}
83struct commit *lookup_commit(const unsigned char *sha1)
85{
86 struct object *obj = lookup_object(sha1);
87 if (!obj) {
88 struct commit *ret = alloc_commit_node();
89 created_object(sha1, &ret->object);
90 ret->object.type = OBJ_COMMIT;
91 return ret;
92 }
93 if (!obj->type)
94 obj->type = OBJ_COMMIT;
95 return check_commit(obj, sha1, 0);
96}
97static unsigned long parse_commit_date(const char *buf)
99{
100 unsigned long date;
101 if (memcmp(buf, "author", 6))
103 return 0;
104 while (*buf++ != '\n')
105 /* nada */;
106 if (memcmp(buf, "committer", 9))
107 return 0;
108 while (*buf++ != '>')
109 /* nada */;
110 date = strtoul(buf, NULL, 10);
111 if (date == ULONG_MAX)
112 date = 0;
113 return date;
114}
115static struct commit_graft **commit_graft;
117static int commit_graft_alloc, commit_graft_nr;
118static int commit_graft_pos(const unsigned char *sha1)
120{
121 int lo, hi;
122 lo = 0;
123 hi = commit_graft_nr;
124 while (lo < hi) {
125 int mi = (lo + hi) / 2;
126 struct commit_graft *graft = commit_graft[mi];
127 int cmp = hashcmp(sha1, graft->sha1);
128 if (!cmp)
129 return mi;
130 if (cmp < 0)
131 hi = mi;
132 else
133 lo = mi + 1;
134 }
135 return -lo - 1;
136}
137int register_commit_graft(struct commit_graft *graft, int ignore_dups)
139{
140 int pos = commit_graft_pos(graft->sha1);
141
142 if (0 <= pos) {
143 if (ignore_dups)
144 free(graft);
145 else {
146 free(commit_graft[pos]);
147 commit_graft[pos] = graft;
148 }
149 return 1;
150 }
151 pos = -pos - 1;
152 if (commit_graft_alloc <= ++commit_graft_nr) {
153 commit_graft_alloc = alloc_nr(commit_graft_alloc);
154 commit_graft = xrealloc(commit_graft,
155 sizeof(*commit_graft) *
156 commit_graft_alloc);
157 }
158 if (pos < commit_graft_nr)
159 memmove(commit_graft + pos + 1,
160 commit_graft + pos,
161 (commit_graft_nr - pos - 1) *
162 sizeof(*commit_graft));
163 commit_graft[pos] = graft;
164 return 0;
165}
166struct commit_graft *read_graft_line(char *buf, int len)
168{
169 /* The format is just "Commit Parent1 Parent2 ...\n" */
170 int i;
171 struct commit_graft *graft = NULL;
172 if (buf[len-1] == '\n')
174 buf[--len] = 0;
175 if (buf[0] == '#' || buf[0] == '\0')
176 return NULL;
177 if ((len + 1) % 41) {
178 bad_graft_data:
179 error("bad graft data: %s", buf);
180 free(graft);
181 return NULL;
182 }
183 i = (len + 1) / 41 - 1;
184 graft = xmalloc(sizeof(*graft) + 20 * i);
185 graft->nr_parent = i;
186 if (get_sha1_hex(buf, graft->sha1))
187 goto bad_graft_data;
188 for (i = 40; i < len; i += 41) {
189 if (buf[i] != ' ')
190 goto bad_graft_data;
191 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
192 goto bad_graft_data;
193 }
194 return graft;
195}
196int read_graft_file(const char *graft_file)
198{
199 FILE *fp = fopen(graft_file, "r");
200 char buf[1024];
201 if (!fp)
202 return -1;
203 while (fgets(buf, sizeof(buf), fp)) {
204 /* The format is just "Commit Parent1 Parent2 ...\n" */
205 int len = strlen(buf);
206 struct commit_graft *graft = read_graft_line(buf, len);
207 if (!graft)
208 continue;
209 if (register_commit_graft(graft, 1))
210 error("duplicate graft data: %s", buf);
211 }
212 fclose(fp);
213 return 0;
214}
215static void prepare_commit_graft(void)
217{
218 static int commit_graft_prepared;
219 char *graft_file;
220 if (commit_graft_prepared)
222 return;
223 graft_file = get_graft_file();
224 read_graft_file(graft_file);
225 commit_graft_prepared = 1;
226}
227static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
229{
230 int pos;
231 prepare_commit_graft();
232 pos = commit_graft_pos(sha1);
233 if (pos < 0)
234 return NULL;
235 return commit_graft[pos];
236}
237int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
239{
240 char *tail = buffer;
241 char *bufptr = buffer;
242 unsigned char parent[20];
243 struct commit_list **pptr;
244 struct commit_graft *graft;
245 unsigned n_refs = 0;
246 if (item->object.parsed)
248 return 0;
249 item->object.parsed = 1;
250 tail += size;
251 if (tail <= bufptr + 5 || memcmp(bufptr, "tree ", 5))
252 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
253 if (tail <= bufptr + 45 || get_sha1_hex(bufptr + 5, parent) < 0)
254 return error("bad tree pointer in commit %s",
255 sha1_to_hex(item->object.sha1));
256 item->tree = lookup_tree(parent);
257 if (item->tree)
258 n_refs++;
259 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
260 pptr = &item->parents;
261 graft = lookup_commit_graft(item->object.sha1);
263 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
264 struct commit *new_parent;
265 if (tail <= bufptr + 48 ||
267 get_sha1_hex(bufptr + 7, parent) ||
268 bufptr[47] != '\n')
269 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
270 bufptr += 48;
271 if (graft)
272 continue;
273 new_parent = lookup_commit(parent);
274 if (new_parent) {
275 pptr = &commit_list_insert(new_parent, pptr)->next;
276 n_refs++;
277 }
278 }
279 if (graft) {
280 int i;
281 struct commit *new_parent;
282 for (i = 0; i < graft->nr_parent; i++) {
283 new_parent = lookup_commit(graft->parent[i]);
284 if (!new_parent)
285 continue;
286 pptr = &commit_list_insert(new_parent, pptr)->next;
287 n_refs++;
288 }
289 }
290 item->date = parse_commit_date(bufptr);
291 if (track_object_refs) {
293 unsigned i = 0;
294 struct commit_list *p;
295 struct object_refs *refs = alloc_object_refs(n_refs);
296 if (item->tree)
297 refs->ref[i++] = &item->tree->object;
298 for (p = item->parents; p; p = p->next)
299 refs->ref[i++] = &p->item->object;
300 set_object_refs(&item->object, refs);
301 }
302 return 0;
304}
305int parse_commit(struct commit *item)
307{
308 char type[20];
309 void *buffer;
310 unsigned long size;
311 int ret;
312 if (item->object.parsed)
314 return 0;
315 buffer = read_sha1_file(item->object.sha1, type, &size);
316 if (!buffer)
317 return error("Could not read %s",
318 sha1_to_hex(item->object.sha1));
319 if (strcmp(type, commit_type)) {
320 free(buffer);
321 return error("Object %s not a commit",
322 sha1_to_hex(item->object.sha1));
323 }
324 ret = parse_commit_buffer(item, buffer, size);
325 if (save_commit_buffer && !ret) {
326 item->buffer = buffer;
327 return 0;
328 }
329 free(buffer);
330 return ret;
331}
332struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
334{
335 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
336 new_list->item = item;
337 new_list->next = *list_p;
338 *list_p = new_list;
339 return new_list;
340}
341void free_commit_list(struct commit_list *list)
343{
344 while (list) {
345 struct commit_list *temp = list;
346 list = temp->next;
347 free(temp);
348 }
349}
350struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
352{
353 struct commit_list **pp = list;
354 struct commit_list *p;
355 while ((p = *pp) != NULL) {
356 if (p->item->date < item->date) {
357 break;
358 }
359 pp = &p->next;
360 }
361 return commit_list_insert(item, pp);
362}
363
365void sort_by_date(struct commit_list **list)
366{
367 struct commit_list *ret = NULL;
368 while (*list) {
369 insert_by_date((*list)->item, &ret);
370 *list = (*list)->next;
371 }
372 *list = ret;
373}
374struct commit *pop_most_recent_commit(struct commit_list **list,
376 unsigned int mark)
377{
378 struct commit *ret = (*list)->item;
379 struct commit_list *parents = ret->parents;
380 struct commit_list *old = *list;
381 *list = (*list)->next;
383 free(old);
384 while (parents) {
386 struct commit *commit = parents->item;
387 parse_commit(commit);
388 if (!(commit->object.flags & mark)) {
389 commit->object.flags |= mark;
390 insert_by_date(commit, list);
391 }
392 parents = parents->next;
393 }
394 return ret;
395}
396void clear_commit_marks(struct commit *commit, unsigned int mark)
398{
399 struct commit_list *parents;
400 commit->object.flags &= ~mark;
402 parents = commit->parents;
403 while (parents) {
404 struct commit *parent = parents->item;
405 /* Have we already cleared this? */
407 if (mark & parent->object.flags)
408 clear_commit_marks(parent, mark);
409 parents = parents->next;
410 }
411}
412/*
414 * Generic support for pretty-printing the header
415 */
416static int get_one_line(const char *msg, unsigned long len)
417{
418 int ret = 0;
419 while (len--) {
421 char c = *msg++;
422 if (!c)
423 break;
424 ret++;
425 if (c == '\n')
426 break;
427 }
428 return ret;
429}
430static int is_rfc2047_special(char ch)
432{
433 return ((ch & 0x80) || (ch == '=') || (ch == '?') || (ch == '_'));
434}
435static int add_rfc2047(char *buf, const char *line, int len)
437{
438 char *bp = buf;
439 int i, needquote;
440 static const char q_utf8[] = "=?utf-8?q?";
441 for (i = needquote = 0; !needquote && i < len; i++) {
443 unsigned ch = line[i];
444 if (ch & 0x80)
445 needquote++;
446 if ((i + 1 < len) &&
447 (ch == '=' && line[i+1] == '?'))
448 needquote++;
449 }
450 if (!needquote)
451 return sprintf(buf, "%.*s", len, line);
452 memcpy(bp, q_utf8, sizeof(q_utf8)-1);
454 bp += sizeof(q_utf8)-1;
455 for (i = 0; i < len; i++) {
456 unsigned ch = line[i] & 0xFF;
457 if (is_rfc2047_special(ch)) {
458 sprintf(bp, "=%02X", ch);
459 bp += 3;
460 }
461 else if (ch == ' ')
462 *bp++ = '_';
463 else
464 *bp++ = ch;
465 }
466 memcpy(bp, "?=", 2);
467 bp += 2;
468 return bp - buf;
469}
470static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
472 const char *line, int relative_date)
473{
474 char *date;
475 int namelen;
476 unsigned long time;
477 int tz, ret;
478 const char *filler = " ";
479 if (fmt == CMIT_FMT_ONELINE)
481 return 0;
482 date = strchr(line, '>');
483 if (!date)
484 return 0;
485 namelen = ++date - line;
486 time = strtoul(date, &date, 10);
487 tz = strtol(date, NULL, 10);
488 if (fmt == CMIT_FMT_EMAIL) {
490 char *name_tail = strchr(line, '<');
491 int display_name_length;
492 if (!name_tail)
493 return 0;
494 while (line < name_tail && isspace(name_tail[-1]))
495 name_tail--;
496 display_name_length = name_tail - line;
497 filler = "";
498 strcpy(buf, "From: ");
499 ret = strlen(buf);
500 ret += add_rfc2047(buf + ret, line, display_name_length);
501 memcpy(buf + ret, name_tail, namelen - display_name_length);
502 ret += namelen - display_name_length;
503 buf[ret++] = '\n';
504 }
505 else {
506 ret = sprintf(buf, "%s: %.*s%.*s\n", what,
507 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
508 filler, namelen, line);
509 }
510 switch (fmt) {
511 case CMIT_FMT_MEDIUM:
512 ret += sprintf(buf + ret, "Date: %s\n",
513 show_date(time, tz, relative_date));
514 break;
515 case CMIT_FMT_EMAIL:
516 ret += sprintf(buf + ret, "Date: %s\n",
517 show_rfc2822_date(time, tz));
518 break;
519 case CMIT_FMT_FULLER:
520 ret += sprintf(buf + ret, "%sDate: %s\n", what,
521 show_date(time, tz, relative_date));
522 break;
523 default:
524 /* notin' */
525 break;
526 }
527 return ret;
528}
529static int is_empty_line(const char *line, int *len_p)
531{
532 int len = *len_p;
533 while (len && isspace(line[len-1]))
534 len--;
535 *len_p = len;
536 return !len;
537}
538static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
540{
541 struct commit_list *parent = commit->parents;
542 int offset;
543 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
545 !parent || !parent->next)
546 return 0;
547 offset = sprintf(buf, "Merge:");
549 while (parent) {
551 struct commit *p = parent->item;
552 const char *hex = NULL;
553 const char *dots;
554 if (abbrev)
555 hex = find_unique_abbrev(p->object.sha1, abbrev);
556 if (!hex)
557 hex = sha1_to_hex(p->object.sha1);
558 dots = (abbrev && strlen(hex) != 40) ? "..." : "";
559 parent = parent->next;
560 offset += sprintf(buf + offset, " %s%s", hex, dots);
562 }
563 buf[offset++] = '\n';
564 return offset;
565}
566static char *get_header(const struct commit *commit, const char *key)
568{
569 int key_len = strlen(key);
570 const char *line = commit->buffer;
571 for (;;) {
573 const char *eol = strchr(line, '\n'), *next;
574 if (line == eol)
576 return NULL;
577 if (!eol) {
578 eol = line + strlen(line);
579 next = NULL;
580 } else
581 next = eol + 1;
582 if (!strncmp(line, key, key_len) && line[key_len] == ' ') {
583 int len = eol - line - key_len;
584 char *ret = xmalloc(len);
585 memcpy(ret, line + key_len + 1, len - 1);
586 ret[len - 1] = '\0';
587 return ret;
588 }
589 line = next;
590 }
591}
592static char *logmsg_reencode(const struct commit *commit)
594{
595 char *encoding = get_header(commit, "encoding");
596 char *out;
597 if (!encoding || !strcmp(encoding, git_commit_encoding))
599 return NULL;
600 out = reencode_string(commit->buffer, git_commit_encoding, encoding);
601 free(encoding);
602 if (!out)
603 return NULL;
604 return out;
605}
606unsigned long pretty_print_commit(enum cmit_fmt fmt,
608 const struct commit *commit,
609 unsigned long len,
610 char *buf, unsigned long space,
611 int abbrev, const char *subject,
612 const char *after_subject,
613 int relative_date)
614{
615 int hdr = 1, body = 0;
616 unsigned long offset = 0;
617 int indent = 4;
618 int parents_shown = 0;
619 const char *msg = commit->buffer;
620 int plain_non_ascii = 0;
621 char *reencoded = NULL;
622 if (*git_commit_encoding) {
624 reencoded = logmsg_reencode(commit);
625 if (reencoded) {
626 msg = reencoded;
627 len = strlen(msg);
628 }
629 }
630 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
632 indent = 0;
633 /* After-subject is used to pass in Content-Type: multipart
635 * MIME header; in that case we do not have to do the
636 * plaintext content type even if the commit message has
637 * non 7-bit ASCII character. Otherwise, check if we need
638 * to say this is not a 7-bit ASCII.
639 */
640 if (fmt == CMIT_FMT_EMAIL && !after_subject) {
641 int i, ch, in_body;
642 for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
644 if (!in_body) {
645 /* author could be non 7-bit ASCII but
646 * the log may so; skip over the
647 * header part first.
648 */
649 if (ch == '\n' &&
650 i + 1 < len && msg[i+1] == '\n')
651 in_body = 1;
652 }
653 else if (ch & 0x80) {
654 plain_non_ascii = 1;
655 break;
656 }
657 }
658 }
659 for (;;) {
661 const char *line = msg;
662 int linelen = get_one_line(msg, len);
663 if (!linelen)
665 break;
666 /*
668 * We want some slop for indentation and a possible
669 * final "...". Thus the "+ 20".
670 */
671 if (offset + linelen + 20 > space) {
672 memcpy(buf + offset, " ...\n", 8);
673 offset += 8;
674 break;
675 }
676 msg += linelen;
678 len -= linelen;
679 if (hdr) {
680 if (linelen == 1) {
681 hdr = 0;
682 if ((fmt != CMIT_FMT_ONELINE) && !subject)
683 buf[offset++] = '\n';
684 continue;
685 }
686 if (fmt == CMIT_FMT_RAW) {
687 memcpy(buf + offset, line, linelen);
688 offset += linelen;
689 continue;
690 }
691 if (!memcmp(line, "parent ", 7)) {
692 if (linelen != 48)
693 die("bad parent line in commit");
694 continue;
695 }
696 if (!parents_shown) {
698 offset += add_merge_info(fmt, buf + offset,
699 commit, abbrev);
700 parents_shown = 1;
701 continue;
702 }
703 /*
704 * MEDIUM == DEFAULT shows only author with dates.
705 * FULL shows both authors but not dates.
706 * FULLER shows both authors and dates.
707 */
708 if (!memcmp(line, "author ", 7))
709 offset += add_user_info("Author", fmt,
710 buf + offset,
711 line + 7,
712 relative_date);
713 if (!memcmp(line, "committer ", 10) &&
714 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
715 offset += add_user_info("Commit", fmt,
716 buf + offset,
717 line + 10,
718 relative_date);
719 continue;
720 }
721 if (!subject)
723 body = 1;
724 if (is_empty_line(line, &linelen)) {
726 if (!body)
727 continue;
728 if (subject)
729 continue;
730 if (fmt == CMIT_FMT_SHORT)
731 break;
732 }
733 if (subject) {
735 int slen = strlen(subject);
736 memcpy(buf + offset, subject, slen);
737 offset += slen;
738 offset += add_rfc2047(buf + offset, line, linelen);
739 }
740 else {
741 memset(buf + offset, ' ', indent);
742 memcpy(buf + offset + indent, line, linelen);
743 offset += linelen + indent;
744 }
745 buf[offset++] = '\n';
746 if (fmt == CMIT_FMT_ONELINE)
747 break;
748 if (subject && plain_non_ascii) {
749 static const char header[] =
750 "Content-Type: text/plain; charset=UTF-8\n"
751 "Content-Transfer-Encoding: 8bit\n";
752 memcpy(buf + offset, header, sizeof(header)-1);
753 offset += sizeof(header)-1;
754 }
755 if (after_subject) {
756 int slen = strlen(after_subject);
757 if (slen > space - offset - 1)
758 slen = space - offset - 1;
759 memcpy(buf + offset, after_subject, slen);
760 offset += slen;
761 after_subject = NULL;
762 }
763 subject = NULL;
764 }
765 while (offset && isspace(buf[offset-1]))
766 offset--;
767 /* Make sure there is an EOLN for the non-oneline case */
768 if (fmt != CMIT_FMT_ONELINE)
769 buf[offset++] = '\n';
770 /*
771 * make sure there is another EOLN to separate the headers from whatever
772 * body the caller appends if we haven't already written a body
773 */
774 if (fmt == CMIT_FMT_EMAIL && !body)
775 buf[offset++] = '\n';
776 buf[offset] = '\0';
777 free(reencoded);
779 return offset;
780}
781struct commit *pop_commit(struct commit_list **stack)
783{
784 struct commit_list *top = *stack;
785 struct commit *item = top ? top->item : NULL;
786 if (top) {
788 *stack = top->next;
789 free(top);
790 }
791 return item;
792}
793int count_parents(struct commit * commit)
795{
796 int count;
797 struct commit_list * parents = commit->parents;
798 for (count = 0; parents; parents = parents->next,count++)
799 ;
800 return count;
801}
802void topo_sort_default_setter(struct commit *c, void *data)
804{
805 c->util = data;
806}
807void *topo_sort_default_getter(struct commit *c)
809{
810 return c->util;
811}
812/*
814 * Performs an in-place topological sort on the list supplied.
815 */
816void sort_in_topological_order(struct commit_list ** list, int lifo)
817{
818 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
819 topo_sort_default_getter);
820}
821void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
823 topo_sort_set_fn_t setter,
824 topo_sort_get_fn_t getter)
825{
826 struct commit_list * next = *list;
827 struct commit_list * work = NULL, **insert;
828 struct commit_list ** pptr = list;
829 struct sort_node * nodes;
830 struct sort_node * next_nodes;
831 int count = 0;
832 /* determine the size of the list */
834 while (next) {
835 next = next->next;
836 count++;
837 }
838
839 if (!count)
840 return;
841 /* allocate an array to help sort the list */
842 nodes = xcalloc(count, sizeof(*nodes));
843 /* link the list to the array */
844 next_nodes = nodes;
845 next=*list;
846 while (next) {
847 next_nodes->list_item = next;
848 setter(next->item, next_nodes);
849 next_nodes++;
850 next = next->next;
851 }
852 /* update the indegree */
853 next=*list;
854 while (next) {
855 struct commit_list * parents = next->item->parents;
856 while (parents) {
857 struct commit * parent=parents->item;
858 struct sort_node * pn = (struct sort_node *) getter(parent);
859 if (pn)
861 pn->indegree++;
862 parents=parents->next;
863 }
864 next=next->next;
865 }
866 /*
867 * find the tips
868 *
869 * tips are nodes not reachable from any other node in the list
870 *
871 * the tips serve as a starting set for the work queue.
872 */
873 next=*list;
874 insert = &work;
875 while (next) {
876 struct sort_node * node = (struct sort_node *) getter(next->item);
877 if (node->indegree == 0) {
879 insert = &commit_list_insert(next->item, insert)->next;
880 }
881 next=next->next;
882 }
883 /* process the list in topological order */
885 if (!lifo)
886 sort_by_date(&work);
887 while (work) {
888 struct commit * work_item = pop_commit(&work);
889 struct sort_node * work_node = (struct sort_node *) getter(work_item);
890 struct commit_list * parents = work_item->parents;
891 while (parents) {
893 struct commit * parent=parents->item;
894 struct sort_node * pn = (struct sort_node *) getter(parent);
895 if (pn) {
897 /*
898 * parents are only enqueued for emission
899 * when all their children have been emitted thereby
900 * guaranteeing topological order.
901 */
902 pn->indegree--;
903 if (!pn->indegree) {
904 if (!lifo)
905 insert_by_date(parent, &work);
906 else
907 commit_list_insert(parent, &work);
908 }
909 }
910 parents=parents->next;
911 }
912 /*
913 * work_item is a commit all of whose children
914 * have already been emitted. we can emit it now.
915 */
916 *pptr = work_node->list_item;
917 pptr = &(*pptr)->next;
918 *pptr = NULL;
919 setter(work_item, NULL);
920 }
921 free(nodes);
922}
923/* merge-rebase stuff */
925/* bits #0..15 in revision.h */
927#define PARENT1 (1u<<16)
928#define PARENT2 (1u<<17)
929#define STALE (1u<<18)
930#define RESULT (1u<<19)
931static struct commit *interesting(struct commit_list *list)
933{
934 while (list) {
935 struct commit *commit = list->item;
936 list = list->next;
937 if (commit->object.flags & STALE)
938 continue;
939 return commit;
940 }
941 return NULL;
942}
943static struct commit_list *merge_bases(struct commit *one, struct commit *two)
945{
946 struct commit_list *list = NULL;
947 struct commit_list *result = NULL;
948 if (one == two)
950 /* We do not mark this even with RESULT so we do not
951 * have to clean it up.
952 */
953 return commit_list_insert(one, &result);
954 parse_commit(one);
956 parse_commit(two);
957 one->object.flags |= PARENT1;
959 two->object.flags |= PARENT2;
960 insert_by_date(one, &list);
961 insert_by_date(two, &list);
962 while (interesting(list)) {
964 struct commit *commit;
965 struct commit_list *parents;
966 struct commit_list *n;
967 int flags;
968 commit = list->item;
970 n = list->next;
971 free(list);
972 list = n;
973 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
975 if (flags == (PARENT1 | PARENT2)) {
976 if (!(commit->object.flags & RESULT)) {
977 commit->object.flags |= RESULT;
978 insert_by_date(commit, &result);
979 }
980 /* Mark parents of a found merge stale */
981 flags |= STALE;
982 }
983 parents = commit->parents;
984 while (parents) {
985 struct commit *p = parents->item;
986 parents = parents->next;
987 if ((p->object.flags & flags) == flags)
988 continue;
989 parse_commit(p);
990 p->object.flags |= flags;
991 insert_by_date(p, &list);
992 }
993 }
994 /* Clean up the result to remove stale ones */
996 list = result; result = NULL;
997 while (list) {
998 struct commit_list *n = list->next;
999 if (!(list->item->object.flags & STALE))
1000 insert_by_date(list->item, &result);
1001 free(list);
1002 list = n;
1003 }
1004 return result;
1005}
1006struct commit_list *get_merge_bases(struct commit *one,
1008 struct commit *two,
1009 int cleanup)
1010{
1011 const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1012 struct commit_list *list;
1013 struct commit **rslt;
1014 struct commit_list *result;
1015 int cnt, i, j;
1016 result = merge_bases(one, two);
1018 if (one == two)
1019 return result;
1020 if (!result || !result->next) {
1021 if (cleanup) {
1022 clear_commit_marks(one, all_flags);
1023 clear_commit_marks(two, all_flags);
1024 }
1025 return result;
1026 }
1027 /* There are more than one */
1029 cnt = 0;
1030 list = result;
1031 while (list) {
1032 list = list->next;
1033 cnt++;
1034 }
1035 rslt = xcalloc(cnt, sizeof(*rslt));
1036 for (list = result, i = 0; list; list = list->next)
1037 rslt[i++] = list->item;
1038 free_commit_list(result);
1039 clear_commit_marks(one, all_flags);
1041 clear_commit_marks(two, all_flags);
1042 for (i = 0; i < cnt - 1; i++) {
1043 for (j = i+1; j < cnt; j++) {
1044 if (!rslt[i] || !rslt[j])
1045 continue;
1046 result = merge_bases(rslt[i], rslt[j]);
1047 clear_commit_marks(rslt[i], all_flags);
1048 clear_commit_marks(rslt[j], all_flags);
1049 for (list = result; list; list = list->next) {
1050 if (rslt[i] == list->item)
1051 rslt[i] = NULL;
1052 if (rslt[j] == list->item)
1053 rslt[j] = NULL;
1054 }
1055 }
1056 }
1057 /* Surviving ones in rslt[] are the independent results */
1059 result = NULL;
1060 for (i = 0; i < cnt; i++) {
1061 if (rslt[i])
1062 insert_by_date(rslt[i], &result);
1063 }
1064 free(rslt);
1065 return result;
1066}