?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Bisect: refactor some logging into "bisect_write".
[git/dscho.git] / commit.c
blobac24266e935054c6909b8fbd513ffa937e2ae092
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 while (commit) {
445 struct commit_list *parents;
446
447 if (!(mark & commit->object.flags))
448 return;
449
450 commit->object.flags &= ~mark;
451
452 parents = commit->parents;
453 if (!parents)
454 return;
455
456 while ((parents = parents->next))
457 clear_commit_marks(parents->item, mark);
458
459 commit = commit->parents->item;
460 }
461 }
462
463 /*
464 * Generic support for pretty-printing the header
465 */
466 static int get_one_line(const char *msg)
467 {
468 int ret = 0;
469
470 for (;;) {
471 char c = *msg++;
472 if (!c)
473 break;
474 ret++;
475 if (c == '\n')
476 break;
477 }
478 return ret;
479 }
480
481 /* High bit set, or ISO-2022-INT */
482 static int non_ascii(int ch)
483 {
484 ch = (ch & 0xff);
485 return ((ch & 0x80) || (ch == 0x1b));
486 }
487
488 static int is_rfc2047_special(char ch)
489 {
490 return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
491 }
492
493 static void add_rfc2047(struct strbuf *sb, const char *line, int len,
494 const char *encoding)
495 {
496 int i, last;
497
498 for (i = 0; i < len; i++) {
499 int ch = line[i];
500 if (non_ascii(ch))
501 goto needquote;
502 if ((i + 1 < len) && (ch == '=' && line[i+1] == '?'))
503 goto needquote;
504 }
505 strbuf_add(sb, line, len);
506 return;
507
508 needquote:
509 strbuf_grow(sb, len * 3 + strlen(encoding) + 100);
510 strbuf_addf(sb, "=?%s?q?", encoding);
511 for (i = last = 0; i < len; i++) {
512 unsigned ch = line[i] & 0xFF;
513 /*
514 * We encode ' ' using '=20' even though rfc2047
515 * allows using '_' for readability. Unfortunately,
516 * many programs do not understand this and just
517 * leave the underscore in place.
518 */
519 if (is_rfc2047_special(ch) || ch == ' ') {
520 strbuf_add(sb, line + last, i - last);
521 strbuf_addf(sb, "=%02X", ch);
522 last = i + 1;
523 }
524 }
525 strbuf_add(sb, line + last, len - last);
526 strbuf_addstr(sb, "?=");
527 }
528
529 static void add_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
530 const char *line, enum date_mode dmode,
531 const char *encoding)
532 {
533 char *date;
534 int namelen;
535 unsigned long time;
536 int tz;
537 const char *filler = " ";
538
539 if (fmt == CMIT_FMT_ONELINE)
540 return;
541 date = strchr(line, '>');
542 if (!date)
543 return;
544 namelen = ++date - line;
545 time = strtoul(date, &date, 10);
546 tz = strtol(date, NULL, 10);
547
548 if (fmt == CMIT_FMT_EMAIL) {
549 char *name_tail = strchr(line, '<');
550 int display_name_length;
551 if (!name_tail)
552 return;
553 while (line < name_tail && isspace(name_tail[-1]))
554 name_tail--;
555 display_name_length = name_tail - line;
556 filler = "";
557 strbuf_addstr(sb, "From: ");
558 add_rfc2047(sb, line, display_name_length, encoding);
559 strbuf_add(sb, name_tail, namelen - display_name_length);
560 strbuf_addch(sb, '\n');
561 } else {
562 strbuf_addf(sb, "%s: %.*s%.*s\n", what,
563 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
564 filler, namelen, line);
565 }
566 switch (fmt) {
567 case CMIT_FMT_MEDIUM:
568 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, dmode));
569 break;
570 case CMIT_FMT_EMAIL:
571 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, DATE_RFC2822));
572 break;
573 case CMIT_FMT_FULLER:
574 strbuf_addf(sb, "%sDate: %s\n", what, show_date(time, tz, dmode));
575 break;
576 default:
577 /* notin' */
578 break;
579 }
580 }
581
582 static int is_empty_line(const char *line, int *len_p)
583 {
584 int len = *len_p;
585 while (len && isspace(line[len-1]))
586 len--;
587 *len_p = len;
588 return !len;
589 }
590
591 static void add_merge_info(enum cmit_fmt fmt, struct strbuf *sb,
592 const struct commit *commit, int abbrev)
593 {
594 struct commit_list *parent = commit->parents;
595
596 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
597 !parent || !parent->next)
598 return;
599
600 strbuf_addstr(sb, "Merge:");
601
602 while (parent) {
603 struct commit *p = parent->item;
604 const char *hex = NULL;
605 const char *dots;
606 if (abbrev)
607 hex = find_unique_abbrev(p->object.sha1, abbrev);
608 if (!hex)
609 hex = sha1_to_hex(p->object.sha1);
610 dots = (abbrev && strlen(hex) != 40) ? "..." : "";
611 parent = parent->next;
612
613 strbuf_addf(sb, " %s%s", hex, dots);
614 }
615 strbuf_addch(sb, '\n');
616 }
617
618 static char *get_header(const struct commit *commit, const char *key)
619 {
620 int key_len = strlen(key);
621 const char *line = commit->buffer;
622
623 for (;;) {
624 const char *eol = strchr(line, '\n'), *next;
625
626 if (line == eol)
627 return NULL;
628 if (!eol) {
629 eol = line + strlen(line);
630 next = NULL;
631 } else
632 next = eol + 1;
633 if (eol - line > key_len &&
634 !strncmp(line, key, key_len) &&
635 line[key_len] == ' ') {
636 return xmemdupz(line + key_len + 1, eol - line - key_len - 1);
637 }
638 line = next;
639 }
640 }
641
642 static char *replace_encoding_header(char *buf, const char *encoding)
643 {
644 struct strbuf tmp;
645 size_t start, len;
646 char *cp = buf;
647
648 /* guess if there is an encoding header before a \n\n */
649 while (strncmp(cp, "encoding ", strlen("encoding "))) {
650 cp = strchr(cp, '\n');
651 if (!cp || *++cp == '\n')
652 return buf;
653 }
654 start = cp - buf;
655 cp = strchr(cp, '\n');
656 if (!cp)
657 return buf; /* should not happen but be defensive */
658 len = cp + 1 - (buf + start);
659
660 strbuf_init(&tmp, 0);
661 strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1);
662 if (is_encoding_utf8(encoding)) {
663 /* we have re-coded to UTF-8; drop the header */
664 strbuf_remove(&tmp, start, len);
665 } else {
666 /* just replaces XXXX in 'encoding XXXX\n' */
667 strbuf_splice(&tmp, start + strlen("encoding "),
668 len - strlen("encoding \n"),
669 encoding, strlen(encoding));
670 }
671 return strbuf_detach(&tmp, NULL);
672 }
673
674 static char *logmsg_reencode(const struct commit *commit,
675 const char *output_encoding)
676 {
677 static const char *utf8 = "utf-8";
678 const char *use_encoding;
679 char *encoding;
680 char *out;
681
682 if (!*output_encoding)
683 return NULL;
684 encoding = get_header(commit, "encoding");
685 use_encoding = encoding ? encoding : utf8;
686 if (!strcmp(use_encoding, output_encoding))
687 if (encoding) /* we'll strip encoding header later */
688 out = xstrdup(commit->buffer);
689 else
690 return NULL; /* nothing to do */
691 else
692 out = reencode_string(commit->buffer,
693 output_encoding, use_encoding);
694 if (out)
695 out = replace_encoding_header(out, output_encoding);
696
697 free(encoding);
698 return out;
699 }
700
701 static void fill_person(struct interp *table, const char *msg, int len)
702 {
703 int start, end, tz = 0;
704 unsigned long date;
705 char *ep;
706
707 /* parse name */
708 for (end = 0; end < len && msg[end] != '<'; end++)
709 ; /* do nothing */
710 start = end + 1;
711 while (end > 0 && isspace(msg[end - 1]))
712 end--;
713 table[0].value = xmemdupz(msg, end);
714
715 if (start >= len)
716 return;
717
718 /* parse email */
719 for (end = start + 1; end < len && msg[end] != '>'; end++)
720 ; /* do nothing */
721
722 if (end >= len)
723 return;
724
725 table[1].value = xmemdupz(msg + start, end - start);
726
727 /* parse date */
728 for (start = end + 1; start < len && isspace(msg[start]); start++)
729 ; /* do nothing */
730 if (start >= len)
731 return;
732 date = strtoul(msg + start, &ep, 10);
733 if (msg + start == ep)
734 return;
735
736 table[5].value = xmemdupz(msg + start, ep - (msg + start));
737
738 /* parse tz */
739 for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
740 ; /* do nothing */
741 if (start + 1 < len) {
742 tz = strtoul(msg + start + 1, NULL, 10);
743 if (msg[start] == '-')
744 tz = -tz;
745 }
746
747 interp_set_entry(table, 2, show_date(date, tz, DATE_NORMAL));
748 interp_set_entry(table, 3, show_date(date, tz, DATE_RFC2822));
749 interp_set_entry(table, 4, show_date(date, tz, DATE_RELATIVE));
750 interp_set_entry(table, 6, show_date(date, tz, DATE_ISO8601));
751 }
752
753 void format_commit_message(const struct commit *commit,
754 const void *format, struct strbuf *sb)
755 {
756 struct interp table[] = {
757 { "%H" }, /* commit hash */
758 { "%h" }, /* abbreviated commit hash */
759 { "%T" }, /* tree hash */
760 { "%t" }, /* abbreviated tree hash */
761 { "%P" }, /* parent hashes */
762 { "%p" }, /* abbreviated parent hashes */
763 { "%an" }, /* author name */
764 { "%ae" }, /* author email */
765 { "%ad" }, /* author date */
766 { "%aD" }, /* author date, RFC2822 style */
767 { "%ar" }, /* author date, relative */
768 { "%at" }, /* author date, UNIX timestamp */
769 { "%ai" }, /* author date, ISO 8601 */
770 { "%cn" }, /* committer name */
771 { "%ce" }, /* committer email */
772 { "%cd" }, /* committer date */
773 { "%cD" }, /* committer date, RFC2822 style */
774 { "%cr" }, /* committer date, relative */
775 { "%ct" }, /* committer date, UNIX timestamp */
776 { "%ci" }, /* committer date, ISO 8601 */
777 { "%e" }, /* encoding */
778 { "%s" }, /* subject */
779 { "%b" }, /* body */
780 { "%Cred" }, /* red */
781 { "%Cgreen" }, /* green */
782 { "%Cblue" }, /* blue */
783 { "%Creset" }, /* reset color */
784 { "%n" }, /* newline */
785 { "%m" }, /* left/right/bottom */
786 };
787 enum interp_index {
788 IHASH = 0, IHASH_ABBREV,
789 ITREE, ITREE_ABBREV,
790 IPARENTS, IPARENTS_ABBREV,
791 IAUTHOR_NAME, IAUTHOR_EMAIL,
792 IAUTHOR_DATE, IAUTHOR_DATE_RFC2822, IAUTHOR_DATE_RELATIVE,
793 IAUTHOR_TIMESTAMP, IAUTHOR_ISO8601,
794 ICOMMITTER_NAME, ICOMMITTER_EMAIL,
795 ICOMMITTER_DATE, ICOMMITTER_DATE_RFC2822,
796 ICOMMITTER_DATE_RELATIVE, ICOMMITTER_TIMESTAMP,
797 ICOMMITTER_ISO8601,
798 IENCODING,
799 ISUBJECT,
800 IBODY,
801 IRED, IGREEN, IBLUE, IRESET_COLOR,
802 INEWLINE,
803 ILEFT_RIGHT,
804 };
805 struct commit_list *p;
806 char parents[1024];
807 unsigned long len;
808 int i;
809 enum { HEADER, SUBJECT, BODY } state;
810 const char *msg = commit->buffer;
811
812 if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
813 die("invalid interp table!");
814
815 /* these are independent of the commit */
816 interp_set_entry(table, IRED, "\033[31m");
817 interp_set_entry(table, IGREEN, "\033[32m");
818 interp_set_entry(table, IBLUE, "\033[34m");
819 interp_set_entry(table, IRESET_COLOR, "\033[m");
820 interp_set_entry(table, INEWLINE, "\n");
821
822 /* these depend on the commit */
823 if (!commit->object.parsed)
824 parse_object(commit->object.sha1);
825 interp_set_entry(table, IHASH, sha1_to_hex(commit->object.sha1));
826 interp_set_entry(table, IHASH_ABBREV,
827 find_unique_abbrev(commit->object.sha1,
828 DEFAULT_ABBREV));
829 interp_set_entry(table, ITREE, sha1_to_hex(commit->tree->object.sha1));
830 interp_set_entry(table, ITREE_ABBREV,
831 find_unique_abbrev(commit->tree->object.sha1,
832 DEFAULT_ABBREV));
833 interp_set_entry(table, ILEFT_RIGHT,
834 (commit->object.flags & BOUNDARY)
835 ? "-"
836 : (commit->object.flags & SYMMETRIC_LEFT)
837 ? "<"
838 : ">");
839
840 parents[1] = 0;
841 for (i = 0, p = commit->parents;
842 p && i < sizeof(parents) - 1;
843 p = p->next)
844 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
845 sha1_to_hex(p->item->object.sha1));
846 interp_set_entry(table, IPARENTS, parents + 1);
847
848 parents[1] = 0;
849 for (i = 0, p = commit->parents;
850 p && i < sizeof(parents) - 1;
851 p = p->next)
852 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
853 find_unique_abbrev(p->item->object.sha1,
854 DEFAULT_ABBREV));
855 interp_set_entry(table, IPARENTS_ABBREV, parents + 1);
856
857 for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
858 int eol;
859 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
860 ; /* do nothing */
861
862 if (state == SUBJECT) {
863 table[ISUBJECT].value = xmemdupz(msg + i, eol - i);
864 i = eol;
865 }
866 if (i == eol) {
867 state++;
868 /* strip empty lines */
869 while (msg[eol + 1] == '\n')
870 eol++;
871 } else if (!prefixcmp(msg + i, "author "))
872 fill_person(table + IAUTHOR_NAME,
873 msg + i + 7, eol - i - 7);
874 else if (!prefixcmp(msg + i, "committer "))
875 fill_person(table + ICOMMITTER_NAME,
876 msg + i + 10, eol - i - 10);
877 else if (!prefixcmp(msg + i, "encoding "))
878 table[IENCODING].value =
879 xmemdupz(msg + i + 9, eol - i - 9);
880 i = eol;
881 }
882 if (msg[i])
883 table[IBODY].value = xstrdup(msg + i);
884
885 len = interpolate(sb->buf + sb->len, strbuf_avail(sb),
886 format, table, ARRAY_SIZE(table));
887 if (len > strbuf_avail(sb)) {
888 strbuf_grow(sb, len);
889 interpolate(sb->buf + sb->len, strbuf_avail(sb) + 1,
890 format, table, ARRAY_SIZE(table));
891 }
892 strbuf_setlen(sb, sb->len + len);
893 interp_clear_table(table, ARRAY_SIZE(table));
894 }
895
896 static void pp_header(enum cmit_fmt fmt,
897 int abbrev,
898 enum date_mode dmode,
899 const char *encoding,
900 const struct commit *commit,
901 const char **msg_p,
902 struct strbuf *sb)
903 {
904 int parents_shown = 0;
905
906 for (;;) {
907 const char *line = *msg_p;
908 int linelen = get_one_line(*msg_p);
909
910 if (!linelen)
911 return;
912 *msg_p += linelen;
913
914 if (linelen == 1)
915 /* End of header */
916 return;
917
918 if (fmt == CMIT_FMT_RAW) {
919 strbuf_add(sb, line, linelen);
920 continue;
921 }
922
923 if (!memcmp(line, "parent ", 7)) {
924 if (linelen != 48)
925 die("bad parent line in commit");
926 continue;
927 }
928
929 if (!parents_shown) {
930 struct commit_list *parent;
931 int num;
932 for (parent = commit->parents, num = 0;
933 parent;
934 parent = parent->next, num++)
935 ;
936 /* with enough slop */
937 strbuf_grow(sb, num * 50 + 20);
938 add_merge_info(fmt, sb, commit, abbrev);
939 parents_shown = 1;
940 }
941
942 /*
943 * MEDIUM == DEFAULT shows only author with dates.
944 * FULL shows both authors but not dates.
945 * FULLER shows both authors and dates.
946 */
947 if (!memcmp(line, "author ", 7)) {
948 strbuf_grow(sb, linelen + 80);
949 add_user_info("Author", fmt, sb, line + 7, dmode, encoding);
950 }
951 if (!memcmp(line, "committer ", 10) &&
952 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER)) {
953 strbuf_grow(sb, linelen + 80);
954 add_user_info("Commit", fmt, sb, line + 10, dmode, encoding);
955 }
956 }
957 }
958
959 static void pp_title_line(enum cmit_fmt fmt,
960 const char **msg_p,
961 struct strbuf *sb,
962 const char *subject,
963 const char *after_subject,
964 const char *encoding,
965 int plain_non_ascii)
966 {
967 struct strbuf title;
968
969 strbuf_init(&title, 80);
970
971 for (;;) {
972 const char *line = *msg_p;
973 int linelen = get_one_line(line);
974
975 *msg_p += linelen;
976 if (!linelen || is_empty_line(line, &linelen))
977 break;
978
979 strbuf_grow(&title, linelen + 2);
980 if (title.len) {
981 if (fmt == CMIT_FMT_EMAIL) {
982 strbuf_addch(&title, '\n');
983 }
984 strbuf_addch(&title, ' ');
985 }
986 strbuf_add(&title, line, linelen);
987 }
988
989 strbuf_grow(sb, title.len + 1024);
990 if (subject) {
991 strbuf_addstr(sb, subject);
992 add_rfc2047(sb, title.buf, title.len, encoding);
993 } else {
994 strbuf_addbuf(sb, &title);
995 }
996 strbuf_addch(sb, '\n');
997
998 if (plain_non_ascii) {
999 const char *header_fmt =
1000 "MIME-Version: 1.0\n"
1001 "Content-Type: text/plain; charset=%s\n"
1002 "Content-Transfer-Encoding: 8bit\n";
1003 strbuf_addf(sb, header_fmt, encoding);
1004 }
1005 if (after_subject) {
1006 strbuf_addstr(sb, after_subject);
1007 }
1008 if (fmt == CMIT_FMT_EMAIL) {
1009 strbuf_addch(sb, '\n');
1010 }
1011 strbuf_release(&title);
1012 }
1013
1014 static void pp_remainder(enum cmit_fmt fmt,
1015 const char **msg_p,
1016 struct strbuf *sb,
1017 int indent)
1018 {
1019 int first = 1;
1020 for (;;) {
1021 const char *line = *msg_p;
1022 int linelen = get_one_line(line);
1023 *msg_p += linelen;
1024
1025 if (!linelen)
1026 break;
1027
1028 if (is_empty_line(line, &linelen)) {
1029 if (first)
1030 continue;
1031 if (fmt == CMIT_FMT_SHORT)
1032 break;
1033 }
1034 first = 0;
1035
1036 strbuf_grow(sb, linelen + indent + 20);
1037 if (indent) {
1038 memset(sb->buf + sb->len, ' ', indent);
1039 strbuf_setlen(sb, sb->len + indent);
1040 }
1041 strbuf_add(sb, line, linelen);
1042 strbuf_addch(sb, '\n');
1043 }
1044 }
1045
1046 void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
1047 struct strbuf *sb, int abbrev,
1048 const char *subject, const char *after_subject,
1049 enum date_mode dmode)
1050 {
1051 unsigned long beginning_of_body;
1052 int indent = 4;
1053 const char *msg = commit->buffer;
1054 int plain_non_ascii = 0;
1055 char *reencoded;
1056 const char *encoding;
1057
1058 if (fmt == CMIT_FMT_USERFORMAT) {
1059 format_commit_message(commit, user_format, sb);
1060 return;
1061 }
1062
1063 encoding = (git_log_output_encoding
1064 ? git_log_output_encoding
1065 : git_commit_encoding);
1066 if (!encoding)
1067 encoding = "utf-8";
1068 reencoded = logmsg_reencode(commit, encoding);
1069 if (reencoded) {
1070 msg = reencoded;
1071 }
1072
1073 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
1074 indent = 0;
1075
1076 /* After-subject is used to pass in Content-Type: multipart
1077 * MIME header; in that case we do not have to do the
1078 * plaintext content type even if the commit message has
1079 * non 7-bit ASCII character. Otherwise, check if we need
1080 * to say this is not a 7-bit ASCII.
1081 */
1082 if (fmt == CMIT_FMT_EMAIL && !after_subject) {
1083 int i, ch, in_body;
1084
1085 for (in_body = i = 0; (ch = msg[i]); i++) {
1086 if (!in_body) {
1087 /* author could be non 7-bit ASCII but
1088 * the log may be so; skip over the
1089 * header part first.
1090 */
1091 if (ch == '\n' && msg[i+1] == '\n')
1092 in_body = 1;
1093 }
1094 else if (non_ascii(ch)) {
1095 plain_non_ascii = 1;
1096 break;
1097 }
1098 }
1099 }
1100
1101 pp_header(fmt, abbrev, dmode, encoding, commit, &msg, sb);
1102 if (fmt != CMIT_FMT_ONELINE && !subject) {
1103 strbuf_addch(sb, '\n');
1104 }
1105
1106 /* Skip excess blank lines at the beginning of body, if any... */
1107 for (;;) {
1108 int linelen = get_one_line(msg);
1109 int ll = linelen;
1110 if (!linelen)
1111 break;
1112 if (!is_empty_line(msg, &ll))
1113 break;
1114 msg += linelen;
1115 }
1116
1117 /* These formats treat the title line specially. */
1118 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
1119 pp_title_line(fmt, &msg, sb, subject,
1120 after_subject, encoding, plain_non_ascii);
1121
1122 beginning_of_body = sb->len;
1123 if (fmt != CMIT_FMT_ONELINE)
1124 pp_remainder(fmt, &msg, sb, indent);
1125 strbuf_rtrim(sb);
1126
1127 /* Make sure there is an EOLN for the non-oneline case */
1128 if (fmt != CMIT_FMT_ONELINE)
1129 strbuf_addch(sb, '\n');
1130
1131 /*
1132 * The caller may append additional body text in e-mail
1133 * format. Make sure we did not strip the blank line
1134 * between the header and the body.
1135 */
1136 if (fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
1137 strbuf_addch(sb, '\n');
1138 free(reencoded);
1139 }
1140
1141 struct commit *pop_commit(struct commit_list **stack)
1142 {
1143 struct commit_list *top = *stack;
1144 struct commit *item = top ? top->item : NULL;
1145
1146 if (top) {
1147 *stack = top->next;
1148 free(top);
1149 }
1150 return item;
1151 }
1152
1153 void topo_sort_default_setter(struct commit *c, void *data)
1154 {
1155 c->util = data;
1156 }
1157
1158 void *topo_sort_default_getter(struct commit *c)
1159 {
1160 return c->util;
1161 }
1162
1163 /*
1164 * Performs an in-place topological sort on the list supplied.
1165 */
1166 void sort_in_topological_order(struct commit_list ** list, int lifo)
1167 {
1168 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
1169 topo_sort_default_getter);
1170 }
1171
1172 void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1173 topo_sort_set_fn_t setter,
1174 topo_sort_get_fn_t getter)
1175 {
1176 struct commit_list * next = *list;
1177 struct commit_list * work = NULL, **insert;
1178 struct commit_list ** pptr = list;
1179 struct sort_node * nodes;
1180 struct sort_node * next_nodes;
1181 int count = 0;
1182
1183 /* determine the size of the list */
1184 while (next) {
1185 next = next->next;
1186 count++;
1187 }
1188
1189 if (!count)
1190 return;
1191 /* allocate an array to help sort the list */
1192 nodes = xcalloc(count, sizeof(*nodes));
1193 /* link the list to the array */
1194 next_nodes = nodes;
1195 next=*list;
1196 while (next) {
1197 next_nodes->list_item = next;
1198 setter(next->item, next_nodes);
1199 next_nodes++;
1200 next = next->next;
1201 }
1202 /* update the indegree */
1203 next=*list;
1204 while (next) {
1205 struct commit_list * parents = next->item->parents;
1206 while (parents) {
1207 struct commit * parent=parents->item;
1208 struct sort_node * pn = (struct sort_node *) getter(parent);
1209
1210 if (pn)
1211 pn->indegree++;
1212 parents=parents->next;
1213 }
1214 next=next->next;
1215 }
1216 /*
1217 * find the tips
1218 *
1219 * tips are nodes not reachable from any other node in the list
1220 *
1221 * the tips serve as a starting set for the work queue.
1222 */
1223 next=*list;
1224 insert = &work;
1225 while (next) {
1226 struct sort_node * node = (struct sort_node *) getter(next->item);
1227
1228 if (node->indegree == 0) {
1229 insert = &commit_list_insert(next->item, insert)->next;
1230 }
1231 next=next->next;
1232 }
1233
1234 /* process the list in topological order */
1235 if (!lifo)
1236 sort_by_date(&work);
1237 while (work) {
1238 struct commit * work_item = pop_commit(&work);
1239 struct sort_node * work_node = (struct sort_node *) getter(work_item);
1240 struct commit_list * parents = work_item->parents;
1241
1242 while (parents) {
1243 struct commit * parent=parents->item;
1244 struct sort_node * pn = (struct sort_node *) getter(parent);
1245
1246 if (pn) {
1247 /*
1248 * parents are only enqueued for emission
1249 * when all their children have been emitted thereby
1250 * guaranteeing topological order.
1251 */
1252 pn->indegree--;
1253 if (!pn->indegree) {
1254 if (!lifo)
1255 insert_by_date(parent, &work);
1256 else
1257 commit_list_insert(parent, &work);
1258 }
1259 }
1260 parents=parents->next;
1261 }
1262 /*
1263 * work_item is a commit all of whose children
1264 * have already been emitted. we can emit it now.
1265 */
1266 *pptr = work_node->list_item;
1267 pptr = &(*pptr)->next;
1268 *pptr = NULL;
1269 setter(work_item, NULL);
1270 }
1271 free(nodes);
1272 }
1273
1274 /* merge-base stuff */
1275
1276 /* bits #0..15 in revision.h */
1277 #define PARENT1 (1u<<16)
1278 #define PARENT2 (1u<<17)
1279 #define STALE (1u<<18)
1280 #define RESULT (1u<<19)
1281
1282 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1283
1284 static struct commit *interesting(struct commit_list *list)
1285 {
1286 while (list) {
1287 struct commit *commit = list->item;
1288 list = list->next;
1289 if (commit->object.flags & STALE)
1290 continue;
1291 return commit;
1292 }
1293 return NULL;
1294 }
1295
1296 static struct commit_list *merge_bases(struct commit *one, struct commit *two)
1297 {
1298 struct commit_list *list = NULL;
1299 struct commit_list *result = NULL;
1300
1301 if (one == two)
1302 /* We do not mark this even with RESULT so we do not
1303 * have to clean it up.
1304 */
1305 return commit_list_insert(one, &result);
1306
1307 parse_commit(one);
1308 parse_commit(two);
1309
1310 one->object.flags |= PARENT1;
1311 two->object.flags |= PARENT2;
1312 insert_by_date(one, &list);
1313 insert_by_date(two, &list);
1314
1315 while (interesting(list)) {
1316 struct commit *commit;
1317 struct commit_list *parents;
1318 struct commit_list *n;
1319 int flags;
1320
1321 commit = list->item;
1322 n = list->next;
1323 free(list);
1324 list = n;
1325
1326 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
1327 if (flags == (PARENT1 | PARENT2)) {
1328 if (!(commit->object.flags & RESULT)) {
1329 commit->object.flags |= RESULT;
1330 insert_by_date(commit, &result);
1331 }
1332 /* Mark parents of a found merge stale */
1333 flags |= STALE;
1334 }
1335 parents = commit->parents;
1336 while (parents) {
1337 struct commit *p = parents->item;
1338 parents = parents->next;
1339 if ((p->object.flags & flags) == flags)
1340 continue;
1341 parse_commit(p);
1342 p->object.flags |= flags;
1343 insert_by_date(p, &list);
1344 }
1345 }
1346
1347 /* Clean up the result to remove stale ones */
1348 free_commit_list(list);
1349 list = result; result = NULL;
1350 while (list) {
1351 struct commit_list *n = list->next;
1352 if (!(list->item->object.flags & STALE))
1353 insert_by_date(list->item, &result);
1354 free(list);
1355 list = n;
1356 }
1357 return result;
1358 }
1359
1360 struct commit_list *get_merge_bases(struct commit *one,
1361 struct commit *two, int cleanup)
1362 {
1363 struct commit_list *list;
1364 struct commit **rslt;
1365 struct commit_list *result;
1366 int cnt, i, j;
1367
1368 result = merge_bases(one, two);
1369 if (one == two)
1370 return result;
1371 if (!result || !result->next) {
1372 if (cleanup) {
1373 clear_commit_marks(one, all_flags);
1374 clear_commit_marks(two, all_flags);
1375 }
1376 return result;
1377 }
1378
1379 /* There are more than one */
1380 cnt = 0;
1381 list = result;
1382 while (list) {
1383 list = list->next;
1384 cnt++;
1385 }
1386 rslt = xcalloc(cnt, sizeof(*rslt));
1387 for (list = result, i = 0; list; list = list->next)
1388 rslt[i++] = list->item;
1389 free_commit_list(result);
1390
1391 clear_commit_marks(one, all_flags);
1392 clear_commit_marks(two, all_flags);
1393 for (i = 0; i < cnt - 1; i++) {
1394 for (j = i+1; j < cnt; j++) {
1395 if (!rslt[i] || !rslt[j])
1396 continue;
1397 result = merge_bases(rslt[i], rslt[j]);
1398 clear_commit_marks(rslt[i], all_flags);
1399 clear_commit_marks(rslt[j], all_flags);
1400 for (list = result; list; list = list->next) {
1401 if (rslt[i] == list->item)
1402 rslt[i] = NULL;
1403 if (rslt[j] == list->item)
1404 rslt[j] = NULL;
1405 }
1406 }
1407 }
1408
1409 /* Surviving ones in rslt[] are the independent results */
1410 result = NULL;
1411 for (i = 0; i < cnt; i++) {
1412 if (rslt[i])
1413 insert_by_date(rslt[i], &result);
1414 }
1415 free(rslt);
1416 return result;
1417 }
1418
1419 int in_merge_bases(struct commit *commit, struct commit **reference, int num)
1420 {
1421 struct commit_list *bases, *b;
1422 int ret = 0;
1423
1424 if (num == 1)
1425 bases = get_merge_bases(commit, *reference, 1);
1426 else
1427 die("not yet");
1428 for (b = bases; b; b = b->next) {
1429 if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
1430 ret = 1;
1431 break;
1432 }
1433 }
1434
1435 free_commit_list(bases);
1436 return ret;
1437 }
Dscho's miscellaneous git branches