5 int save_commit_buffer = 1;
10 * the number of children of the associated commit
11 * that also occur in the list being sorted.
13 unsigned int indegree;
16 * reference to original list item that we will re-use
19 struct commit_list * list_item;
23 const char *commit_type = "commit";
30 { "raw", 1, CMIT_FMT_RAW },
31 { "medium", 1, CMIT_FMT_MEDIUM },
32 { "short", 1, CMIT_FMT_SHORT },
33 { "email", 1, CMIT_FMT_EMAIL },
34 { "full", 5, CMIT_FMT_FULL },
35 { "fuller", 5, CMIT_FMT_FULLER },
36 { "oneline", 1, CMIT_FMT_ONELINE },
39 enum cmit_fmt get_commit_format(const char *arg)
44 return CMIT_FMT_DEFAULT;
47 for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
48 if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len))
52 die("invalid --pretty format: %s", arg);
55 static struct commit *check_commit(struct object *obj,
56 const unsigned char *sha1,
59 if (obj->type != TYPE_COMMIT) {
61 error("Object %s is a %s, not a commit",
62 sha1_to_hex(sha1), typename(obj->type));
65 return (struct commit *) obj;
68 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
71 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
75 return check_commit(obj, sha1, quiet);
78 struct commit *lookup_commit_reference(const unsigned char *sha1)
80 return lookup_commit_reference_gently(sha1, 0);
83 struct commit *lookup_commit(const unsigned char *sha1)
85 struct object *obj = lookup_object(sha1);
87 struct commit *ret = alloc_commit_node();
88 created_object(sha1, &ret->object);
89 ret->object.type = TYPE_COMMIT;
93 obj->type = TYPE_COMMIT;
94 return check_commit(obj, sha1, 0);
97 static unsigned long parse_commit_date(const char *buf)
101 if (memcmp(buf, "author", 6))
103 while (*buf++ != '\n')
105 if (memcmp(buf, "committer", 9))
107 while (*buf++ != '>')
109 date = strtoul(buf, NULL, 10);
110 if (date == ULONG_MAX)
115 static struct commit_graft **commit_graft;
116 static int commit_graft_alloc, commit_graft_nr;
118 static int commit_graft_pos(const unsigned char *sha1)
122 hi = commit_graft_nr;
124 int mi = (lo + hi) / 2;
125 struct commit_graft *graft = commit_graft[mi];
126 int cmp = memcmp(sha1, graft->sha1, 20);
137 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
139 int pos = commit_graft_pos(graft->sha1);
145 free(commit_graft[pos]);
146 commit_graft[pos] = graft;
151 if (commit_graft_alloc <= ++commit_graft_nr) {
152 commit_graft_alloc = alloc_nr(commit_graft_alloc);
153 commit_graft = xrealloc(commit_graft,
154 sizeof(*commit_graft) *
157 if (pos < commit_graft_nr)
158 memmove(commit_graft + pos + 1,
160 (commit_graft_nr - pos - 1) *
161 sizeof(*commit_graft));
162 commit_graft[pos] = graft;
166 struct commit_graft *read_graft_line(char *buf, int len)
168 /* The format is just "Commit Parent1 Parent2 ...\n" */
170 struct commit_graft *graft = NULL;
172 if (buf[len-1] == '\n')
174 if (buf[0] == '#' || buf[0] == '\0')
176 if ((len + 1) % 41) {
178 error("bad graft data: %s", buf);
182 i = (len + 1) / 41 - 1;
183 graft = xmalloc(sizeof(*graft) + 20 * i);
184 graft->nr_parent = i;
185 if (get_sha1_hex(buf, graft->sha1))
187 for (i = 40; i < len; i += 41) {
190 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
196 int read_graft_file(const char *graft_file)
198 FILE *fp = fopen(graft_file, "r");
202 while (fgets(buf, sizeof(buf), fp)) {
203 /* The format is just "Commit Parent1 Parent2 ...\n" */
204 int len = strlen(buf);
205 struct commit_graft *graft = read_graft_line(buf, len);
208 if (register_commit_graft(graft, 1))
209 error("duplicate graft data: %s", buf);
215 static void prepare_commit_graft(void)
217 static int commit_graft_prepared;
220 if (commit_graft_prepared)
222 graft_file = get_graft_file();
223 read_graft_file(graft_file);
224 commit_graft_prepared = 1;
227 static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
230 prepare_commit_graft();
231 pos = commit_graft_pos(sha1);
234 return commit_graft[pos];
237 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
239 char *bufptr = buffer;
240 unsigned char parent[20];
241 struct commit_list **pptr;
242 struct commit_graft *graft;
245 if (item->object.parsed)
247 item->object.parsed = 1;
248 if (memcmp(bufptr, "tree ", 5))
249 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
250 if (get_sha1_hex(bufptr + 5, parent) < 0)
251 return error("bad tree pointer in commit %s",
252 sha1_to_hex(item->object.sha1));
253 item->tree = lookup_tree(parent);
256 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
257 pptr = &item->parents;
259 graft = lookup_commit_graft(item->object.sha1);
260 while (!memcmp(bufptr, "parent ", 7)) {
261 struct commit *new_parent;
263 if (get_sha1_hex(bufptr + 7, parent) || bufptr[47] != '\n')
264 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
268 new_parent = lookup_commit(parent);
270 pptr = &commit_list_insert(new_parent, pptr)->next;
276 struct commit *new_parent;
277 for (i = 0; i < graft->nr_parent; i++) {
278 new_parent = lookup_commit(graft->parent[i]);
281 pptr = &commit_list_insert(new_parent, pptr)->next;
285 item->date = parse_commit_date(bufptr);
287 if (track_object_refs) {
289 struct commit_list *p;
290 struct object_refs *refs = alloc_object_refs(n_refs);
292 refs->ref[i++] = &item->tree->object;
293 for (p = item->parents; p; p = p->next)
294 refs->ref[i++] = &p->item->object;
295 set_object_refs(&item->object, refs);
301 int parse_commit(struct commit *item)
308 if (item->object.parsed)
310 buffer = read_sha1_file(item->object.sha1, type, &size);
312 return error("Could not read %s",
313 sha1_to_hex(item->object.sha1));
314 if (strcmp(type, commit_type)) {
316 return error("Object %s not a commit",
317 sha1_to_hex(item->object.sha1));
319 ret = parse_commit_buffer(item, buffer, size);
320 if (save_commit_buffer && !ret) {
321 item->buffer = buffer;
328 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
330 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
331 new_list->item = item;
332 new_list->next = *list_p;
337 void free_commit_list(struct commit_list *list)
340 struct commit_list *temp = list;
346 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
348 struct commit_list **pp = list;
349 struct commit_list *p;
350 while ((p = *pp) != NULL) {
351 if (p->item->date < item->date) {
356 return commit_list_insert(item, pp);
360 void sort_by_date(struct commit_list **list)
362 struct commit_list *ret = NULL;
364 insert_by_date((*list)->item, &ret);
365 *list = (*list)->next;
370 struct commit *pop_most_recent_commit(struct commit_list **list,
373 struct commit *ret = (*list)->item;
374 struct commit_list *parents = ret->parents;
375 struct commit_list *old = *list;
377 *list = (*list)->next;
381 struct commit *commit = parents->item;
382 parse_commit(commit);
383 if (!(commit->object.flags & mark)) {
384 commit->object.flags |= mark;
385 insert_by_date(commit, list);
387 parents = parents->next;
392 void clear_commit_marks(struct commit *commit, unsigned int mark)
394 struct commit_list *parents;
396 parents = commit->parents;
397 commit->object.flags &= ~mark;
399 struct commit *parent = parents->item;
400 if (parent && parent->object.parsed &&
401 (parent->object.flags & mark))
402 clear_commit_marks(parent, mark);
403 parents = parents->next;
408 * Generic support for pretty-printing the header
410 static int get_one_line(const char *msg, unsigned long len)
425 static int is_rfc2047_special(char ch)
427 return ((ch & 0x80) || (ch == '=') || (ch == '?') || (ch == '_'));
430 static int add_rfc2047(char *buf, const char *line, int len)
434 static const char q_utf8[] = "=?utf-8?q?";
436 for (i = needquote = 0; !needquote && i < len; i++) {
437 unsigned ch = line[i];
441 (ch == '=' && line[i+1] == '?'))
445 return sprintf(buf, "%.*s", len, line);
447 memcpy(bp, q_utf8, sizeof(q_utf8)-1);
448 bp += sizeof(q_utf8)-1;
449 for (i = 0; i < len; i++) {
450 unsigned ch = line[i] & 0xFF;
451 if (is_rfc2047_special(ch)) {
452 sprintf(bp, "=%02X", ch);
465 static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const char *line)
471 const char *filler = " ";
473 if (fmt == CMIT_FMT_ONELINE)
475 date = strchr(line, '>');
478 namelen = ++date - line;
479 time = strtoul(date, &date, 10);
480 tz = strtol(date, NULL, 10);
482 if (fmt == CMIT_FMT_EMAIL) {
483 char *name_tail = strchr(line, '<');
484 int display_name_length;
487 while (line < name_tail && isspace(name_tail[-1]))
489 display_name_length = name_tail - line;
491 strcpy(buf, "From: ");
493 ret += add_rfc2047(buf + ret, line, display_name_length);
494 memcpy(buf + ret, name_tail, namelen - display_name_length);
495 ret += namelen - display_name_length;
499 ret = sprintf(buf, "%s: %.*s%.*s\n", what,
500 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
501 filler, namelen, line);
504 case CMIT_FMT_MEDIUM:
505 ret += sprintf(buf + ret, "Date: %s\n", show_date(time, tz));
508 ret += sprintf(buf + ret, "Date: %s\n",
509 show_rfc2822_date(time, tz));
511 case CMIT_FMT_FULLER:
512 ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
521 static int is_empty_line(const char *line, int *len_p)
524 while (len && isspace(line[len-1]))
530 static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
532 struct commit_list *parent = commit->parents;
535 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
536 !parent || !parent->next)
539 offset = sprintf(buf, "Merge:");
542 struct commit *p = parent->item;
543 const char *hex = abbrev
544 ? find_unique_abbrev(p->object.sha1, abbrev)
545 : sha1_to_hex(p->object.sha1);
546 char *dots = (abbrev && strlen(hex) != 40) ? "..." : "";
547 parent = parent->next;
549 offset += sprintf(buf + offset, " %s%s", hex, dots);
551 buf[offset++] = '\n';
555 unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject)
557 int hdr = 1, body = 0;
558 unsigned long offset = 0;
560 int parents_shown = 0;
561 const char *msg = commit->buffer;
562 int plain_non_ascii = 0;
564 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
567 /* After-subject is used to pass in Content-Type: multipart
568 * MIME header; in that case we do not have to do the
569 * plaintext content type even if the commit message has
570 * non 7-bit ASCII character. Otherwise, check if we need
571 * to say this is not a 7-bit ASCII.
573 if (fmt == CMIT_FMT_EMAIL && !after_subject) {
576 for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
578 /* author could be non 7-bit ASCII but
579 * the log may so; skip over the
583 i + 1 < len && msg[i+1] == '\n')
586 else if (ch & 0x80) {
594 const char *line = msg;
595 int linelen = get_one_line(msg, len);
601 * We want some slop for indentation and a possible
602 * final "...". Thus the "+ 20".
604 if (offset + linelen + 20 > space) {
605 memcpy(buf + offset, " ...\n", 8);
615 if ((fmt != CMIT_FMT_ONELINE) && !subject)
616 buf[offset++] = '\n';
619 if (fmt == CMIT_FMT_RAW) {
620 memcpy(buf + offset, line, linelen);
624 if (!memcmp(line, "parent ", 7)) {
626 die("bad parent line in commit");
630 if (!parents_shown) {
631 offset += add_merge_info(fmt, buf + offset,
637 * MEDIUM == DEFAULT shows only author with dates.
638 * FULL shows both authors but not dates.
639 * FULLER shows both authors and dates.
641 if (!memcmp(line, "author ", 7))
642 offset += add_user_info("Author", fmt,
645 if (!memcmp(line, "committer ", 10) &&
646 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
647 offset += add_user_info("Commit", fmt,
653 if (is_empty_line(line, &linelen)) {
658 if (fmt == CMIT_FMT_SHORT)
665 int slen = strlen(subject);
666 memcpy(buf + offset, subject, slen);
668 offset += add_rfc2047(buf + offset, line, linelen);
671 memset(buf + offset, ' ', indent);
672 memcpy(buf + offset + indent, line, linelen);
673 offset += linelen + indent;
675 buf[offset++] = '\n';
676 if (fmt == CMIT_FMT_ONELINE)
678 if (subject && plain_non_ascii) {
679 static const char header[] =
680 "Content-Type: text/plain; charset=UTF-8\n"
681 "Content-Transfer-Encoding: 8bit\n";
682 memcpy(buf + offset, header, sizeof(header)-1);
683 offset += sizeof(header)-1;
686 int slen = strlen(after_subject);
687 if (slen > space - offset - 1)
688 slen = space - offset - 1;
689 memcpy(buf + offset, after_subject, slen);
691 after_subject = NULL;
695 while (offset && isspace(buf[offset-1]))
697 /* Make sure there is an EOLN for the non-oneline case */
698 if (fmt != CMIT_FMT_ONELINE)
699 buf[offset++] = '\n';
704 struct commit *pop_commit(struct commit_list **stack)
706 struct commit_list *top = *stack;
707 struct commit *item = top ? top->item : NULL;
716 int count_parents(struct commit * commit)
719 struct commit_list * parents = commit->parents;
720 for (count=0;parents; parents=parents->next,count++)
725 void topo_sort_default_setter(struct commit *c, void *data)
730 void *topo_sort_default_getter(struct commit *c)
736 * Performs an in-place topological sort on the list supplied.
738 void sort_in_topological_order(struct commit_list ** list, int lifo)
740 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
741 topo_sort_default_getter);
744 void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
745 topo_sort_set_fn_t setter,
746 topo_sort_get_fn_t getter)
748 struct commit_list * next = *list;
749 struct commit_list * work = NULL, **insert;
750 struct commit_list ** pptr = list;
751 struct sort_node * nodes;
752 struct sort_node * next_nodes;
755 /* determine the size of the list */
763 /* allocate an array to help sort the list */
764 nodes = xcalloc(count, sizeof(*nodes));
765 /* link the list to the array */
769 next_nodes->list_item = next;
770 setter(next->item, next_nodes);
774 /* update the indegree */
777 struct commit_list * parents = next->item->parents;
779 struct commit * parent=parents->item;
780 struct sort_node * pn = (struct sort_node *) getter(parent);
784 parents=parents->next;
791 * tips are nodes not reachable from any other node in the list
793 * the tips serve as a starting set for the work queue.
798 struct sort_node * node = (struct sort_node *) getter(next->item);
800 if (node->indegree == 0) {
801 insert = &commit_list_insert(next->item, insert)->next;
806 /* process the list in topological order */
810 struct commit * work_item = pop_commit(&work);
811 struct sort_node * work_node = (struct sort_node *) getter(work_item);
812 struct commit_list * parents = work_item->parents;
815 struct commit * parent=parents->item;
816 struct sort_node * pn = (struct sort_node *) getter(parent);
820 * parents are only enqueued for emission
821 * when all their children have been emitted thereby
822 * guaranteeing topological order.
827 insert_by_date(parent, &work);
829 commit_list_insert(parent, &work);
832 parents=parents->next;
835 * work_item is a commit all of whose children
836 * have already been emitted. we can emit it now.
838 *pptr = work_node->list_item;
839 pptr = &(*pptr)->next;
841 setter(work_item, NULL);