6 #include "interpolate.h"
10 int save_commit_buffer = 1;
15 * the number of children of the associated commit
16 * that also occur in the list being sorted.
18 unsigned int indegree;
21 * reference to original list item that we will re-use
24 struct commit_list * list_item;
28 const char *commit_type = "commit";
35 { "raw", 1, CMIT_FMT_RAW },
36 { "medium", 1, CMIT_FMT_MEDIUM },
37 { "short", 1, CMIT_FMT_SHORT },
38 { "email", 1, CMIT_FMT_EMAIL },
39 { "full", 5, CMIT_FMT_FULL },
40 { "fuller", 5, CMIT_FMT_FULLER },
41 { "oneline", 1, CMIT_FMT_ONELINE },
42 { "format:", 7, CMIT_FMT_USERFORMAT},
45 static char *user_format;
47 enum cmit_fmt get_commit_format(const char *arg)
52 return CMIT_FMT_DEFAULT;
55 if (!prefixcmp(arg, "format:")) {
58 user_format = xstrdup(arg + 7);
59 return CMIT_FMT_USERFORMAT;
61 for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
62 if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len) &&
63 !strncmp(arg, cmt_fmts[i].n, strlen(arg)))
67 die("invalid --pretty format: %s", arg);
70 static struct commit *check_commit(struct object *obj,
71 const unsigned char *sha1,
74 if (obj->type != OBJ_COMMIT) {
76 error("Object %s is a %s, not a commit",
77 sha1_to_hex(sha1), typename(obj->type));
80 return (struct commit *) obj;
83 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
86 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
90 return check_commit(obj, sha1, quiet);
93 struct commit *lookup_commit_reference(const unsigned char *sha1)
95 return lookup_commit_reference_gently(sha1, 0);
98 struct commit *lookup_commit(const unsigned char *sha1)
100 struct object *obj = lookup_object(sha1);
102 return create_object(sha1, OBJ_COMMIT, alloc_commit_node());
104 obj->type = OBJ_COMMIT;
105 return check_commit(obj, sha1, 0);
108 static unsigned long parse_commit_date(const char *buf)
112 if (memcmp(buf, "author", 6))
114 while (*buf++ != '\n')
116 if (memcmp(buf, "committer", 9))
118 while (*buf++ != '>')
120 date = strtoul(buf, NULL, 10);
121 if (date == ULONG_MAX)
126 static struct commit_graft **commit_graft;
127 static int commit_graft_alloc, commit_graft_nr;
129 static int commit_graft_pos(const unsigned char *sha1)
133 hi = commit_graft_nr;
135 int mi = (lo + hi) / 2;
136 struct commit_graft *graft = commit_graft[mi];
137 int cmp = hashcmp(sha1, graft->sha1);
148 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
150 int pos = commit_graft_pos(graft->sha1);
156 free(commit_graft[pos]);
157 commit_graft[pos] = graft;
162 if (commit_graft_alloc <= ++commit_graft_nr) {
163 commit_graft_alloc = alloc_nr(commit_graft_alloc);
164 commit_graft = xrealloc(commit_graft,
165 sizeof(*commit_graft) *
168 if (pos < commit_graft_nr)
169 memmove(commit_graft + pos + 1,
171 (commit_graft_nr - pos - 1) *
172 sizeof(*commit_graft));
173 commit_graft[pos] = graft;
177 struct commit_graft *read_graft_line(char *buf, int len)
179 /* The format is just "Commit Parent1 Parent2 ...\n" */
181 struct commit_graft *graft = NULL;
183 if (buf[len-1] == '\n')
185 if (buf[0] == '#' || buf[0] == '\0')
187 if ((len + 1) % 41) {
189 error("bad graft data: %s", buf);
193 i = (len + 1) / 41 - 1;
194 graft = xmalloc(sizeof(*graft) + 20 * i);
195 graft->nr_parent = i;
196 if (get_sha1_hex(buf, graft->sha1))
198 for (i = 40; i < len; i += 41) {
201 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
207 int read_graft_file(const char *graft_file)
209 FILE *fp = fopen(graft_file, "r");
213 while (fgets(buf, sizeof(buf), fp)) {
214 /* The format is just "Commit Parent1 Parent2 ...\n" */
215 int len = strlen(buf);
216 struct commit_graft *graft = read_graft_line(buf, len);
219 if (register_commit_graft(graft, 1))
220 error("duplicate graft data: %s", buf);
226 static void prepare_commit_graft(void)
228 static int commit_graft_prepared;
231 if (commit_graft_prepared)
233 graft_file = get_graft_file();
234 read_graft_file(graft_file);
235 /* make sure shallows are read */
236 is_repository_shallow();
237 commit_graft_prepared = 1;
240 static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
243 prepare_commit_graft();
244 pos = commit_graft_pos(sha1);
247 return commit_graft[pos];
250 int write_shallow_commits(int fd, int use_pack_protocol)
253 for (i = 0; i < commit_graft_nr; i++)
254 if (commit_graft[i]->nr_parent < 0) {
256 sha1_to_hex(commit_graft[i]->sha1);
258 if (use_pack_protocol)
259 packet_write(fd, "shallow %s", hex);
261 if (write_in_full(fd, hex, 40) != 40)
263 if (write_in_full(fd, "\n", 1) != 1)
270 int unregister_shallow(const unsigned char *sha1)
272 int pos = commit_graft_pos(sha1);
275 if (pos + 1 < commit_graft_nr)
276 memcpy(commit_graft + pos, commit_graft + pos + 1,
277 sizeof(struct commit_graft *)
278 * (commit_graft_nr - pos - 1));
283 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
286 char *bufptr = buffer;
287 unsigned char parent[20];
288 struct commit_list **pptr;
289 struct commit_graft *graft;
292 if (item->object.parsed)
294 item->object.parsed = 1;
296 if (tail <= bufptr + 5 || memcmp(bufptr, "tree ", 5))
297 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
298 if (tail <= bufptr + 45 || get_sha1_hex(bufptr + 5, parent) < 0)
299 return error("bad tree pointer in commit %s",
300 sha1_to_hex(item->object.sha1));
301 item->tree = lookup_tree(parent);
304 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
305 pptr = &item->parents;
307 graft = lookup_commit_graft(item->object.sha1);
308 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
309 struct commit *new_parent;
311 if (tail <= bufptr + 48 ||
312 get_sha1_hex(bufptr + 7, parent) ||
314 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
318 new_parent = lookup_commit(parent);
320 pptr = &commit_list_insert(new_parent, pptr)->next;
326 struct commit *new_parent;
327 for (i = 0; i < graft->nr_parent; i++) {
328 new_parent = lookup_commit(graft->parent[i]);
331 pptr = &commit_list_insert(new_parent, pptr)->next;
335 item->date = parse_commit_date(bufptr);
337 if (track_object_refs) {
339 struct commit_list *p;
340 struct object_refs *refs = alloc_object_refs(n_refs);
342 refs->ref[i++] = &item->tree->object;
343 for (p = item->parents; p; p = p->next)
344 refs->ref[i++] = &p->item->object;
345 set_object_refs(&item->object, refs);
351 int parse_commit(struct commit *item)
353 enum object_type type;
358 if (item->object.parsed)
360 buffer = read_sha1_file(item->object.sha1, &type, &size);
362 return error("Could not read %s",
363 sha1_to_hex(item->object.sha1));
364 if (type != OBJ_COMMIT) {
366 return error("Object %s not a commit",
367 sha1_to_hex(item->object.sha1));
369 ret = parse_commit_buffer(item, buffer, size);
370 if (save_commit_buffer && !ret) {
371 item->buffer = buffer;
378 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
380 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
381 new_list->item = item;
382 new_list->next = *list_p;
387 void free_commit_list(struct commit_list *list)
390 struct commit_list *temp = list;
396 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
398 struct commit_list **pp = list;
399 struct commit_list *p;
400 while ((p = *pp) != NULL) {
401 if (p->item->date < item->date) {
406 return commit_list_insert(item, pp);
410 void sort_by_date(struct commit_list **list)
412 struct commit_list *ret = NULL;
414 insert_by_date((*list)->item, &ret);
415 *list = (*list)->next;
420 struct commit *pop_most_recent_commit(struct commit_list **list,
423 struct commit *ret = (*list)->item;
424 struct commit_list *parents = ret->parents;
425 struct commit_list *old = *list;
427 *list = (*list)->next;
431 struct commit *commit = parents->item;
432 parse_commit(commit);
433 if (!(commit->object.flags & mark)) {
434 commit->object.flags |= mark;
435 insert_by_date(commit, list);
437 parents = parents->next;
442 void clear_commit_marks(struct commit *commit, unsigned int mark)
444 struct commit_list *parents;
446 commit->object.flags &= ~mark;
447 parents = commit->parents;
449 struct commit *parent = parents->item;
451 /* Have we already cleared this? */
452 if (mark & parent->object.flags)
453 clear_commit_marks(parent, mark);
454 parents = parents->next;
459 * Generic support for pretty-printing the header
461 static int get_one_line(const char *msg, unsigned long len)
476 /* High bit set, or ISO-2022-INT */
477 static int non_ascii(int ch)
480 return ((ch & 0x80) || (ch == 0x1b));
483 static int is_rfc2047_special(char ch)
485 return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
488 static int add_rfc2047(char *buf, const char *line, int len,
489 const char *encoding)
493 char q_encoding[128];
494 const char *q_encoding_fmt = "=?%s?q?";
496 for (i = needquote = 0; !needquote && i < len; i++) {
501 (ch == '=' && line[i+1] == '?'))
505 return sprintf(buf, "%.*s", len, line);
507 i = snprintf(q_encoding, sizeof(q_encoding), q_encoding_fmt, encoding);
508 if (sizeof(q_encoding) < i)
509 die("Insanely long encoding name %s", encoding);
510 memcpy(bp, q_encoding, i);
512 for (i = 0; i < len; i++) {
513 unsigned ch = line[i] & 0xFF;
514 if (is_rfc2047_special(ch)) {
515 sprintf(bp, "=%02X", ch);
528 static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
529 const char *line, enum date_mode dmode,
530 const char *encoding)
536 const char *filler = " ";
538 if (fmt == CMIT_FMT_ONELINE)
540 date = strchr(line, '>');
543 namelen = ++date - line;
544 time = strtoul(date, &date, 10);
545 tz = strtol(date, NULL, 10);
547 if (fmt == CMIT_FMT_EMAIL) {
548 char *name_tail = strchr(line, '<');
549 int display_name_length;
552 while (line < name_tail && isspace(name_tail[-1]))
554 display_name_length = name_tail - line;
556 strcpy(buf, "From: ");
558 ret += add_rfc2047(buf + ret, line, display_name_length,
560 memcpy(buf + ret, name_tail, namelen - display_name_length);
561 ret += namelen - display_name_length;
565 ret = sprintf(buf, "%s: %.*s%.*s\n", what,
566 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
567 filler, namelen, line);
570 case CMIT_FMT_MEDIUM:
571 ret += sprintf(buf + ret, "Date: %s\n",
572 show_date(time, tz, dmode));
575 ret += sprintf(buf + ret, "Date: %s\n",
576 show_rfc2822_date(time, tz));
578 case CMIT_FMT_FULLER:
579 ret += sprintf(buf + ret, "%sDate: %s\n", what,
580 show_date(time, tz, dmode));
589 static int is_empty_line(const char *line, int *len_p)
592 while (len && isspace(line[len-1]))
598 static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
600 struct commit_list *parent = commit->parents;
603 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
604 !parent || !parent->next)
607 offset = sprintf(buf, "Merge:");
610 struct commit *p = parent->item;
611 const char *hex = NULL;
614 hex = find_unique_abbrev(p->object.sha1, abbrev);
616 hex = sha1_to_hex(p->object.sha1);
617 dots = (abbrev && strlen(hex) != 40) ? "..." : "";
618 parent = parent->next;
620 offset += sprintf(buf + offset, " %s%s", hex, dots);
622 buf[offset++] = '\n';
626 static char *get_header(const struct commit *commit, const char *key)
628 int key_len = strlen(key);
629 const char *line = commit->buffer;
632 const char *eol = strchr(line, '\n'), *next;
637 eol = line + strlen(line);
641 if (!strncmp(line, key, key_len) && line[key_len] == ' ') {
642 int len = eol - line - key_len;
643 char *ret = xmalloc(len);
644 memcpy(ret, line + key_len + 1, len - 1);
652 static char *replace_encoding_header(char *buf, const char *encoding)
654 char *encoding_header = strstr(buf, "\nencoding ");
655 char *header_end = strstr(buf, "\n\n");
656 char *end_of_encoding_header;
657 int encoding_header_pos;
658 int encoding_header_len;
661 int buflen = strlen(buf) + 1;
664 header_end = buf + buflen;
665 if (!encoding_header || encoding_header >= header_end)
668 end_of_encoding_header = strchr(encoding_header, '\n');
669 if (!end_of_encoding_header)
670 return buf; /* should not happen but be defensive */
671 end_of_encoding_header++;
673 encoding_header_len = end_of_encoding_header - encoding_header;
674 encoding_header_pos = encoding_header - buf;
676 if (is_encoding_utf8(encoding)) {
677 /* we have re-coded to UTF-8; drop the header */
678 memmove(encoding_header, end_of_encoding_header,
679 buflen - (encoding_header_pos + encoding_header_len));
682 new_len = strlen(encoding);
683 need_len = new_len + strlen("encoding \n");
684 if (encoding_header_len < need_len) {
685 buf = xrealloc(buf, buflen + (need_len - encoding_header_len));
686 encoding_header = buf + encoding_header_pos;
687 end_of_encoding_header = encoding_header + encoding_header_len;
689 memmove(end_of_encoding_header + (need_len - encoding_header_len),
690 end_of_encoding_header,
691 buflen - (encoding_header_pos + encoding_header_len));
692 memcpy(encoding_header + 9, encoding, strlen(encoding));
693 encoding_header[9 + new_len] = '\n';
697 static char *logmsg_reencode(const struct commit *commit,
698 const char *output_encoding)
700 static const char *utf8 = "utf-8";
701 const char *use_encoding;
705 if (!*output_encoding)
707 encoding = get_header(commit, "encoding");
708 use_encoding = encoding ? encoding : utf8;
709 if (!strcmp(use_encoding, output_encoding))
710 out = xstrdup(commit->buffer);
712 out = reencode_string(commit->buffer,
713 output_encoding, use_encoding);
715 out = replace_encoding_header(out, output_encoding);
721 static void fill_person(struct interp *table, const char *msg, int len)
723 int start, end, tz = 0;
728 for (end = 0; end < len && msg[end] != '<'; end++)
731 while (end > 0 && isspace(msg[end - 1]))
733 table[0].value = xstrndup(msg, end);
739 for (end = start + 1; end < len && msg[end] != '>'; end++)
745 table[1].value = xstrndup(msg + start, end - start);
748 for (start = end + 1; start < len && isspace(msg[start]); start++)
752 date = strtoul(msg + start, &ep, 10);
753 if (msg + start == ep)
756 table[5].value = xstrndup(msg + start, ep - (msg + start));
759 for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
761 if (start + 1 < len) {
762 tz = strtoul(msg + start + 1, NULL, 10);
763 if (msg[start] == '-')
767 interp_set_entry(table, 2, show_date(date, tz, 0));
768 interp_set_entry(table, 3, show_rfc2822_date(date, tz));
769 interp_set_entry(table, 4, show_date(date, tz, 1));
772 static long format_commit_message(const struct commit *commit,
773 const char *msg, char *buf, unsigned long space)
775 struct interp table[] = {
776 { "%H" }, /* commit hash */
777 { "%h" }, /* abbreviated commit hash */
778 { "%T" }, /* tree hash */
779 { "%t" }, /* abbreviated tree hash */
780 { "%P" }, /* parent hashes */
781 { "%p" }, /* abbreviated parent hashes */
782 { "%an" }, /* author name */
783 { "%ae" }, /* author email */
784 { "%ad" }, /* author date */
785 { "%aD" }, /* author date, RFC2822 style */
786 { "%ar" }, /* author date, relative */
787 { "%at" }, /* author date, UNIX timestamp */
788 { "%cn" }, /* committer name */
789 { "%ce" }, /* committer email */
790 { "%cd" }, /* committer date */
791 { "%cD" }, /* committer date, RFC2822 style */
792 { "%cr" }, /* committer date, relative */
793 { "%ct" }, /* committer date, UNIX timestamp */
794 { "%e" }, /* encoding */
795 { "%s" }, /* subject */
797 { "%Cred" }, /* red */
798 { "%Cgreen" }, /* green */
799 { "%Cblue" }, /* blue */
800 { "%Creset" }, /* reset color */
801 { "%n" }, /* newline */
802 { "%m" }, /* left/right/bottom */
805 IHASH = 0, IHASH_ABBREV,
807 IPARENTS, IPARENTS_ABBREV,
808 IAUTHOR_NAME, IAUTHOR_EMAIL,
809 IAUTHOR_DATE, IAUTHOR_DATE_RFC2822, IAUTHOR_DATE_RELATIVE,
811 ICOMMITTER_NAME, ICOMMITTER_EMAIL,
812 ICOMMITTER_DATE, ICOMMITTER_DATE_RFC2822,
813 ICOMMITTER_DATE_RELATIVE, ICOMMITTER_TIMESTAMP,
817 IRED, IGREEN, IBLUE, IRESET_COLOR,
821 struct commit_list *p;
824 enum { HEADER, SUBJECT, BODY } state;
826 if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
827 die("invalid interp table!");
829 /* these are independent of the commit */
830 interp_set_entry(table, IRED, "\033[31m");
831 interp_set_entry(table, IGREEN, "\033[32m");
832 interp_set_entry(table, IBLUE, "\033[34m");
833 interp_set_entry(table, IRESET_COLOR, "\033[m");
834 interp_set_entry(table, INEWLINE, "\n");
836 /* these depend on the commit */
837 if (!commit->object.parsed)
838 parse_object(commit->object.sha1);
839 interp_set_entry(table, IHASH, sha1_to_hex(commit->object.sha1));
840 interp_set_entry(table, IHASH_ABBREV,
841 find_unique_abbrev(commit->object.sha1,
843 interp_set_entry(table, ITREE, sha1_to_hex(commit->tree->object.sha1));
844 interp_set_entry(table, ITREE_ABBREV,
845 find_unique_abbrev(commit->tree->object.sha1,
847 interp_set_entry(table, ILEFT_RIGHT,
848 (commit->object.flags & BOUNDARY)
850 : (commit->object.flags & SYMMETRIC_LEFT)
855 for (i = 0, p = commit->parents;
856 p && i < sizeof(parents) - 1;
858 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
859 sha1_to_hex(p->item->object.sha1));
860 interp_set_entry(table, IPARENTS, parents + 1);
863 for (i = 0, p = commit->parents;
864 p && i < sizeof(parents) - 1;
866 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
867 find_unique_abbrev(p->item->object.sha1,
869 interp_set_entry(table, IPARENTS_ABBREV, parents + 1);
871 for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
873 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
876 if (state == SUBJECT) {
877 table[ISUBJECT].value = xstrndup(msg + i, eol - i);
882 /* strip empty lines */
883 while (msg[eol + 1] == '\n')
885 } else if (!prefixcmp(msg + i, "author "))
886 fill_person(table + IAUTHOR_NAME,
887 msg + i + 7, eol - i - 7);
888 else if (!prefixcmp(msg + i, "committer "))
889 fill_person(table + ICOMMITTER_NAME,
890 msg + i + 10, eol - i - 10);
891 else if (!prefixcmp(msg + i, "encoding "))
892 table[IENCODING].value =
893 xstrndup(msg + i + 9, eol - i - 9);
897 table[IBODY].value = xstrdup(msg + i);
898 for (i = 0; i < ARRAY_SIZE(table); i++)
900 interp_set_entry(table, i, "<unknown>");
902 interpolate(buf, space, user_format, table, ARRAY_SIZE(table));
903 interp_clear_table(table, ARRAY_SIZE(table));
908 unsigned long pretty_print_commit(enum cmit_fmt fmt,
909 const struct commit *commit,
911 char *buf, unsigned long space,
912 int abbrev, const char *subject,
913 const char *after_subject,
914 enum date_mode dmode)
916 int hdr = 1, body = 0, seen_title = 0;
917 unsigned long offset = 0;
919 int parents_shown = 0;
920 const char *msg = commit->buffer;
921 int plain_non_ascii = 0;
923 const char *encoding;
925 if (fmt == CMIT_FMT_USERFORMAT)
926 return format_commit_message(commit, msg, buf, space);
928 encoding = (git_log_output_encoding
929 ? git_log_output_encoding
930 : git_commit_encoding);
933 reencoded = logmsg_reencode(commit, encoding);
937 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
940 /* After-subject is used to pass in Content-Type: multipart
941 * MIME header; in that case we do not have to do the
942 * plaintext content type even if the commit message has
943 * non 7-bit ASCII character. Otherwise, check if we need
944 * to say this is not a 7-bit ASCII.
946 if (fmt == CMIT_FMT_EMAIL && !after_subject) {
949 for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
951 /* author could be non 7-bit ASCII but
952 * the log may be so; skip over the
956 i + 1 < len && msg[i+1] == '\n')
959 else if (non_ascii(ch)) {
967 const char *line = msg;
968 int linelen = get_one_line(msg, len);
974 * We want some slop for indentation and a possible
975 * final "...". Thus the "+ 20".
977 if (offset + linelen + 20 > space) {
978 memcpy(buf + offset, " ...\n", 8);
988 if ((fmt != CMIT_FMT_ONELINE) && !subject)
989 buf[offset++] = '\n';
992 if (fmt == CMIT_FMT_RAW) {
993 memcpy(buf + offset, line, linelen);
997 if (!memcmp(line, "parent ", 7)) {
999 die("bad parent line in commit");
1003 if (!parents_shown) {
1004 offset += add_merge_info(fmt, buf + offset,
1010 * MEDIUM == DEFAULT shows only author with dates.
1011 * FULL shows both authors but not dates.
1012 * FULLER shows both authors and dates.
1014 if (!memcmp(line, "author ", 7))
1015 offset += add_user_info("Author", fmt,
1020 if (!memcmp(line, "committer ", 10) &&
1021 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
1022 offset += add_user_info("Commit", fmt,
1033 if (is_empty_line(line, &linelen)) {
1040 if (fmt == CMIT_FMT_SHORT)
1046 int slen = strlen(subject);
1047 memcpy(buf + offset, subject, slen);
1049 offset += add_rfc2047(buf + offset, line, linelen,
1053 memset(buf + offset, ' ', indent);
1054 memcpy(buf + offset + indent, line, linelen);
1055 offset += linelen + indent;
1057 buf[offset++] = '\n';
1058 if (fmt == CMIT_FMT_ONELINE)
1060 if (subject && plain_non_ascii) {
1063 const char *header_fmt =
1064 "Content-Type: text/plain; charset=%s\n"
1065 "Content-Transfer-Encoding: 8bit\n";
1066 sz = snprintf(header, sizeof(header), header_fmt,
1068 if (sizeof(header) < sz)
1069 die("Encoding name %s too long", encoding);
1070 memcpy(buf + offset, header, sz);
1073 if (after_subject) {
1074 int slen = strlen(after_subject);
1075 if (slen > space - offset - 1)
1076 slen = space - offset - 1;
1077 memcpy(buf + offset, after_subject, slen);
1079 after_subject = NULL;
1083 while (offset && isspace(buf[offset-1]))
1085 /* Make sure there is an EOLN for the non-oneline case */
1086 if (fmt != CMIT_FMT_ONELINE)
1087 buf[offset++] = '\n';
1089 * make sure there is another EOLN to separate the headers from whatever
1090 * body the caller appends if we haven't already written a body
1092 if (fmt == CMIT_FMT_EMAIL && !body)
1093 buf[offset++] = '\n';
1100 struct commit *pop_commit(struct commit_list **stack)
1102 struct commit_list *top = *stack;
1103 struct commit *item = top ? top->item : NULL;
1112 int count_parents(struct commit * commit)
1115 struct commit_list * parents = commit->parents;
1116 for (count = 0; parents; parents = parents->next,count++)
1121 void topo_sort_default_setter(struct commit *c, void *data)
1126 void *topo_sort_default_getter(struct commit *c)
1132 * Performs an in-place topological sort on the list supplied.
1134 void sort_in_topological_order(struct commit_list ** list, int lifo)
1136 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
1137 topo_sort_default_getter);
1140 void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1141 topo_sort_set_fn_t setter,
1142 topo_sort_get_fn_t getter)
1144 struct commit_list * next = *list;
1145 struct commit_list * work = NULL, **insert;
1146 struct commit_list ** pptr = list;
1147 struct sort_node * nodes;
1148 struct sort_node * next_nodes;
1151 /* determine the size of the list */
1159 /* allocate an array to help sort the list */
1160 nodes = xcalloc(count, sizeof(*nodes));
1161 /* link the list to the array */
1165 next_nodes->list_item = next;
1166 setter(next->item, next_nodes);
1170 /* update the indegree */
1173 struct commit_list * parents = next->item->parents;
1175 struct commit * parent=parents->item;
1176 struct sort_node * pn = (struct sort_node *) getter(parent);
1180 parents=parents->next;
1187 * tips are nodes not reachable from any other node in the list
1189 * the tips serve as a starting set for the work queue.
1194 struct sort_node * node = (struct sort_node *) getter(next->item);
1196 if (node->indegree == 0) {
1197 insert = &commit_list_insert(next->item, insert)->next;
1202 /* process the list in topological order */
1204 sort_by_date(&work);
1206 struct commit * work_item = pop_commit(&work);
1207 struct sort_node * work_node = (struct sort_node *) getter(work_item);
1208 struct commit_list * parents = work_item->parents;
1211 struct commit * parent=parents->item;
1212 struct sort_node * pn = (struct sort_node *) getter(parent);
1216 * parents are only enqueued for emission
1217 * when all their children have been emitted thereby
1218 * guaranteeing topological order.
1221 if (!pn->indegree) {
1223 insert_by_date(parent, &work);
1225 commit_list_insert(parent, &work);
1228 parents=parents->next;
1231 * work_item is a commit all of whose children
1232 * have already been emitted. we can emit it now.
1234 *pptr = work_node->list_item;
1235 pptr = &(*pptr)->next;
1237 setter(work_item, NULL);
1242 /* merge-base stuff */
1244 /* bits #0..15 in revision.h */
1245 #define PARENT1 (1u<<16)
1246 #define PARENT2 (1u<<17)
1247 #define STALE (1u<<18)
1248 #define RESULT (1u<<19)
1250 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1252 static struct commit *interesting(struct commit_list *list)
1255 struct commit *commit = list->item;
1257 if (commit->object.flags & STALE)
1264 static struct commit_list *merge_bases(struct commit *one, struct commit *two)
1266 struct commit_list *list = NULL;
1267 struct commit_list *result = NULL;
1270 /* We do not mark this even with RESULT so we do not
1271 * have to clean it up.
1273 return commit_list_insert(one, &result);
1278 one->object.flags |= PARENT1;
1279 two->object.flags |= PARENT2;
1280 insert_by_date(one, &list);
1281 insert_by_date(two, &list);
1283 while (interesting(list)) {
1284 struct commit *commit;
1285 struct commit_list *parents;
1286 struct commit_list *n;
1289 commit = list->item;
1294 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
1295 if (flags == (PARENT1 | PARENT2)) {
1296 if (!(commit->object.flags & RESULT)) {
1297 commit->object.flags |= RESULT;
1298 insert_by_date(commit, &result);
1300 /* Mark parents of a found merge stale */
1303 parents = commit->parents;
1305 struct commit *p = parents->item;
1306 parents = parents->next;
1307 if ((p->object.flags & flags) == flags)
1310 p->object.flags |= flags;
1311 insert_by_date(p, &list);
1315 /* Clean up the result to remove stale ones */
1316 free_commit_list(list);
1317 list = result; result = NULL;
1319 struct commit_list *n = list->next;
1320 if (!(list->item->object.flags & STALE))
1321 insert_by_date(list->item, &result);
1328 struct commit_list *get_merge_bases(struct commit *one,
1332 struct commit_list *list;
1333 struct commit **rslt;
1334 struct commit_list *result;
1337 result = merge_bases(one, two);
1340 if (!result || !result->next) {
1342 clear_commit_marks(one, all_flags);
1343 clear_commit_marks(two, all_flags);
1348 /* There are more than one */
1355 rslt = xcalloc(cnt, sizeof(*rslt));
1356 for (list = result, i = 0; list; list = list->next)
1357 rslt[i++] = list->item;
1358 free_commit_list(result);
1360 clear_commit_marks(one, all_flags);
1361 clear_commit_marks(two, all_flags);
1362 for (i = 0; i < cnt - 1; i++) {
1363 for (j = i+1; j < cnt; j++) {
1364 if (!rslt[i] || !rslt[j])
1366 result = merge_bases(rslt[i], rslt[j]);
1367 clear_commit_marks(rslt[i], all_flags);
1368 clear_commit_marks(rslt[j], all_flags);
1369 for (list = result; list; list = list->next) {
1370 if (rslt[i] == list->item)
1372 if (rslt[j] == list->item)
1378 /* Surviving ones in rslt[] are the independent results */
1380 for (i = 0; i < cnt; i++) {
1382 insert_by_date(rslt[i], &result);
1388 int in_merge_bases(struct commit *commit, struct commit **reference, int num)
1390 struct commit_list *bases, *b;
1394 bases = get_merge_bases(commit, *reference, 1);
1397 for (b = bases; b; b = b->next) {
1398 if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
1404 free_commit_list(bases);