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