?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Add xmemdupz() that duplicates a block of memory, and NUL terminates it.
[git/jnareb-git.git] / commit.c
blob85889f966457bf11004daa40c2cbe664baf96fb4
1 #include "cache.h"
2 #include "tag.h"
3 #include "commit.h"
4 #include "pkt-line.h"
5 #include "utf8.h"
6 #include "interpolate.h"
7 #include "diff.h"
8 #include "revision.h"
9
10 int save_commit_buffer = 1;
11
12 struct sort_node
13 {
14 /*
15 * the number of children of the associated commit
16 * that also occur in the list being sorted.
17 */
18 unsigned int indegree;
19
20 /*
21 * reference to original list item that we will re-use
22 * on output.
23 */
24 struct commit_list * list_item;
25
26 };
27
28 const char *commit_type = "commit";
29
30 static struct cmt_fmt_map {
31 const char *n;
32 size_t cmp_len;
33 enum cmit_fmt v;
34 } cmt_fmts[] = {
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},
43 };
44
45 static char *user_format;
46
47 enum cmit_fmt get_commit_format(const char *arg)
48 {
49 int i;
50
51 if (!arg || !*arg)
52 return CMIT_FMT_DEFAULT;
53 if (*arg == '=')
54 arg++;
55 if (!prefixcmp(arg, "format:")) {
56 if (user_format)
57 free(user_format);
58 user_format = xstrdup(arg + 7);
59 return CMIT_FMT_USERFORMAT;
60 }
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)))
64 return cmt_fmts[i].v;
65 }
66
67 die("invalid --pretty format: %s", arg);
68 }
69
70 static struct commit *check_commit(struct object *obj,
71 const unsigned char *sha1,
72 int quiet)
73 {
74 if (obj->type != OBJ_COMMIT) {
75 if (!quiet)
76 error("Object %s is a %s, not a commit",
77 sha1_to_hex(sha1), typename(obj->type));
78 return NULL;
79 }
80 return (struct commit *) obj;
81 }
82
83 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
84 int quiet)
85 {
86 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
87
88 if (!obj)
89 return NULL;
90 return check_commit(obj, sha1, quiet);
91 }
92
93 struct commit *lookup_commit_reference(const unsigned char *sha1)
94 {
95 return lookup_commit_reference_gently(sha1, 0);
96 }
97
98 struct commit *lookup_commit(const unsigned char *sha1)
99 {
100 struct object *obj = lookup_object(sha1);
101 if (!obj)
102 return create_object(sha1, OBJ_COMMIT, alloc_commit_node());
103 if (!obj->type)
104 obj->type = OBJ_COMMIT;
105 return check_commit(obj, sha1, 0);
106 }
107
108 static unsigned long parse_commit_date(const char *buf)
109 {
110 unsigned long date;
111
112 if (memcmp(buf, "author", 6))
113 return 0;
114 while (*buf++ != '\n')
115 /* nada */;
116 if (memcmp(buf, "committer", 9))
117 return 0;
118 while (*buf++ != '>')
119 /* nada */;
120 date = strtoul(buf, NULL, 10);
121 if (date == ULONG_MAX)
122 date = 0;
123 return date;
124 }
125
126 static struct commit_graft **commit_graft;
127 static int commit_graft_alloc, commit_graft_nr;
128
129 static int commit_graft_pos(const unsigned char *sha1)
130 {
131 int lo, hi;
132 lo = 0;
133 hi = commit_graft_nr;
134 while (lo < hi) {
135 int mi = (lo + hi) / 2;
136 struct commit_graft *graft = commit_graft[mi];
137 int cmp = hashcmp(sha1, graft->sha1);
138 if (!cmp)
139 return mi;
140 if (cmp < 0)
141 hi = mi;
142 else
143 lo = mi + 1;
144 }
145 return -lo - 1;
146 }
147
148 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
149 {
150 int pos = commit_graft_pos(graft->sha1);
151
152 if (0 <= pos) {
153 if (ignore_dups)
154 free(graft);
155 else {
156 free(commit_graft[pos]);
157 commit_graft[pos] = graft;
158 }
159 return 1;
160 }
161 pos = -pos - 1;
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) *
166 commit_graft_alloc);
167 }
168 if (pos < commit_graft_nr)
169 memmove(commit_graft + pos + 1,
170 commit_graft + pos,
171 (commit_graft_nr - pos - 1) *
172 sizeof(*commit_graft));
173 commit_graft[pos] = graft;
174 return 0;
175 }
176
177 struct commit_graft *read_graft_line(char *buf, int len)
178 {
179 /* The format is just "Commit Parent1 Parent2 ...\n" */
180 int i;
181 struct commit_graft *graft = NULL;
182
183 if (buf[len-1] == '\n')
184 buf[--len] = 0;
185 if (buf[0] == '#' || buf[0] == '\0')
186 return NULL;
187 if ((len + 1) % 41) {
188 bad_graft_data:
189 error("bad graft data: %s", buf);
190 free(graft);
191 return NULL;
192 }
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))
197 goto bad_graft_data;
198 for (i = 40; i < len; i += 41) {
199 if (buf[i] != ' ')
200 goto bad_graft_data;
201 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
202 goto bad_graft_data;
203 }
204 return graft;
205 }
206
207 int read_graft_file(const char *graft_file)
208 {
209 FILE *fp = fopen(graft_file, "r");
210 char buf[1024];
211 if (!fp)
212 return -1;
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);
217 if (!graft)
218 continue;
219 if (register_commit_graft(graft, 1))
220 error("duplicate graft data: %s", buf);
221 }
222 fclose(fp);
223 return 0;
224 }
225
226 static void prepare_commit_graft(void)
227 {
228 static int commit_graft_prepared;
229 char *graft_file;
230
231 if (commit_graft_prepared)
232 return;
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;
238 }
239
240 static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
241 {
242 int pos;
243 prepare_commit_graft();
244 pos = commit_graft_pos(sha1);
245 if (pos < 0)
246 return NULL;
247 return commit_graft[pos];
248 }
249
250 int write_shallow_commits(int fd, int use_pack_protocol)
251 {
252 int i, count = 0;
253 for (i = 0; i < commit_graft_nr; i++)
254 if (commit_graft[i]->nr_parent < 0) {
255 const char *hex =
256 sha1_to_hex(commit_graft[i]->sha1);
257 count++;
258 if (use_pack_protocol)
259 packet_write(fd, "shallow %s", hex);
260 else {
261 if (write_in_full(fd, hex, 40) != 40)
262 break;
263 if (write_in_full(fd, "\n", 1) != 1)
264 break;
265 }
266 }
267 return count;
268 }
269
270 int unregister_shallow(const unsigned char *sha1)
271 {
272 int pos = commit_graft_pos(sha1);
273 if (pos < 0)
274 return -1;
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));
279 commit_graft_nr--;
280 return 0;
281 }
282
283 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
284 {
285 char *tail = buffer;
286 char *bufptr = buffer;
287 unsigned char parent[20];
288 struct commit_list **pptr;
289 struct commit_graft *graft;
290 unsigned n_refs = 0;
291
292 if (item->object.parsed)
293 return 0;
294 item->object.parsed = 1;
295 tail += size;
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);
302 if (item->tree)
303 n_refs++;
304 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
305 pptr = &item->parents;
306
307 graft = lookup_commit_graft(item->object.sha1);
308 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
309 struct commit *new_parent;
310
311 if (tail <= bufptr + 48 ||
312 get_sha1_hex(bufptr + 7, parent) ||
313 bufptr[47] != '\n')
314 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
315 bufptr += 48;
316 if (graft)
317 continue;
318 new_parent = lookup_commit(parent);
319 if (new_parent) {
320 pptr = &commit_list_insert(new_parent, pptr)->next;
321 n_refs++;
322 }
323 }
324 if (graft) {
325 int i;
326 struct commit *new_parent;
327 for (i = 0; i < graft->nr_parent; i++) {
328 new_parent = lookup_commit(graft->parent[i]);
329 if (!new_parent)
330 continue;
331 pptr = &commit_list_insert(new_parent, pptr)->next;
332 n_refs++;
333 }
334 }
335 item->date = parse_commit_date(bufptr);
336
337 if (track_object_refs) {
338 unsigned i = 0;
339 struct commit_list *p;
340 struct object_refs *refs = alloc_object_refs(n_refs);
341 if (item->tree)
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);
346 }
347
348 return 0;
349 }
350
351 int parse_commit(struct commit *item)
352 {
353 enum object_type type;
354 void *buffer;
355 unsigned long size;
356 int ret;
357
358 if (item->object.parsed)
359 return 0;
360 buffer = read_sha1_file(item->object.sha1, &type, &size);
361 if (!buffer)
362 return error("Could not read %s",
363 sha1_to_hex(item->object.sha1));
364 if (type != OBJ_COMMIT) {
365 free(buffer);
366 return error("Object %s not a commit",
367 sha1_to_hex(item->object.sha1));
368 }
369 ret = parse_commit_buffer(item, buffer, size);
370 if (save_commit_buffer && !ret) {
371 item->buffer = buffer;
372 return 0;
373 }
374 free(buffer);
375 return ret;
376 }
377
378 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
379 {
380 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
381 new_list->item = item;
382 new_list->next = *list_p;
383 *list_p = new_list;
384 return new_list;
385 }
386
387 void free_commit_list(struct commit_list *list)
388 {
389 while (list) {
390 struct commit_list *temp = list;
391 list = temp->next;
392 free(temp);
393 }
394 }
395
396 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
397 {
398 struct commit_list **pp = list;
399 struct commit_list *p;
400 while ((p = *pp) != NULL) {
401 if (p->item->date < item->date) {
402 break;
403 }
404 pp = &p->next;
405 }
406 return commit_list_insert(item, pp);
407 }
408
409
410 void sort_by_date(struct commit_list **list)
411 {
412 struct commit_list *ret = NULL;
413 while (*list) {
414 insert_by_date((*list)->item, &ret);
415 *list = (*list)->next;
416 }
417 *list = ret;
418 }
419
420 struct commit *pop_most_recent_commit(struct commit_list **list,
421 unsigned int mark)
422 {
423 struct commit *ret = (*list)->item;
424 struct commit_list *parents = ret->parents;
425 struct commit_list *old = *list;
426
427 *list = (*list)->next;
428 free(old);
429
430 while (parents) {
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);
436 }
437 parents = parents->next;
438 }
439 return ret;
440 }
441
442 void clear_commit_marks(struct commit *commit, unsigned int mark)
443 {
444 struct commit_list *parents;
445
446 commit->object.flags &= ~mark;
447 parents = commit->parents;
448 while (parents) {
449 struct commit *parent = parents->item;
450
451 /* Have we already cleared this? */
452 if (mark & parent->object.flags)
453 clear_commit_marks(parent, mark);
454 parents = parents->next;
455 }
456 }
457
458 /*
459 * Generic support for pretty-printing the header
460 */
461 static int get_one_line(const char *msg)
462 {
463 int ret = 0;
464
465 for (;;) {
466 char c = *msg++;
467 if (!c)
468 break;
469 ret++;
470 if (c == '\n')
471 break;
472 }
473 return ret;
474 }
475
476 /* High bit set, or ISO-2022-INT */
477 static int non_ascii(int ch)
478 {
479 ch = (ch & 0xff);
480 return ((ch & 0x80) || (ch == 0x1b));
481 }
482
483 static int is_rfc2047_special(char ch)
484 {
485 return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
486 }
487
488 static void add_rfc2047(struct strbuf *sb, const char *line, int len,
489 const char *encoding)
490 {
491 int i, last;
492
493 for (i = 0; i < len; i++) {
494 int ch = line[i];
495 if (non_ascii(ch))
496 goto needquote;
497 if ((i + 1 < len) && (ch == '=' && line[i+1] == '?'))
498 goto needquote;
499 }
500 strbuf_add(sb, line, len);
501 return;
502
503 needquote:
504 strbuf_grow(sb, len * 3 + strlen(encoding) + 100);
505 strbuf_addf(sb, "=?%s?q?", encoding);
506 for (i = last = 0; i < len; i++) {
507 unsigned ch = line[i] & 0xFF;
508 /*
509 * We encode ' ' using '=20' even though rfc2047
510 * allows using '_' for readability. Unfortunately,
511 * many programs do not understand this and just
512 * leave the underscore in place.
513 */
514 if (is_rfc2047_special(ch) || ch == ' ') {
515 strbuf_add(sb, line + last, i - last);
516 strbuf_addf(sb, "=%02X", ch);
517 last = i + 1;
518 }
519 }
520 strbuf_add(sb, line + last, len - last);
521 strbuf_addstr(sb, "?=");
522 }
523
524 static void add_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
525 const char *line, enum date_mode dmode,
526 const char *encoding)
527 {
528 char *date;
529 int namelen;
530 unsigned long time;
531 int tz;
532 const char *filler = " ";
533
534 if (fmt == CMIT_FMT_ONELINE)
535 return;
536 date = strchr(line, '>');
537 if (!date)
538 return;
539 namelen = ++date - line;
540 time = strtoul(date, &date, 10);
541 tz = strtol(date, NULL, 10);
542
543 if (fmt == CMIT_FMT_EMAIL) {
544 char *name_tail = strchr(line, '<');
545 int display_name_length;
546 if (!name_tail)
547 return;
548 while (line < name_tail && isspace(name_tail[-1]))
549 name_tail--;
550 display_name_length = name_tail - line;
551 filler = "";
552 strbuf_addstr(sb, "From: ");
553 add_rfc2047(sb, line, display_name_length, encoding);
554 strbuf_add(sb, name_tail, namelen - display_name_length);
555 strbuf_addch(sb, '\n');
556 } else {
557 strbuf_addf(sb, "%s: %.*s%.*s\n", what,
558 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
559 filler, namelen, line);
560 }
561 switch (fmt) {
562 case CMIT_FMT_MEDIUM:
563 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, dmode));
564 break;
565 case CMIT_FMT_EMAIL:
566 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, DATE_RFC2822));
567 break;
568 case CMIT_FMT_FULLER:
569 strbuf_addf(sb, "%sDate: %s\n", what, show_date(time, tz, dmode));
570 break;
571 default:
572 /* notin' */
573 break;
574 }
575 }
576
577 static int is_empty_line(const char *line, int *len_p)
578 {
579 int len = *len_p;
580 while (len && isspace(line[len-1]))
581 len--;
582 *len_p = len;
583 return !len;
584 }
585
586 static void add_merge_info(enum cmit_fmt fmt, struct strbuf *sb,
587 const struct commit *commit, int abbrev)
588 {
589 struct commit_list *parent = commit->parents;
590
591 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
592 !parent || !parent->next)
593 return;
594
595 strbuf_addstr(sb, "Merge:");
596
597 while (parent) {
598 struct commit *p = parent->item;
599 const char *hex = NULL;
600 const char *dots;
601 if (abbrev)
602 hex = find_unique_abbrev(p->object.sha1, abbrev);
603 if (!hex)
604 hex = sha1_to_hex(p->object.sha1);
605 dots = (abbrev && strlen(hex) != 40) ? "..." : "";
606 parent = parent->next;
607
608 strbuf_addf(sb, " %s%s", hex, dots);
609 }
610 strbuf_addch(sb, '\n');
611 }
612
613 static char *get_header(const struct commit *commit, const char *key)
614 {
615 int key_len = strlen(key);
616 const char *line = commit->buffer;
617
618 for (;;) {
619 const char *eol = strchr(line, '\n'), *next;
620
621 if (line == eol)
622 return NULL;
623 if (!eol) {
624 eol = line + strlen(line);
625 next = NULL;
626 } else
627 next = eol + 1;
628 if (eol - line > key_len &&
629 !strncmp(line, key, key_len) &&
630 line[key_len] == ' ') {
631 int len = eol - line - key_len;
632 char *ret = xmalloc(len);
633 memcpy(ret, line + key_len + 1, len - 1);
634 ret[len - 1] = '\0';
635 return ret;
636 }
637 line = next;
638 }
639 }
640
641 static char *replace_encoding_header(char *buf, const char *encoding)
642 {
643 struct strbuf tmp;
644 size_t start, len;
645 char *cp = buf;
646
647 /* guess if there is an encoding header before a \n\n */
648 while (strncmp(cp, "encoding ", strlen("encoding "))) {
649 cp = strchr(cp, '\n');
650 if (!cp || *++cp == '\n')
651 return buf;
652 }
653 start = cp - buf;
654 cp = strchr(cp, '\n');
655 if (!cp)
656 return buf; /* should not happen but be defensive */
657 len = cp + 1 - (buf + start);
658
659 strbuf_init(&tmp, 0);
660 strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1);
661 if (is_encoding_utf8(encoding)) {
662 /* we have re-coded to UTF-8; drop the header */
663 strbuf_splice(&tmp, start, len, NULL, 0);
664 } else {
665 /* just replaces XXXX in 'encoding XXXX\n' */
666 strbuf_splice(&tmp, start + strlen("encoding "),
667 len - strlen("encoding \n"),
668 encoding, strlen(encoding));
669 }
670 return tmp.buf;
671 }
672
673 static char *logmsg_reencode(const struct commit *commit,
674 const char *output_encoding)
675 {
676 static const char *utf8 = "utf-8";
677 const char *use_encoding;
678 char *encoding;
679 char *out;
680
681 if (!*output_encoding)
682 return NULL;
683 encoding = get_header(commit, "encoding");
684 use_encoding = encoding ? encoding : utf8;
685 if (!strcmp(use_encoding, output_encoding))
686 if (encoding) /* we'll strip encoding header later */
687 out = xstrdup(commit->buffer);
688 else
689 return NULL; /* nothing to do */
690 else
691 out = reencode_string(commit->buffer,
692 output_encoding, use_encoding);
693 if (out)
694 out = replace_encoding_header(out, output_encoding);
695
696 free(encoding);
697 return out;
698 }
699
700 static void fill_person(struct interp *table, const char *msg, int len)
701 {
702 int start, end, tz = 0;
703 unsigned long date;
704 char *ep;
705
706 /* parse name */
707 for (end = 0; end < len && msg[end] != '<'; end++)
708 ; /* do nothing */
709 start = end + 1;
710 while (end > 0 && isspace(msg[end - 1]))
711 end--;
712 table[0].value = xstrndup(msg, end);
713
714 if (start >= len)
715 return;
716
717 /* parse email */
718 for (end = start + 1; end < len && msg[end] != '>'; end++)
719 ; /* do nothing */
720
721 if (end >= len)
722 return;
723
724 table[1].value = xstrndup(msg + start, end - start);
725
726 /* parse date */
727 for (start = end + 1; start < len && isspace(msg[start]); start++)
728 ; /* do nothing */
729 if (start >= len)
730 return;
731 date = strtoul(msg + start, &ep, 10);
732 if (msg + start == ep)
733 return;
734
735 table[5].value = xstrndup(msg + start, ep - (msg + start));
736
737 /* parse tz */
738 for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
739 ; /* do nothing */
740 if (start + 1 < len) {
741 tz = strtoul(msg + start + 1, NULL, 10);
742 if (msg[start] == '-')
743 tz = -tz;
744 }
745
746 interp_set_entry(table, 2, show_date(date, tz, DATE_NORMAL));
747 interp_set_entry(table, 3, show_date(date, tz, DATE_RFC2822));
748 interp_set_entry(table, 4, show_date(date, tz, DATE_RELATIVE));
749 interp_set_entry(table, 6, show_date(date, tz, DATE_ISO8601));
750 }
751
752 void format_commit_message(const struct commit *commit,
753 const void *format, struct strbuf *sb)
754 {
755 struct interp table[] = {
756 { "%H" }, /* commit hash */
757 { "%h" }, /* abbreviated commit hash */
758 { "%T" }, /* tree hash */
759 { "%t" }, /* abbreviated tree hash */
760 { "%P" }, /* parent hashes */
761 { "%p" }, /* abbreviated parent hashes */
762 { "%an" }, /* author name */
763 { "%ae" }, /* author email */
764 { "%ad" }, /* author date */
765 { "%aD" }, /* author date, RFC2822 style */
766 { "%ar" }, /* author date, relative */
767 { "%at" }, /* author date, UNIX timestamp */
768 { "%ai" }, /* author date, ISO 8601 */
769 { "%cn" }, /* committer name */
770 { "%ce" }, /* committer email */
771 { "%cd" }, /* committer date */
772 { "%cD" }, /* committer date, RFC2822 style */
773 { "%cr" }, /* committer date, relative */
774 { "%ct" }, /* committer date, UNIX timestamp */
775 { "%ci" }, /* committer date, ISO 8601 */
776 { "%e" }, /* encoding */
777 { "%s" }, /* subject */
778 { "%b" }, /* body */
779 { "%Cred" }, /* red */
780 { "%Cgreen" }, /* green */
781 { "%Cblue" }, /* blue */
782 { "%Creset" }, /* reset color */
783 { "%n" }, /* newline */
784 { "%m" }, /* left/right/bottom */
785 };
786 enum interp_index {
787 IHASH = 0, IHASH_ABBREV,
788 ITREE, ITREE_ABBREV,
789 IPARENTS, IPARENTS_ABBREV,
790 IAUTHOR_NAME, IAUTHOR_EMAIL,
791 IAUTHOR_DATE, IAUTHOR_DATE_RFC2822, IAUTHOR_DATE_RELATIVE,
792 IAUTHOR_TIMESTAMP, IAUTHOR_ISO8601,
793 ICOMMITTER_NAME, ICOMMITTER_EMAIL,
794 ICOMMITTER_DATE, ICOMMITTER_DATE_RFC2822,
795 ICOMMITTER_DATE_RELATIVE, ICOMMITTER_TIMESTAMP,
796 ICOMMITTER_ISO8601,
797 IENCODING,
798 ISUBJECT,
799 IBODY,
800 IRED, IGREEN, IBLUE, IRESET_COLOR,
801 INEWLINE,
802 ILEFT_RIGHT,
803 };
804 struct commit_list *p;
805 char parents[1024];
806 unsigned long len;
807 int i;
808 enum { HEADER, SUBJECT, BODY } state;
809 const char *msg = commit->buffer;
810
811 if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
812 die("invalid interp table!");
813
814 /* these are independent of the commit */
815 interp_set_entry(table, IRED, "\033[31m");
816 interp_set_entry(table, IGREEN, "\033[32m");
817 interp_set_entry(table, IBLUE, "\033[34m");
818 interp_set_entry(table, IRESET_COLOR, "\033[m");
819 interp_set_entry(table, INEWLINE, "\n");
820
821 /* these depend on the commit */
822 if (!commit->object.parsed)
823 parse_object(commit->object.sha1);
824 interp_set_entry(table, IHASH, sha1_to_hex(commit->object.sha1));
825 interp_set_entry(table, IHASH_ABBREV,
826 find_unique_abbrev(commit->object.sha1,
827 DEFAULT_ABBREV));
828 interp_set_entry(table, ITREE, sha1_to_hex(commit->tree->object.sha1));
829 interp_set_entry(table, ITREE_ABBREV,
830 find_unique_abbrev(commit->tree->object.sha1,
831 DEFAULT_ABBREV));
832 interp_set_entry(table, ILEFT_RIGHT,
833 (commit->object.flags & BOUNDARY)
834 ? "-"
835 : (commit->object.flags & SYMMETRIC_LEFT)
836 ? "<"
837 : ">");
838
839 parents[1] = 0;
840 for (i = 0, p = commit->parents;
841 p && i < sizeof(parents) - 1;
842 p = p->next)
843 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
844 sha1_to_hex(p->item->object.sha1));
845 interp_set_entry(table, IPARENTS, parents + 1);
846
847 parents[1] = 0;
848 for (i = 0, p = commit->parents;
849 p && i < sizeof(parents) - 1;
850 p = p->next)
851 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
852 find_unique_abbrev(p->item->object.sha1,
853 DEFAULT_ABBREV));
854 interp_set_entry(table, IPARENTS_ABBREV, parents + 1);
855
856 for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
857 int eol;
858 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
859 ; /* do nothing */
860
861 if (state == SUBJECT) {
862 table[ISUBJECT].value = xstrndup(msg + i, eol - i);
863 i = eol;
864 }
865 if (i == eol) {
866 state++;
867 /* strip empty lines */
868 while (msg[eol + 1] == '\n')
869 eol++;
870 } else if (!prefixcmp(msg + i, "author "))
871 fill_person(table + IAUTHOR_NAME,
872 msg + i + 7, eol - i - 7);
873 else if (!prefixcmp(msg + i, "committer "))
874 fill_person(table + ICOMMITTER_NAME,
875 msg + i + 10, eol - i - 10);
876 else if (!prefixcmp(msg + i, "encoding "))
877 table[IENCODING].value =
878 xstrndup(msg + i + 9, eol - i - 9);
879 i = eol;
880 }
881 if (msg[i])
882 table[IBODY].value = xstrdup(msg + i);
883 for (i = 0; i < ARRAY_SIZE(table); i++)
884 if (!table[i].value)
885 interp_set_entry(table, i, "<unknown>");
886
887 len = interpolate(sb->buf + sb->len, strbuf_avail(sb),
888 format, table, ARRAY_SIZE(table));
889 if (len > strbuf_avail(sb)) {
890 strbuf_grow(sb, len);
891 interpolate(sb->buf + sb->len, strbuf_avail(sb) + 1,
892 format, table, ARRAY_SIZE(table));
893 }
894 strbuf_setlen(sb, sb->len + len);
895 interp_clear_table(table, ARRAY_SIZE(table));
896 }
897
898 static void pp_header(enum cmit_fmt fmt,
899 int abbrev,
900 enum date_mode dmode,
901 const char *encoding,
902 const struct commit *commit,
903 const char **msg_p,
904 struct strbuf *sb)
905 {
906 int parents_shown = 0;
907
908 for (;;) {
909 const char *line = *msg_p;
910 int linelen = get_one_line(*msg_p);
911
912 if (!linelen)
913 return;
914 *msg_p += linelen;
915
916 if (linelen == 1)
917 /* End of header */
918 return;
919
920 if (fmt == CMIT_FMT_RAW) {
921 strbuf_add(sb, line, linelen);
922 continue;
923 }
924
925 if (!memcmp(line, "parent ", 7)) {
926 if (linelen != 48)
927 die("bad parent line in commit");
928 continue;
929 }
930
931 if (!parents_shown) {
932 struct commit_list *parent;
933 int num;
934 for (parent = commit->parents, num = 0;
935 parent;
936 parent = parent->next, num++)
937 ;
938 /* with enough slop */
939 strbuf_grow(sb, num * 50 + 20);
940 add_merge_info(fmt, sb, commit, abbrev);
941 parents_shown = 1;
942 }
943
944 /*
945 * MEDIUM == DEFAULT shows only author with dates.
946 * FULL shows both authors but not dates.
947 * FULLER shows both authors and dates.
948 */
949 if (!memcmp(line, "author ", 7)) {
950 strbuf_grow(sb, linelen + 80);
951 add_user_info("Author", fmt, sb, line + 7, dmode, encoding);
952 }
953 if (!memcmp(line, "committer ", 10) &&
954 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER)) {
955 strbuf_grow(sb, linelen + 80);
956 add_user_info("Commit", fmt, sb, line + 10, dmode, encoding);
957 }
958 }
959 }
960
961 static void pp_title_line(enum cmit_fmt fmt,
962 const char **msg_p,
963 struct strbuf *sb,
964 const char *subject,
965 const char *after_subject,
966 const char *encoding,
967 int plain_non_ascii)
968 {
969 struct strbuf title;
970
971 strbuf_init(&title, 80);
972
973 for (;;) {
974 const char *line = *msg_p;
975 int linelen = get_one_line(line);
976
977 *msg_p += linelen;
978 if (!linelen || is_empty_line(line, &linelen))
979 break;
980
981 strbuf_grow(&title, linelen + 2);
982 if (title.len) {
983 if (fmt == CMIT_FMT_EMAIL) {
984 strbuf_addch(&title, '\n');
985 }
986 strbuf_addch(&title, ' ');
987 }
988 strbuf_add(&title, line, linelen);
989 }
990
991 strbuf_grow(sb, title.len + 1024);
992 if (subject) {
993 strbuf_addstr(sb, subject);
994 add_rfc2047(sb, title.buf, title.len, encoding);
995 } else {
996 strbuf_addbuf(sb, &title);
997 }
998 strbuf_addch(sb, '\n');
999
1000 if (plain_non_ascii) {
1001 const char *header_fmt =
1002 "MIME-Version: 1.0\n"
1003 "Content-Type: text/plain; charset=%s\n"
1004 "Content-Transfer-Encoding: 8bit\n";
1005 strbuf_addf(sb, header_fmt, encoding);
1006 }
1007 if (after_subject) {
1008 strbuf_addstr(sb, after_subject);
1009 }
1010 if (fmt == CMIT_FMT_EMAIL) {
1011 strbuf_addch(sb, '\n');
1012 }
1013 strbuf_release(&title);
1014 }
1015
1016 static void pp_remainder(enum cmit_fmt fmt,
1017 const char **msg_p,
1018 struct strbuf *sb,
1019 int indent)
1020 {
1021 int first = 1;
1022 for (;;) {
1023 const char *line = *msg_p;
1024 int linelen = get_one_line(line);
1025 *msg_p += linelen;
1026
1027 if (!linelen)
1028 break;
1029
1030 if (is_empty_line(line, &linelen)) {
1031 if (first)
1032 continue;
1033 if (fmt == CMIT_FMT_SHORT)
1034 break;
1035 }
1036 first = 0;
1037
1038 strbuf_grow(sb, linelen + indent + 20);
1039 if (indent) {
1040 memset(sb->buf + sb->len, ' ', indent);
1041 strbuf_setlen(sb, sb->len + indent);
1042 }
1043 strbuf_add(sb, line, linelen);
1044 strbuf_addch(sb, '\n');
1045 }
1046 }
1047
1048 void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
1049 struct strbuf *sb, int abbrev,
1050 const char *subject, const char *after_subject,
1051 enum date_mode dmode)
1052 {
1053 unsigned long beginning_of_body;
1054 int indent = 4;
1055 const char *msg = commit->buffer;
1056 int plain_non_ascii = 0;
1057 char *reencoded;
1058 const char *encoding;
1059
1060 if (fmt == CMIT_FMT_USERFORMAT) {
1061 format_commit_message(commit, user_format, sb);
1062 return;
1063 }
1064
1065 encoding = (git_log_output_encoding
1066 ? git_log_output_encoding
1067 : git_commit_encoding);
1068 if (!encoding)
1069 encoding = "utf-8";
1070 reencoded = logmsg_reencode(commit, encoding);
1071 if (reencoded) {
1072 msg = reencoded;
1073 }
1074
1075 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
1076 indent = 0;
1077
1078 /* After-subject is used to pass in Content-Type: multipart
1079 * MIME header; in that case we do not have to do the
1080 * plaintext content type even if the commit message has
1081 * non 7-bit ASCII character. Otherwise, check if we need
1082 * to say this is not a 7-bit ASCII.
1083 */
1084 if (fmt == CMIT_FMT_EMAIL && !after_subject) {
1085 int i, ch, in_body;
1086
1087 for (in_body = i = 0; (ch = msg[i]); i++) {
1088 if (!in_body) {
1089 /* author could be non 7-bit ASCII but
1090 * the log may be so; skip over the
1091 * header part first.
1092 */
1093 if (ch == '\n' && msg[i+1] == '\n')
1094 in_body = 1;
1095 }
1096 else if (non_ascii(ch)) {
1097 plain_non_ascii = 1;
1098 break;
1099 }
1100 }
1101 }
1102
1103 pp_header(fmt, abbrev, dmode, encoding, commit, &msg, sb);
1104 if (fmt != CMIT_FMT_ONELINE && !subject) {
1105 strbuf_addch(sb, '\n');
1106 }
1107
1108 /* Skip excess blank lines at the beginning of body, if any... */
1109 for (;;) {
1110 int linelen = get_one_line(msg);
1111 int ll = linelen;
1112 if (!linelen)
1113 break;
1114 if (!is_empty_line(msg, &ll))
1115 break;
1116 msg += linelen;
1117 }
1118
1119 /* These formats treat the title line specially. */
1120 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
1121 pp_title_line(fmt, &msg, sb, subject,
1122 after_subject, encoding, plain_non_ascii);
1123
1124 beginning_of_body = sb->len;
1125 if (fmt != CMIT_FMT_ONELINE)
1126 pp_remainder(fmt, &msg, sb, indent);
1127 strbuf_rtrim(sb);
1128
1129 /* Make sure there is an EOLN for the non-oneline case */
1130 if (fmt != CMIT_FMT_ONELINE)
1131 strbuf_addch(sb, '\n');
1132
1133 /*
1134 * The caller may append additional body text in e-mail
1135 * format. Make sure we did not strip the blank line
1136 * between the header and the body.
1137 */
1138 if (fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
1139 strbuf_addch(sb, '\n');
1140 free(reencoded);
1141 }
1142
1143 struct commit *pop_commit(struct commit_list **stack)
1144 {
1145 struct commit_list *top = *stack;
1146 struct commit *item = top ? top->item : NULL;
1147
1148 if (top) {
1149 *stack = top->next;
1150 free(top);
1151 }
1152 return item;
1153 }
1154
1155 void topo_sort_default_setter(struct commit *c, void *data)
1156 {
1157 c->util = data;
1158 }
1159
1160 void *topo_sort_default_getter(struct commit *c)
1161 {
1162 return c->util;
1163 }
1164
1165 /*
1166 * Performs an in-place topological sort on the list supplied.
1167 */
1168 void sort_in_topological_order(struct commit_list ** list, int lifo)
1169 {
1170 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
1171 topo_sort_default_getter);
1172 }
1173
1174 void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1175 topo_sort_set_fn_t setter,
1176 topo_sort_get_fn_t getter)
1177 {
1178 struct commit_list * next = *list;
1179 struct commit_list * work = NULL, **insert;
1180 struct commit_list ** pptr = list;
1181 struct sort_node * nodes;
1182 struct sort_node * next_nodes;
1183 int count = 0;
1184
1185 /* determine the size of the list */
1186 while (next) {
1187 next = next->next;
1188 count++;
1189 }
1190
1191 if (!count)
1192 return;
1193 /* allocate an array to help sort the list */
1194 nodes = xcalloc(count, sizeof(*nodes));
1195 /* link the list to the array */
1196 next_nodes = nodes;
1197 next=*list;
1198 while (next) {
1199 next_nodes->list_item = next;
1200 setter(next->item, next_nodes);
1201 next_nodes++;
1202 next = next->next;
1203 }
1204 /* update the indegree */
1205 next=*list;
1206 while (next) {
1207 struct commit_list * parents = next->item->parents;
1208 while (parents) {
1209 struct commit * parent=parents->item;
1210 struct sort_node * pn = (struct sort_node *) getter(parent);
1211
1212 if (pn)
1213 pn->indegree++;
1214 parents=parents->next;
1215 }
1216 next=next->next;
1217 }
1218 /*
1219 * find the tips
1220 *
1221 * tips are nodes not reachable from any other node in the list
1222 *
1223 * the tips serve as a starting set for the work queue.
1224 */
1225 next=*list;
1226 insert = &work;
1227 while (next) {
1228 struct sort_node * node = (struct sort_node *) getter(next->item);
1229
1230 if (node->indegree == 0) {
1231 insert = &commit_list_insert(next->item, insert)->next;
1232 }
1233 next=next->next;
1234 }
1235
1236 /* process the list in topological order */
1237 if (!lifo)
1238 sort_by_date(&work);
1239 while (work) {
1240 struct commit * work_item = pop_commit(&work);
1241 struct sort_node * work_node = (struct sort_node *) getter(work_item);
1242 struct commit_list * parents = work_item->parents;
1243
1244 while (parents) {
1245 struct commit * parent=parents->item;
1246 struct sort_node * pn = (struct sort_node *) getter(parent);
1247
1248 if (pn) {
1249 /*
1250 * parents are only enqueued for emission
1251 * when all their children have been emitted thereby
1252 * guaranteeing topological order.
1253 */
1254 pn->indegree--;
1255 if (!pn->indegree) {
1256 if (!lifo)
1257 insert_by_date(parent, &work);
1258 else
1259 commit_list_insert(parent, &work);
1260 }
1261 }
1262 parents=parents->next;
1263 }
1264 /*
1265 * work_item is a commit all of whose children
1266 * have already been emitted. we can emit it now.
1267 */
1268 *pptr = work_node->list_item;
1269 pptr = &(*pptr)->next;
1270 *pptr = NULL;
1271 setter(work_item, NULL);
1272 }
1273 free(nodes);
1274 }
1275
1276 /* merge-base stuff */
1277
1278 /* bits #0..15 in revision.h */
1279 #define PARENT1 (1u<<16)
1280 #define PARENT2 (1u<<17)
1281 #define STALE (1u<<18)
1282 #define RESULT (1u<<19)
1283
1284 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1285
1286 static struct commit *interesting(struct commit_list *list)
1287 {
1288 while (list) {
1289 struct commit *commit = list->item;
1290 list = list->next;
1291 if (commit->object.flags & STALE)
1292 continue;
1293 return commit;
1294 }
1295 return NULL;
1296 }
1297
1298 static struct commit_list *merge_bases(struct commit *one, struct commit *two)
1299 {
1300 struct commit_list *list = NULL;
1301 struct commit_list *result = NULL;
1302
1303 if (one == two)
1304 /* We do not mark this even with RESULT so we do not
1305 * have to clean it up.
1306 */
1307 return commit_list_insert(one, &result);
1308
1309 parse_commit(one);
1310 parse_commit(two);
1311
1312 one->object.flags |= PARENT1;
1313 two->object.flags |= PARENT2;
1314 insert_by_date(one, &list);
1315 insert_by_date(two, &list);
1316
1317 while (interesting(list)) {
1318 struct commit *commit;
1319 struct commit_list *parents;
1320 struct commit_list *n;
1321 int flags;
1322
1323 commit = list->item;
1324 n = list->next;
1325 free(list);
1326 list = n;
1327
1328 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
1329 if (flags == (PARENT1 | PARENT2)) {
1330 if (!(commit->object.flags & RESULT)) {
1331 commit->object.flags |= RESULT;
1332 insert_by_date(commit, &result);
1333 }
1334 /* Mark parents of a found merge stale */
1335 flags |= STALE;
1336 }
1337 parents = commit->parents;
1338 while (parents) {
1339 struct commit *p = parents->item;
1340 parents = parents->next;
1341 if ((p->object.flags & flags) == flags)
1342 continue;
1343 parse_commit(p);
1344 p->object.flags |= flags;
1345 insert_by_date(p, &list);
1346 }
1347 }
1348
1349 /* Clean up the result to remove stale ones */
1350 free_commit_list(list);
1351 list = result; result = NULL;
1352 while (list) {
1353 struct commit_list *n = list->next;
1354 if (!(list->item->object.flags & STALE))
1355 insert_by_date(list->item, &result);
1356 free(list);
1357 list = n;
1358 }
1359 return result;
1360 }
1361
1362 struct commit_list *get_merge_bases(struct commit *one,
1363 struct commit *two, int cleanup)
1364 {
1365 struct commit_list *list;
1366 struct commit **rslt;
1367 struct commit_list *result;
1368 int cnt, i, j;
1369
1370 result = merge_bases(one, two);
1371 if (one == two)
1372 return result;
1373 if (!result || !result->next) {
1374 if (cleanup) {
1375 clear_commit_marks(one, all_flags);
1376 clear_commit_marks(two, all_flags);
1377 }
1378 return result;
1379 }
1380
1381 /* There are more than one */
1382 cnt = 0;
1383 list = result;
1384 while (list) {
1385 list = list->next;
1386 cnt++;
1387 }
1388 rslt = xcalloc(cnt, sizeof(*rslt));
1389 for (list = result, i = 0; list; list = list->next)
1390 rslt[i++] = list->item;
1391 free_commit_list(result);
1392
1393 clear_commit_marks(one, all_flags);
1394 clear_commit_marks(two, all_flags);
1395 for (i = 0; i < cnt - 1; i++) {
1396 for (j = i+1; j < cnt; j++) {
1397 if (!rslt[i] || !rslt[j])
1398 continue;
1399 result = merge_bases(rslt[i], rslt[j]);
1400 clear_commit_marks(rslt[i], all_flags);
1401 clear_commit_marks(rslt[j], all_flags);
1402 for (list = result; list; list = list->next) {
1403 if (rslt[i] == list->item)
1404 rslt[i] = NULL;
1405 if (rslt[j] == list->item)
1406 rslt[j] = NULL;
1407 }
1408 }
1409 }
1410
1411 /* Surviving ones in rslt[] are the independent results */
1412 result = NULL;
1413 for (i = 0; i < cnt; i++) {
1414 if (rslt[i])
1415 insert_by_date(rslt[i], &result);
1416 }
1417 free(rslt);
1418 return result;
1419 }
1420
1421 int in_merge_bases(struct commit *commit, struct commit **reference, int num)
1422 {
1423 struct commit_list *bases, *b;
1424 int ret = 0;
1425
1426 if (num == 1)
1427 bases = get_merge_bases(commit, *reference, 1);
1428 else
1429 die("not yet");
1430 for (b = bases; b; b = b->next) {
1431 if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
1432 ret = 1;
1433 break;
1434 }
1435 }
1436
1437 free_commit_list(bases);
1438 return ret;
1439 }
git with Jakub Narębski modifications