Code

Merge branch 'maint'
[git.git] / commit.c
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"
10 int save_commit_buffer = 1;
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;
20         /*
21          * reference to original list item that we will re-use
22          * on output.
23          */
24         struct commit_list * list_item;
26 };
28 const char *commit_type = "commit";
30 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 };
45 static char *user_format;
47 enum cmit_fmt get_commit_format(const char *arg)
48 {
49         int i;
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         }
67         die("invalid --pretty format: %s", arg);
68 }
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 }
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);
88         if (!obj)
89                 return NULL;
90         return check_commit(obj, sha1, quiet);
91 }
93 struct commit *lookup_commit_reference(const unsigned char *sha1)
94 {
95         return lookup_commit_reference_gently(sha1, 0);
96 }
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);
108 static unsigned long parse_commit_date(const char *buf)
110         unsigned long date;
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;
126 static struct commit_graft **commit_graft;
127 static int commit_graft_alloc, commit_graft_nr;
129 static int commit_graft_pos(const unsigned char *sha1)
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;
148 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
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;
177 struct commit_graft *read_graft_line(char *buf, int len)
179         /* The format is just "Commit Parent1 Parent2 ...\n" */
180         int i;
181         struct commit_graft *graft = NULL;
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;
207 int read_graft_file(const char *graft_file)
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;
226 static void prepare_commit_graft(void)
228         static int commit_graft_prepared;
229         char *graft_file;
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;
240 static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
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];
250 int write_shallow_commits(int fd, int use_pack_protocol)
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;
270 int unregister_shallow(const unsigned char *sha1)
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;
283 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
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;
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;
307         graft = lookup_commit_graft(item->object.sha1);
308         while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
309                 struct commit *new_parent;
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);
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         }
348         return 0;
351 int parse_commit(struct commit *item)
353         enum object_type type;
354         void *buffer;
355         unsigned long size;
356         int ret;
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;
378 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
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;
387 void free_commit_list(struct commit_list *list)
389         while (list) {
390                 struct commit_list *temp = list;
391                 list = temp->next;
392                 free(temp);
393         }
396 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
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);
409         
410 void sort_by_date(struct commit_list **list)
412         struct commit_list *ret = NULL;
413         while (*list) {
414                 insert_by_date((*list)->item, &ret);
415                 *list = (*list)->next;
416         }
417         *list = ret;
420 struct commit *pop_most_recent_commit(struct commit_list **list,
421                                       unsigned int mark)
423         struct commit *ret = (*list)->item;
424         struct commit_list *parents = ret->parents;
425         struct commit_list *old = *list;
427         *list = (*list)->next;
428         free(old);
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;
442 void clear_commit_marks(struct commit *commit, unsigned int mark)
444         struct commit_list *parents;
446         commit->object.flags &= ~mark;
447         parents = commit->parents;
448         while (parents) {
449                 struct commit *parent = parents->item;
451                 /* Have we already cleared this? */
452                 if (mark & parent->object.flags)
453                         clear_commit_marks(parent, mark);
454                 parents = parents->next;
455         }
458 /*
459  * Generic support for pretty-printing the header
460  */
461 static int get_one_line(const char *msg, unsigned long len)
463         int ret = 0;
465         while (len--) {
466                 char c = *msg++;
467                 if (!c)
468                         break;
469                 ret++;
470                 if (c == '\n')
471                         break;
472         }
473         return ret;
476 /* High bit set, or ISO-2022-INT */
477 static int non_ascii(int ch)
479         ch = (ch & 0xff);
480         return ((ch & 0x80) || (ch == 0x1b));
483 static int is_rfc2047_special(char ch)
485         return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
488 static int add_rfc2047(char *buf, const char *line, int len,
489                        const char *encoding)
491         char *bp = buf;
492         int i, needquote;
493         char q_encoding[128];
494         const char *q_encoding_fmt = "=?%s?q?";
496         for (i = needquote = 0; !needquote && i < len; i++) {
497                 int ch = line[i];
498                 if (non_ascii(ch))
499                         needquote++;
500                 if ((i + 1 < len) &&
501                     (ch == '=' && line[i+1] == '?'))
502                         needquote++;
503         }
504         if (!needquote)
505                 return sprintf(buf, "%.*s", len, line);
507         i = snprintf(q_encoding, sizeof(q_encoding), q_encoding_fmt, encoding);
508         if (sizeof(q_encoding) < i)
509                 die("Insanely long encoding name %s", encoding);
510         memcpy(bp, q_encoding, i);
511         bp += i;
512         for (i = 0; i < len; i++) {
513                 unsigned ch = line[i] & 0xFF;
514                 if (is_rfc2047_special(ch)) {
515                         sprintf(bp, "=%02X", ch);
516                         bp += 3;
517                 }
518                 else if (ch == ' ')
519                         *bp++ = '_';
520                 else
521                         *bp++ = ch;
522         }
523         memcpy(bp, "?=", 2);
524         bp += 2;
525         return bp - buf;
528 static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
529                          const char *line, enum date_mode dmode,
530                          const char *encoding)
532         char *date;
533         int namelen;
534         unsigned long time;
535         int tz, ret;
536         const char *filler = "    ";
538         if (fmt == CMIT_FMT_ONELINE)
539                 return 0;
540         date = strchr(line, '>');
541         if (!date)
542                 return 0;
543         namelen = ++date - line;
544         time = strtoul(date, &date, 10);
545         tz = strtol(date, NULL, 10);
547         if (fmt == CMIT_FMT_EMAIL) {
548                 char *name_tail = strchr(line, '<');
549                 int display_name_length;
550                 if (!name_tail)
551                         return 0;
552                 while (line < name_tail && isspace(name_tail[-1]))
553                         name_tail--;
554                 display_name_length = name_tail - line;
555                 filler = "";
556                 strcpy(buf, "From: ");
557                 ret = strlen(buf);
558                 ret += add_rfc2047(buf + ret, line, display_name_length,
559                                    encoding);
560                 memcpy(buf + ret, name_tail, namelen - display_name_length);
561                 ret += namelen - display_name_length;
562                 buf[ret++] = '\n';
563         }
564         else {
565                 ret = sprintf(buf, "%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                 ret += sprintf(buf + ret, "Date:   %s\n",
572                                show_date(time, tz, dmode));
573                 break;
574         case CMIT_FMT_EMAIL:
575                 ret += sprintf(buf + ret, "Date: %s\n",
576                                show_rfc2822_date(time, tz));
577                 break;
578         case CMIT_FMT_FULLER:
579                 ret += sprintf(buf + ret, "%sDate: %s\n", what,
580                                show_date(time, tz, dmode));
581                 break;
582         default:
583                 /* notin' */
584                 break;
585         }
586         return ret;
589 static int is_empty_line(const char *line, int *len_p)
591         int len = *len_p;
592         while (len && isspace(line[len-1]))
593                 len--;
594         *len_p = len;
595         return !len;
598 static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
600         struct commit_list *parent = commit->parents;
601         int offset;
603         if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
604             !parent || !parent->next)
605                 return 0;
607         offset = sprintf(buf, "Merge:");
609         while (parent) {
610                 struct commit *p = parent->item;
611                 const char *hex = NULL;
612                 const char *dots;
613                 if (abbrev)
614                         hex = find_unique_abbrev(p->object.sha1, abbrev);
615                 if (!hex)
616                         hex = sha1_to_hex(p->object.sha1);
617                 dots = (abbrev && strlen(hex) != 40) ?  "..." : "";
618                 parent = parent->next;
620                 offset += sprintf(buf + offset, " %s%s", hex, dots);
621         }
622         buf[offset++] = '\n';
623         return offset;
626 static char *get_header(const struct commit *commit, const char *key)
628         int key_len = strlen(key);
629         const char *line = commit->buffer;
631         for (;;) {
632                 const char *eol = strchr(line, '\n'), *next;
634                 if (line == eol)
635                         return NULL;
636                 if (!eol) {
637                         eol = line + strlen(line);
638                         next = NULL;
639                 } else
640                         next = eol + 1;
641                 if (!strncmp(line, key, key_len) && line[key_len] == ' ') {
642                         int len = eol - line - key_len;
643                         char *ret = xmalloc(len);
644                         memcpy(ret, line + key_len + 1, len - 1);
645                         ret[len - 1] = '\0';
646                         return ret;
647                 }
648                 line = next;
649         }
652 static char *replace_encoding_header(char *buf, const char *encoding)
654         char *encoding_header = strstr(buf, "\nencoding ");
655         char *header_end = strstr(buf, "\n\n");
656         char *end_of_encoding_header;
657         int encoding_header_pos;
658         int encoding_header_len;
659         int new_len;
660         int need_len;
661         int buflen = strlen(buf) + 1;
663         if (!header_end)
664                 header_end = buf + buflen;
665         if (!encoding_header || encoding_header >= header_end)
666                 return buf;
667         encoding_header++;
668         end_of_encoding_header = strchr(encoding_header, '\n');
669         if (!end_of_encoding_header)
670                 return buf; /* should not happen but be defensive */
671         end_of_encoding_header++;
673         encoding_header_len = end_of_encoding_header - encoding_header;
674         encoding_header_pos = encoding_header - buf;
676         if (is_encoding_utf8(encoding)) {
677                 /* we have re-coded to UTF-8; drop the header */
678                 memmove(encoding_header, end_of_encoding_header,
679                         buflen - (encoding_header_pos + encoding_header_len));
680                 return buf;
681         }
682         new_len = strlen(encoding);
683         need_len = new_len + strlen("encoding \n");
684         if (encoding_header_len < need_len) {
685                 buf = xrealloc(buf, buflen + (need_len - encoding_header_len));
686                 encoding_header = buf + encoding_header_pos;
687                 end_of_encoding_header = encoding_header + encoding_header_len;
688         }
689         memmove(end_of_encoding_header + (need_len - encoding_header_len),
690                 end_of_encoding_header,
691                 buflen - (encoding_header_pos + encoding_header_len));
692         memcpy(encoding_header + 9, encoding, strlen(encoding));
693         encoding_header[9 + new_len] = '\n';
694         return buf;
697 static char *logmsg_reencode(const struct commit *commit,
698                              const char *output_encoding)
700         static const char *utf8 = "utf-8";
701         const char *use_encoding;
702         char *encoding;
703         char *out;
705         if (!*output_encoding)
706                 return NULL;
707         encoding = get_header(commit, "encoding");
708         use_encoding = encoding ? encoding : utf8;
709         if (!strcmp(use_encoding, output_encoding))
710                 out = xstrdup(commit->buffer);
711         else
712                 out = reencode_string(commit->buffer,
713                                       output_encoding, use_encoding);
714         if (out)
715                 out = replace_encoding_header(out, output_encoding);
717         free(encoding);
718         return out;
721 static void fill_person(struct interp *table, const char *msg, int len)
723         int start, end, tz = 0;
724         unsigned long date;
725         char *ep;
727         /* parse name */
728         for (end = 0; end < len && msg[end] != '<'; end++)
729                 ; /* do nothing */
730         start = end + 1;
731         while (end > 0 && isspace(msg[end - 1]))
732                 end--;
733         table[0].value = xstrndup(msg, end);
735         if (start >= len)
736                 return;
738         /* parse email */
739         for (end = start + 1; end < len && msg[end] != '>'; end++)
740                 ; /* do nothing */
742         if (end >= len)
743                 return;
745         table[1].value = xstrndup(msg + start, end - start);
747         /* parse date */
748         for (start = end + 1; start < len && isspace(msg[start]); start++)
749                 ; /* do nothing */
750         if (start >= len)
751                 return;
752         date = strtoul(msg + start, &ep, 10);
753         if (msg + start == ep)
754                 return;
756         table[5].value = xstrndup(msg + start, ep - (msg + start));
758         /* parse tz */
759         for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
760                 ; /* do nothing */
761         if (start + 1 < len) {
762                 tz = strtoul(msg + start + 1, NULL, 10);
763                 if (msg[start] == '-')
764                         tz = -tz;
765         }
767         interp_set_entry(table, 2, show_date(date, tz, 0));
768         interp_set_entry(table, 3, show_rfc2822_date(date, tz));
769         interp_set_entry(table, 4, show_date(date, tz, 1));
772 static long format_commit_message(const struct commit *commit,
773                 const char *msg, char *buf, unsigned long space)
775         struct interp table[] = {
776                 { "%H" },       /* commit hash */
777                 { "%h" },       /* abbreviated commit hash */
778                 { "%T" },       /* tree hash */
779                 { "%t" },       /* abbreviated tree hash */
780                 { "%P" },       /* parent hashes */
781                 { "%p" },       /* abbreviated parent hashes */
782                 { "%an" },      /* author name */
783                 { "%ae" },      /* author email */
784                 { "%ad" },      /* author date */
785                 { "%aD" },      /* author date, RFC2822 style */
786                 { "%ar" },      /* author date, relative */
787                 { "%at" },      /* author date, UNIX timestamp */
788                 { "%cn" },      /* committer name */
789                 { "%ce" },      /* committer email */
790                 { "%cd" },      /* committer date */
791                 { "%cD" },      /* committer date, RFC2822 style */
792                 { "%cr" },      /* committer date, relative */
793                 { "%ct" },      /* committer date, UNIX timestamp */
794                 { "%e" },       /* encoding */
795                 { "%s" },       /* subject */
796                 { "%b" },       /* body */
797                 { "%Cred" },    /* red */
798                 { "%Cgreen" },  /* green */
799                 { "%Cblue" },   /* blue */
800                 { "%Creset" },  /* reset color */
801                 { "%n" },       /* newline */
802                 { "%m" },       /* left/right/bottom */
803         };
804         enum interp_index {
805                 IHASH = 0, IHASH_ABBREV,
806                 ITREE, ITREE_ABBREV,
807                 IPARENTS, IPARENTS_ABBREV,
808                 IAUTHOR_NAME, IAUTHOR_EMAIL,
809                 IAUTHOR_DATE, IAUTHOR_DATE_RFC2822, IAUTHOR_DATE_RELATIVE,
810                 IAUTHOR_TIMESTAMP,
811                 ICOMMITTER_NAME, ICOMMITTER_EMAIL,
812                 ICOMMITTER_DATE, ICOMMITTER_DATE_RFC2822,
813                 ICOMMITTER_DATE_RELATIVE, ICOMMITTER_TIMESTAMP,
814                 IENCODING,
815                 ISUBJECT,
816                 IBODY,
817                 IRED, IGREEN, IBLUE, IRESET_COLOR,
818                 INEWLINE,
819                 ILEFT_RIGHT,
820         };
821         struct commit_list *p;
822         char parents[1024];
823         int i;
824         enum { HEADER, SUBJECT, BODY } state;
826         if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
827                 die("invalid interp table!");
829         /* these are independent of the commit */
830         interp_set_entry(table, IRED, "\033[31m");
831         interp_set_entry(table, IGREEN, "\033[32m");
832         interp_set_entry(table, IBLUE, "\033[34m");
833         interp_set_entry(table, IRESET_COLOR, "\033[m");
834         interp_set_entry(table, INEWLINE, "\n");
836         /* these depend on the commit */
837         if (!commit->object.parsed)
838                 parse_object(commit->object.sha1);
839         interp_set_entry(table, IHASH, sha1_to_hex(commit->object.sha1));
840         interp_set_entry(table, IHASH_ABBREV,
841                         find_unique_abbrev(commit->object.sha1,
842                                 DEFAULT_ABBREV));
843         interp_set_entry(table, ITREE, sha1_to_hex(commit->tree->object.sha1));
844         interp_set_entry(table, ITREE_ABBREV,
845                         find_unique_abbrev(commit->tree->object.sha1,
846                                 DEFAULT_ABBREV));
847         interp_set_entry(table, ILEFT_RIGHT,
848                          (commit->object.flags & BOUNDARY)
849                          ? "-"
850                          : (commit->object.flags & SYMMETRIC_LEFT)
851                          ? "<"
852                          : ">");
854         parents[1] = 0;
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 + 1);
862         parents[1] = 0;
863         for (i = 0, p = commit->parents;
864                         p && i < sizeof(parents) - 1;
865                         p = p->next)
866                 i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
867                         find_unique_abbrev(p->item->object.sha1,
868                                 DEFAULT_ABBREV));
869         interp_set_entry(table, IPARENTS_ABBREV, parents + 1);
871         for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
872                 int eol;
873                 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
874                         ; /* do nothing */
876                 if (state == SUBJECT) {
877                         table[ISUBJECT].value = xstrndup(msg + i, eol - i);
878                         i = eol;
879                 }
880                 if (i == eol) {
881                         state++;
882                         /* strip empty lines */
883                         while (msg[eol + 1] == '\n')
884                                 eol++;
885                 } else if (!prefixcmp(msg + i, "author "))
886                         fill_person(table + IAUTHOR_NAME,
887                                         msg + i + 7, eol - i - 7);
888                 else if (!prefixcmp(msg + i, "committer "))
889                         fill_person(table + ICOMMITTER_NAME,
890                                         msg + i + 10, eol - i - 10);
891                 else if (!prefixcmp(msg + i, "encoding "))
892                         table[IENCODING].value =
893                                 xstrndup(msg + i + 9, eol - i - 9);
894                 i = eol;
895         }
896         if (msg[i])
897                 table[IBODY].value = xstrdup(msg + i);
898         for (i = 0; i < ARRAY_SIZE(table); i++)
899                 if (!table[i].value)
900                         interp_set_entry(table, i, "<unknown>");
902         interpolate(buf, space, user_format, table, ARRAY_SIZE(table));
903         interp_clear_table(table, ARRAY_SIZE(table));
905         return strlen(buf);
908 unsigned long pretty_print_commit(enum cmit_fmt fmt,
909                                   const struct commit *commit,
910                                   unsigned long len,
911                                   char *buf, unsigned long space,
912                                   int abbrev, const char *subject,
913                                   const char *after_subject,
914                                   enum date_mode dmode)
916         int hdr = 1, body = 0, seen_title = 0;
917         unsigned long offset = 0;
918         int indent = 4;
919         int parents_shown = 0;
920         const char *msg = commit->buffer;
921         int plain_non_ascii = 0;
922         char *reencoded;
923         const char *encoding;
925         if (fmt == CMIT_FMT_USERFORMAT)
926                 return format_commit_message(commit, msg, buf, space);
928         encoding = (git_log_output_encoding
929                     ? git_log_output_encoding
930                     : git_commit_encoding);
931         if (!encoding)
932                 encoding = "utf-8";
933         reencoded = logmsg_reencode(commit, encoding);
934         if (reencoded)
935                 msg = reencoded;
937         if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
938                 indent = 0;
940         /* After-subject is used to pass in Content-Type: multipart
941          * MIME header; in that case we do not have to do the
942          * plaintext content type even if the commit message has
943          * non 7-bit ASCII character.  Otherwise, check if we need
944          * to say this is not a 7-bit ASCII.
945          */
946         if (fmt == CMIT_FMT_EMAIL && !after_subject) {
947                 int i, ch, in_body;
949                 for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
950                         if (!in_body) {
951                                 /* author could be non 7-bit ASCII but
952                                  * the log may be so; skip over the
953                                  * header part first.
954                                  */
955                                 if (ch == '\n' &&
956                                     i + 1 < len && msg[i+1] == '\n')
957                                         in_body = 1;
958                         }
959                         else if (non_ascii(ch)) {
960                                 plain_non_ascii = 1;
961                                 break;
962                         }
963                 }
964         }
966         for (;;) {
967                 const char *line = msg;
968                 int linelen = get_one_line(msg, len);
970                 if (!linelen)
971                         break;
973                 /*
974                  * We want some slop for indentation and a possible
975                  * final "...". Thus the "+ 20".
976                  */
977                 if (offset + linelen + 20 > space) {
978                         memcpy(buf + offset, "    ...\n", 8);
979                         offset += 8;
980                         break;
981                 }
983                 msg += linelen;
984                 len -= linelen;
985                 if (hdr) {
986                         if (linelen == 1) {
987                                 hdr = 0;
988                                 if ((fmt != CMIT_FMT_ONELINE) && !subject)
989                                         buf[offset++] = '\n';
990                                 continue;
991                         }
992                         if (fmt == CMIT_FMT_RAW) {
993                                 memcpy(buf + offset, line, linelen);
994                                 offset += linelen;
995                                 continue;
996                         }
997                         if (!memcmp(line, "parent ", 7)) {
998                                 if (linelen != 48)
999                                         die("bad parent line in commit");
1000                                 continue;
1001                         }
1003                         if (!parents_shown) {
1004                                 offset += add_merge_info(fmt, buf + offset,
1005                                                          commit, abbrev);
1006                                 parents_shown = 1;
1007                                 continue;
1008                         }
1009                         /*
1010                          * MEDIUM == DEFAULT shows only author with dates.
1011                          * FULL shows both authors but not dates.
1012                          * FULLER shows both authors and dates.
1013                          */
1014                         if (!memcmp(line, "author ", 7))
1015                                 offset += add_user_info("Author", fmt,
1016                                                         buf + offset,
1017                                                         line + 7,
1018                                                         dmode,
1019                                                         encoding);
1020                         if (!memcmp(line, "committer ", 10) &&
1021                             (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
1022                                 offset += add_user_info("Commit", fmt,
1023                                                         buf + offset,
1024                                                         line + 10,
1025                                                         dmode,
1026                                                         encoding);
1027                         continue;
1028                 }
1030                 if (!subject)
1031                         body = 1;
1033                 if (is_empty_line(line, &linelen)) {
1034                         if (!seen_title)
1035                                 continue;
1036                         if (!body)
1037                                 continue;
1038                         if (subject)
1039                                 continue;
1040                         if (fmt == CMIT_FMT_SHORT)
1041                                 break;
1042                 }
1044                 seen_title = 1;
1045                 if (subject) {
1046                         int slen = strlen(subject);
1047                         memcpy(buf + offset, subject, slen);
1048                         offset += slen;
1049                         offset += add_rfc2047(buf + offset, line, linelen,
1050                                               encoding);
1051                 }
1052                 else {
1053                         memset(buf + offset, ' ', indent);
1054                         memcpy(buf + offset + indent, line, linelen);
1055                         offset += linelen + indent;
1056                 }
1057                 buf[offset++] = '\n';
1058                 if (fmt == CMIT_FMT_ONELINE)
1059                         break;
1060                 if (subject && plain_non_ascii) {
1061                         int sz;
1062                         char header[512];
1063                         const char *header_fmt =
1064                                 "Content-Type: text/plain; charset=%s\n"
1065                                 "Content-Transfer-Encoding: 8bit\n";
1066                         sz = snprintf(header, sizeof(header), header_fmt,
1067                                       encoding);
1068                         if (sizeof(header) < sz)
1069                                 die("Encoding name %s too long", encoding);
1070                         memcpy(buf + offset, header, sz);
1071                         offset += sz;
1072                 }
1073                 if (after_subject) {
1074                         int slen = strlen(after_subject);
1075                         if (slen > space - offset - 1)
1076                                 slen = space - offset - 1;
1077                         memcpy(buf + offset, after_subject, slen);
1078                         offset += slen;
1079                         after_subject = NULL;
1080                 }
1081                 subject = NULL;
1082         }
1083         while (offset && isspace(buf[offset-1]))
1084                 offset--;
1085         /* Make sure there is an EOLN for the non-oneline case */
1086         if (fmt != CMIT_FMT_ONELINE)
1087                 buf[offset++] = '\n';
1088         /*
1089          * make sure there is another EOLN to separate the headers from whatever
1090          * body the caller appends if we haven't already written a body
1091          */
1092         if (fmt == CMIT_FMT_EMAIL && !body)
1093                 buf[offset++] = '\n';
1094         buf[offset] = '\0';
1096         free(reencoded);
1097         return offset;
1100 struct commit *pop_commit(struct commit_list **stack)
1102         struct commit_list *top = *stack;
1103         struct commit *item = top ? top->item : NULL;
1105         if (top) {
1106                 *stack = top->next;
1107                 free(top);
1108         }
1109         return item;
1112 int count_parents(struct commit * commit)
1114         int count;
1115         struct commit_list * parents = commit->parents;
1116         for (count = 0; parents; parents = parents->next,count++)
1117                 ;
1118         return count;
1121 void topo_sort_default_setter(struct commit *c, void *data)
1123         c->util = data;
1126 void *topo_sort_default_getter(struct commit *c)
1128         return c->util;
1131 /*
1132  * Performs an in-place topological sort on the list supplied.
1133  */
1134 void sort_in_topological_order(struct commit_list ** list, int lifo)
1136         sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
1137                                      topo_sort_default_getter);
1140 void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1141                                   topo_sort_set_fn_t setter,
1142                                   topo_sort_get_fn_t getter)
1144         struct commit_list * next = *list;
1145         struct commit_list * work = NULL, **insert;
1146         struct commit_list ** pptr = list;
1147         struct sort_node * nodes;
1148         struct sort_node * next_nodes;
1149         int count = 0;
1151         /* determine the size of the list */
1152         while (next) {
1153                 next = next->next;
1154                 count++;
1155         }
1156         
1157         if (!count)
1158                 return;
1159         /* allocate an array to help sort the list */
1160         nodes = xcalloc(count, sizeof(*nodes));
1161         /* link the list to the array */
1162         next_nodes = nodes;
1163         next=*list;
1164         while (next) {
1165                 next_nodes->list_item = next;
1166                 setter(next->item, next_nodes);
1167                 next_nodes++;
1168                 next = next->next;
1169         }
1170         /* update the indegree */
1171         next=*list;
1172         while (next) {
1173                 struct commit_list * parents = next->item->parents;
1174                 while (parents) {
1175                         struct commit * parent=parents->item;
1176                         struct sort_node * pn = (struct sort_node *) getter(parent);
1178                         if (pn)
1179                                 pn->indegree++;
1180                         parents=parents->next;
1181                 }
1182                 next=next->next;
1183         }
1184         /* 
1185          * find the tips
1186          *
1187          * tips are nodes not reachable from any other node in the list 
1188          * 
1189          * the tips serve as a starting set for the work queue.
1190          */
1191         next=*list;
1192         insert = &work;
1193         while (next) {
1194                 struct sort_node * node = (struct sort_node *) getter(next->item);
1196                 if (node->indegree == 0) {
1197                         insert = &commit_list_insert(next->item, insert)->next;
1198                 }
1199                 next=next->next;
1200         }
1202         /* process the list in topological order */
1203         if (!lifo)
1204                 sort_by_date(&work);
1205         while (work) {
1206                 struct commit * work_item = pop_commit(&work);
1207                 struct sort_node * work_node = (struct sort_node *) getter(work_item);
1208                 struct commit_list * parents = work_item->parents;
1210                 while (parents) {
1211                         struct commit * parent=parents->item;
1212                         struct sort_node * pn = (struct sort_node *) getter(parent);
1214                         if (pn) {
1215                                 /*
1216                                  * parents are only enqueued for emission 
1217                                  * when all their children have been emitted thereby
1218                                  * guaranteeing topological order.
1219                                  */
1220                                 pn->indegree--;
1221                                 if (!pn->indegree) {
1222                                         if (!lifo)
1223                                                 insert_by_date(parent, &work);
1224                                         else
1225                                                 commit_list_insert(parent, &work);
1226                                 }
1227                         }
1228                         parents=parents->next;
1229                 }
1230                 /*
1231                  * work_item is a commit all of whose children
1232                  * have already been emitted. we can emit it now.
1233                  */
1234                 *pptr = work_node->list_item;
1235                 pptr = &(*pptr)->next;
1236                 *pptr = NULL;
1237                 setter(work_item, NULL);
1238         }
1239         free(nodes);
1242 /* merge-base stuff */
1244 /* bits #0..15 in revision.h */
1245 #define PARENT1         (1u<<16)
1246 #define PARENT2         (1u<<17)
1247 #define STALE           (1u<<18)
1248 #define RESULT          (1u<<19)
1250 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1252 static struct commit *interesting(struct commit_list *list)
1254         while (list) {
1255                 struct commit *commit = list->item;
1256                 list = list->next;
1257                 if (commit->object.flags & STALE)
1258                         continue;
1259                 return commit;
1260         }
1261         return NULL;
1264 static struct commit_list *merge_bases(struct commit *one, struct commit *two)
1266         struct commit_list *list = NULL;
1267         struct commit_list *result = NULL;
1269         if (one == two)
1270                 /* We do not mark this even with RESULT so we do not
1271                  * have to clean it up.
1272                  */
1273                 return commit_list_insert(one, &result);
1275         parse_commit(one);
1276         parse_commit(two);
1278         one->object.flags |= PARENT1;
1279         two->object.flags |= PARENT2;
1280         insert_by_date(one, &list);
1281         insert_by_date(two, &list);
1283         while (interesting(list)) {
1284                 struct commit *commit;
1285                 struct commit_list *parents;
1286                 struct commit_list *n;
1287                 int flags;
1289                 commit = list->item;
1290                 n = list->next;
1291                 free(list);
1292                 list = n;
1294                 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
1295                 if (flags == (PARENT1 | PARENT2)) {
1296                         if (!(commit->object.flags & RESULT)) {
1297                                 commit->object.flags |= RESULT;
1298                                 insert_by_date(commit, &result);
1299                         }
1300                         /* Mark parents of a found merge stale */
1301                         flags |= STALE;
1302                 }
1303                 parents = commit->parents;
1304                 while (parents) {
1305                         struct commit *p = parents->item;
1306                         parents = parents->next;
1307                         if ((p->object.flags & flags) == flags)
1308                                 continue;
1309                         parse_commit(p);
1310                         p->object.flags |= flags;
1311                         insert_by_date(p, &list);
1312                 }
1313         }
1315         /* Clean up the result to remove stale ones */
1316         free_commit_list(list);
1317         list = result; result = NULL;
1318         while (list) {
1319                 struct commit_list *n = list->next;
1320                 if (!(list->item->object.flags & STALE))
1321                         insert_by_date(list->item, &result);
1322                 free(list);
1323                 list = n;
1324         }
1325         return result;
1328 struct commit_list *get_merge_bases(struct commit *one,
1329                                     struct commit *two,
1330                                     int cleanup)
1332         struct commit_list *list;
1333         struct commit **rslt;
1334         struct commit_list *result;
1335         int cnt, i, j;
1337         result = merge_bases(one, two);
1338         if (one == two)
1339                 return result;
1340         if (!result || !result->next) {
1341                 if (cleanup) {
1342                         clear_commit_marks(one, all_flags);
1343                         clear_commit_marks(two, all_flags);
1344                 }
1345                 return result;
1346         }
1348         /* There are more than one */
1349         cnt = 0;
1350         list = result;
1351         while (list) {
1352                 list = list->next;
1353                 cnt++;
1354         }
1355         rslt = xcalloc(cnt, sizeof(*rslt));
1356         for (list = result, i = 0; list; list = list->next)
1357                 rslt[i++] = list->item;
1358         free_commit_list(result);
1360         clear_commit_marks(one, all_flags);
1361         clear_commit_marks(two, all_flags);
1362         for (i = 0; i < cnt - 1; i++) {
1363                 for (j = i+1; j < cnt; j++) {
1364                         if (!rslt[i] || !rslt[j])
1365                                 continue;
1366                         result = merge_bases(rslt[i], rslt[j]);
1367                         clear_commit_marks(rslt[i], all_flags);
1368                         clear_commit_marks(rslt[j], all_flags);
1369                         for (list = result; list; list = list->next) {
1370                                 if (rslt[i] == list->item)
1371                                         rslt[i] = NULL;
1372                                 if (rslt[j] == list->item)
1373                                         rslt[j] = NULL;
1374                         }
1375                 }
1376         }
1378         /* Surviving ones in rslt[] are the independent results */
1379         result = NULL;
1380         for (i = 0; i < cnt; i++) {
1381                 if (rslt[i])
1382                         insert_by_date(rslt[i], &result);
1383         }
1384         free(rslt);
1385         return result;
1388 int in_merge_bases(struct commit *commit, struct commit **reference, int num)
1390         struct commit_list *bases, *b;
1391         int ret = 0;
1393         if (num == 1)
1394                 bases = get_merge_bases(commit, *reference, 1);
1395         else
1396                 die("not yet");
1397         for (b = bases; b; b = b->next) {
1398                 if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
1399                         ret = 1;
1400                         break;
1401                 }
1402         }
1404         free_commit_list(bases);
1405         return ret;