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