commit-tree: cope with different ways "utf-8" can be spelled.
[git/git.git] / commit.c
CommitLineData
8f1d2e6f 1#include "cache.h"
961784ee 2#include "tag.h"
175785e5 3#include "commit.h"
ed09aef0 4#include "pkt-line.h"
52883fbd 5#include "utf8.h"
175785e5 6
60ab26de
LT
7int save_commit_buffer = 1;
8
ab580ace
JS
9struct sort_node
10{
11 /*
55c3eb43
TS
12 * the number of children of the associated commit
13 * that also occur in the list being sorted.
14 */
ab580ace
JS
15 unsigned int indegree;
16
17 /*
55c3eb43
TS
18 * reference to original list item that we will re-use
19 * on output.
20 */
ab580ace
JS
21 struct commit_list * list_item;
22
23};
24
175785e5
DB
25const char *commit_type = "commit";
26
6cdfd179
EW
27struct cmt_fmt_map {
28 const char *n;
29 size_t cmp_len;
30 enum cmit_fmt v;
31} cmt_fmts[] = {
32 { "raw", 1, CMIT_FMT_RAW },
33 { "medium", 1, CMIT_FMT_MEDIUM },
34 { "short", 1, CMIT_FMT_SHORT },
328b710d 35 { "email", 1, CMIT_FMT_EMAIL },
6cdfd179
EW
36 { "full", 5, CMIT_FMT_FULL },
37 { "fuller", 5, CMIT_FMT_FULLER },
38 { "oneline", 1, CMIT_FMT_ONELINE },
39};
40
9b66ec04
LT
41enum cmit_fmt get_commit_format(const char *arg)
42{
6cdfd179
EW
43 int i;
44
45 if (!arg || !*arg)
9b66ec04 46 return CMIT_FMT_DEFAULT;
6cdfd179
EW
47 if (*arg == '=')
48 arg++;
49 for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
50 if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len))
51 return cmt_fmts[i].v;
52 }
53
54 die("invalid --pretty format: %s", arg);
9b66ec04
LT
55}
56
f76412ed
JH
57static struct commit *check_commit(struct object *obj,
58 const unsigned char *sha1,
59 int quiet)
961784ee 60{
1974632c 61 if (obj->type != OBJ_COMMIT) {
f76412ed
JH
62 if (!quiet)
63 error("Object %s is a %s, not a commit",
885a86ab 64 sha1_to_hex(sha1), typename(obj->type));
961784ee
LT
65 return NULL;
66 }
67 return (struct commit *) obj;
68}
69
f76412ed
JH
70struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
71 int quiet)
961784ee 72{
9534f40b 73 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
961784ee
LT
74
75 if (!obj)
76 return NULL;
f76412ed
JH
77 return check_commit(obj, sha1, quiet);
78}
79
80struct commit *lookup_commit_reference(const unsigned char *sha1)
81{
82 return lookup_commit_reference_gently(sha1, 0);
961784ee
LT
83}
84
5d6ccf5c 85struct commit *lookup_commit(const unsigned char *sha1)
175785e5
DB
86{
87 struct object *obj = lookup_object(sha1);
88 if (!obj) {
855419f7 89 struct commit *ret = alloc_commit_node();
175785e5 90 created_object(sha1, &ret->object);
1974632c 91 ret->object.type = OBJ_COMMIT;
175785e5
DB
92 return ret;
93 }
d1af002d 94 if (!obj->type)
1974632c 95 obj->type = OBJ_COMMIT;
f76412ed 96 return check_commit(obj, sha1, 0);
175785e5
DB
97}
98
99static unsigned long parse_commit_date(const char *buf)
100{
101 unsigned long date;
102
103 if (memcmp(buf, "author", 6))
104 return 0;
105 while (*buf++ != '\n')
106 /* nada */;
107 if (memcmp(buf, "committer", 9))
108 return 0;
109 while (*buf++ != '>')
110 /* nada */;
111 date = strtoul(buf, NULL, 10);
112 if (date == ULONG_MAX)
113 date = 0;
114 return date;
115}
116
5040f17e 117static struct commit_graft **commit_graft;
5da5c8f4
JH
118static int commit_graft_alloc, commit_graft_nr;
119
120static int commit_graft_pos(const unsigned char *sha1)
121{
122 int lo, hi;
123 lo = 0;
124 hi = commit_graft_nr;
125 while (lo < hi) {
126 int mi = (lo + hi) / 2;
127 struct commit_graft *graft = commit_graft[mi];
a89fccd2 128 int cmp = hashcmp(sha1, graft->sha1);
5da5c8f4
JH
129 if (!cmp)
130 return mi;
131 if (cmp < 0)
132 hi = mi;
133 else
134 lo = mi + 1;
135 }
136 return -lo - 1;
137}
138
5040f17e
JH
139int register_commit_graft(struct commit_graft *graft, int ignore_dups)
140{
141 int pos = commit_graft_pos(graft->sha1);
142
143 if (0 <= pos) {
144 if (ignore_dups)
145 free(graft);
146 else {
147 free(commit_graft[pos]);
148 commit_graft[pos] = graft;
149 }
150 return 1;
151 }
152 pos = -pos - 1;
153 if (commit_graft_alloc <= ++commit_graft_nr) {
154 commit_graft_alloc = alloc_nr(commit_graft_alloc);
155 commit_graft = xrealloc(commit_graft,
156 sizeof(*commit_graft) *
157 commit_graft_alloc);
158 }
159 if (pos < commit_graft_nr)
160 memmove(commit_graft + pos + 1,
161 commit_graft + pos,
162 (commit_graft_nr - pos - 1) *
163 sizeof(*commit_graft));
164 commit_graft[pos] = graft;
165 return 0;
166}
167
168struct commit_graft *read_graft_line(char *buf, int len)
169{
170 /* The format is just "Commit Parent1 Parent2 ...\n" */
171 int i;
172 struct commit_graft *graft = NULL;
173
174 if (buf[len-1] == '\n')
175 buf[--len] = 0;
360204c3 176 if (buf[0] == '#' || buf[0] == '\0')
5bc4ce58 177 return NULL;
5040f17e
JH
178 if ((len + 1) % 41) {
179 bad_graft_data:
180 error("bad graft data: %s", buf);
181 free(graft);
182 return NULL;
183 }
184 i = (len + 1) / 41 - 1;
185 graft = xmalloc(sizeof(*graft) + 20 * i);
186 graft->nr_parent = i;
187 if (get_sha1_hex(buf, graft->sha1))
188 goto bad_graft_data;
189 for (i = 40; i < len; i += 41) {
190 if (buf[i] != ' ')
191 goto bad_graft_data;
192 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
193 goto bad_graft_data;
194 }
195 return graft;
196}
197
198int read_graft_file(const char *graft_file)
5da5c8f4 199{
5da5c8f4
JH
200 FILE *fp = fopen(graft_file, "r");
201 char buf[1024];
5040f17e
JH
202 if (!fp)
203 return -1;
5da5c8f4
JH
204 while (fgets(buf, sizeof(buf), fp)) {
205 /* The format is just "Commit Parent1 Parent2 ...\n" */
206 int len = strlen(buf);
5040f17e 207 struct commit_graft *graft = read_graft_line(buf, len);
5bc4ce58
JH
208 if (!graft)
209 continue;
5040f17e 210 if (register_commit_graft(graft, 1))
5da5c8f4 211 error("duplicate graft data: %s", buf);
5da5c8f4
JH
212 }
213 fclose(fp);
5040f17e
JH
214 return 0;
215}
216
217static void prepare_commit_graft(void)
218{
219 static int commit_graft_prepared;
220 char *graft_file;
221
222 if (commit_graft_prepared)
223 return;
224 graft_file = get_graft_file();
225 read_graft_file(graft_file);
ed09aef0
JS
226 /* make sure shallows are read */
227 is_repository_shallow();
5040f17e 228 commit_graft_prepared = 1;
5da5c8f4
JH
229}
230
231static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
232{
233 int pos;
5040f17e 234 prepare_commit_graft();
5da5c8f4
JH
235 pos = commit_graft_pos(sha1);
236 if (pos < 0)
237 return NULL;
238 return commit_graft[pos];
239}
240
ed09aef0
JS
241int write_shallow_commits(int fd, int use_pack_protocol)
242{
243 int i, count = 0;
244 for (i = 0; i < commit_graft_nr; i++)
245 if (commit_graft[i]->nr_parent < 0) {
246 const char *hex =
247 sha1_to_hex(commit_graft[i]->sha1);
248 count++;
249 if (use_pack_protocol)
250 packet_write(fd, "shallow %s", hex);
251 else {
252 write(fd, hex, 40);
253 write(fd, "\n", 1);
254 }
255 }
256 return count;
257}
258
f53514bc
JS
259int unregister_shallow(const unsigned char *sha1)
260{
261 int pos = commit_graft_pos(sha1);
262 if (pos < 0)
263 return -1;
264 if (pos + 1 < commit_graft_nr)
265 memcpy(commit_graft + pos, commit_graft + pos + 1,
266 sizeof(struct commit_graft *)
267 * (commit_graft_nr - pos - 1));
268 commit_graft_nr--;
269 return 0;
270}
271
bd2c39f5 272int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
175785e5 273{
3b44f15a 274 char *tail = buffer;
f7cc77d7 275 char *bufptr = buffer;
175785e5 276 unsigned char parent[20];
6c88be16 277 struct commit_list **pptr;
5da5c8f4 278 struct commit_graft *graft;
27dedf0c 279 unsigned n_refs = 0;
bd2c39f5 280
175785e5
DB
281 if (item->object.parsed)
282 return 0;
283 item->object.parsed = 1;
3b44f15a
JH
284 tail += size;
285 if (tail <= bufptr + 5 || memcmp(bufptr, "tree ", 5))
f7cc77d7 286 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
3b44f15a 287 if (tail <= bufptr + 45 || get_sha1_hex(bufptr + 5, parent) < 0)
bd2afde8
JH
288 return error("bad tree pointer in commit %s",
289 sha1_to_hex(item->object.sha1));
175785e5 290 item->tree = lookup_tree(parent);
235ac407 291 if (item->tree)
27dedf0c 292 n_refs++;
175785e5 293 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
6c88be16 294 pptr = &item->parents;
5da5c8f4
JH
295
296 graft = lookup_commit_graft(item->object.sha1);
3b44f15a 297 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
f7cc77d7
LT
298 struct commit *new_parent;
299
3b44f15a
JH
300 if (tail <= bufptr + 48 ||
301 get_sha1_hex(bufptr + 7, parent) ||
302 bufptr[47] != '\n')
f7cc77d7 303 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
5da5c8f4
JH
304 bufptr += 48;
305 if (graft)
306 continue;
f7cc77d7 307 new_parent = lookup_commit(parent);
235ac407 308 if (new_parent) {
6c88be16 309 pptr = &commit_list_insert(new_parent, pptr)->next;
27dedf0c 310 n_refs++;
235ac407 311 }
5da5c8f4
JH
312 }
313 if (graft) {
314 int i;
315 struct commit *new_parent;
316 for (i = 0; i < graft->nr_parent; i++) {
317 new_parent = lookup_commit(graft->parent[i]);
318 if (!new_parent)
319 continue;
320 pptr = &commit_list_insert(new_parent, pptr)->next;
27dedf0c 321 n_refs++;
5da5c8f4 322 }
175785e5
DB
323 }
324 item->date = parse_commit_date(bufptr);
27dedf0c
JH
325
326 if (track_object_refs) {
327 unsigned i = 0;
328 struct commit_list *p;
329 struct object_refs *refs = alloc_object_refs(n_refs);
330 if (item->tree)
331 refs->ref[i++] = &item->tree->object;
332 for (p = item->parents; p; p = p->next)
333 refs->ref[i++] = &p->item->object;
334 set_object_refs(&item->object, refs);
335 }
336
175785e5
DB
337 return 0;
338}
339
bd2c39f5
NP
340int parse_commit(struct commit *item)
341{
342 char type[20];
343 void *buffer;
344 unsigned long size;
345 int ret;
346
347 if (item->object.parsed)
348 return 0;
349 buffer = read_sha1_file(item->object.sha1, type, &size);
350 if (!buffer)
351 return error("Could not read %s",
352 sha1_to_hex(item->object.sha1));
353 if (strcmp(type, commit_type)) {
354 free(buffer);
355 return error("Object %s not a commit",
356 sha1_to_hex(item->object.sha1));
357 }
358 ret = parse_commit_buffer(item, buffer, size);
60ab26de 359 if (save_commit_buffer && !ret) {
3ff1fbbb
LT
360 item->buffer = buffer;
361 return 0;
362 }
bd2c39f5
NP
363 free(buffer);
364 return ret;
365}
366
ac5155ef 367struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
dd97f850 368{
812666c8 369 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
dd97f850
DB
370 new_list->item = item;
371 new_list->next = *list_p;
372 *list_p = new_list;
ac5155ef 373 return new_list;
dd97f850
DB
374}
375
175785e5
DB
376void free_commit_list(struct commit_list *list)
377{
378 while (list) {
379 struct commit_list *temp = list;
380 list = temp->next;
381 free(temp);
382 }
383}
dd97f850 384
f755494c 385struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
dd97f850
DB
386{
387 struct commit_list **pp = list;
388 struct commit_list *p;
389 while ((p = *pp) != NULL) {
390 if (p->item->date < item->date) {
391 break;
392 }
393 pp = &p->next;
394 }
f755494c 395 return commit_list_insert(item, pp);
dd97f850
DB
396}
397
398
399void sort_by_date(struct commit_list **list)
400{
401 struct commit_list *ret = NULL;
402 while (*list) {
f755494c 403 insert_by_date((*list)->item, &ret);
dd97f850
DB
404 *list = (*list)->next;
405 }
406 *list = ret;
407}
408
58e28af6
DB
409struct commit *pop_most_recent_commit(struct commit_list **list,
410 unsigned int mark)
dd97f850
DB
411{
412 struct commit *ret = (*list)->item;
413 struct commit_list *parents = ret->parents;
414 struct commit_list *old = *list;
415
416 *list = (*list)->next;
417 free(old);
418
419 while (parents) {
4056c091 420 struct commit *commit = parents->item;
58e28af6
DB
421 parse_commit(commit);
422 if (!(commit->object.flags & mark)) {
423 commit->object.flags |= mark;
f755494c 424 insert_by_date(commit, list);
4056c091 425 }
dd97f850
DB
426 parents = parents->next;
427 }
428 return ret;
429}
e3bc7a3b 430
f8f9c73c
JH
431void clear_commit_marks(struct commit *commit, unsigned int mark)
432{
433 struct commit_list *parents;
434
f8f9c73c 435 commit->object.flags &= ~mark;
58ecf5c1 436 parents = commit->parents;
f8f9c73c 437 while (parents) {
160b7983 438 struct commit *parent = parents->item;
58ecf5c1
JH
439
440 /* Have we already cleared this? */
441 if (mark & parent->object.flags)
160b7983 442 clear_commit_marks(parent, mark);
f8f9c73c
JH
443 parents = parents->next;
444 }
445}
446
e3bc7a3b
LT
447/*
448 * Generic support for pretty-printing the header
449 */
450static int get_one_line(const char *msg, unsigned long len)
451{
452 int ret = 0;
453
454 while (len--) {
455 char c = *msg++;
684958ae
LT
456 if (!c)
457 break;
e3bc7a3b
LT
458 ret++;
459 if (c == '\n')
460 break;
e3bc7a3b
LT
461 }
462 return ret;
463}
464
cdd406e3
JH
465static int is_rfc2047_special(char ch)
466{
467 return ((ch & 0x80) || (ch == '=') || (ch == '?') || (ch == '_'));
468}
469
470static int add_rfc2047(char *buf, const char *line, int len)
471{
472 char *bp = buf;
473 int i, needquote;
474 static const char q_utf8[] = "=?utf-8?q?";
475
476 for (i = needquote = 0; !needquote && i < len; i++) {
477 unsigned ch = line[i];
478 if (ch & 0x80)
479 needquote++;
480 if ((i + 1 < len) &&
481 (ch == '=' && line[i+1] == '?'))
482 needquote++;
483 }
484 if (!needquote)
485 return sprintf(buf, "%.*s", len, line);
486
487 memcpy(bp, q_utf8, sizeof(q_utf8)-1);
488 bp += sizeof(q_utf8)-1;
489 for (i = 0; i < len; i++) {
0da46771 490 unsigned ch = line[i] & 0xFF;
cdd406e3
JH
491 if (is_rfc2047_special(ch)) {
492 sprintf(bp, "=%02X", ch);
493 bp += 3;
494 }
495 else if (ch == ' ')
496 *bp++ = '_';
497 else
498 *bp++ = ch;
499 }
500 memcpy(bp, "?=", 2);
501 bp += 2;
502 return bp - buf;
503}
504
3dfb9278
JF
505static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
506 const char *line, int relative_date)
e3bc7a3b
LT
507{
508 char *date;
5de36bfe 509 int namelen;
e3bc7a3b 510 unsigned long time;
000182ea 511 int tz, ret;
ff56fe1c 512 const char *filler = " ";
e3bc7a3b 513
d87449c5
JH
514 if (fmt == CMIT_FMT_ONELINE)
515 return 0;
e3bc7a3b
LT
516 date = strchr(line, '>');
517 if (!date)
518 return 0;
519 namelen = ++date - line;
520 time = strtoul(date, &date, 10);
521 tz = strtol(date, NULL, 10);
522
3eefc189 523 if (fmt == CMIT_FMT_EMAIL) {
cdd406e3
JH
524 char *name_tail = strchr(line, '<');
525 int display_name_length;
526 if (!name_tail)
527 return 0;
528 while (line < name_tail && isspace(name_tail[-1]))
529 name_tail--;
530 display_name_length = name_tail - line;
3eefc189 531 filler = "";
cdd406e3
JH
532 strcpy(buf, "From: ");
533 ret = strlen(buf);
534 ret += add_rfc2047(buf + ret, line, display_name_length);
535 memcpy(buf + ret, name_tail, namelen - display_name_length);
536 ret += namelen - display_name_length;
537 buf[ret++] = '\n';
538 }
539 else {
540 ret = sprintf(buf, "%s: %.*s%.*s\n", what,
541 (fmt == CMIT_FMT_FULLER) ? 4 : 0,
542 filler, namelen, line);
3eefc189 543 }
ff56fe1c
JH
544 switch (fmt) {
545 case CMIT_FMT_MEDIUM:
3dfb9278
JF
546 ret += sprintf(buf + ret, "Date: %s\n",
547 show_date(time, tz, relative_date));
ff56fe1c 548 break;
3eefc189 549 case CMIT_FMT_EMAIL:
2a387043
JH
550 ret += sprintf(buf + ret, "Date: %s\n",
551 show_rfc2822_date(time, tz));
3eefc189 552 break;
ff56fe1c 553 case CMIT_FMT_FULLER:
3dfb9278
JF
554 ret += sprintf(buf + ret, "%sDate: %s\n", what,
555 show_date(time, tz, relative_date));
ff56fe1c
JH
556 break;
557 default:
558 /* notin' */
559 break;
560 }
000182ea
LT
561 return ret;
562}
563
3eefc189 564static int is_empty_line(const char *line, int *len_p)
000182ea 565{
3eefc189 566 int len = *len_p;
000182ea
LT
567 while (len && isspace(line[len-1]))
568 len--;
3eefc189 569 *len_p = len;
000182ea 570 return !len;
e3bc7a3b
LT
571}
572
f2d42275 573static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
28342a5d 574{
f2d42275
JH
575 struct commit_list *parent = commit->parents;
576 int offset;
d87449c5 577
3eefc189
JH
578 if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
579 !parent || !parent->next)
f2d42275
JH
580 return 0;
581
582 offset = sprintf(buf, "Merge:");
583
584 while (parent) {
585 struct commit *p = parent->item;
14763e7b
EW
586 const char *hex = NULL;
587 const char *dots;
588 if (abbrev)
589 hex = find_unique_abbrev(p->object.sha1, abbrev);
590 if (!hex)
591 hex = sha1_to_hex(p->object.sha1);
592 dots = (abbrev && strlen(hex) != 40) ? "..." : "";
f2d42275
JH
593 parent = parent->next;
594
6bfb27a0 595 offset += sprintf(buf + offset, " %s%s", hex, dots);
28342a5d 596 }
f2d42275 597 buf[offset++] = '\n';
28342a5d
LT
598 return offset;
599}
600
52883fbd
JH
601static char *get_header(const struct commit *commit, const char *key)
602{
603 int key_len = strlen(key);
604 const char *line = commit->buffer;
605
606 for (;;) {
607 const char *eol = strchr(line, '\n'), *next;
608
609 if (line == eol)
610 return NULL;
611 if (!eol) {
612 eol = line + strlen(line);
613 next = NULL;
614 } else
615 next = eol + 1;
616 if (!strncmp(line, key, key_len) && line[key_len] == ' ') {
617 int len = eol - line - key_len;
618 char *ret = xmalloc(len);
619 memcpy(ret, line + key_len + 1, len - 1);
620 ret[len - 1] = '\0';
621 return ret;
622 }
623 line = next;
624 }
625}
626
627static char *logmsg_reencode(const struct commit *commit)
628{
d2c11a38 629 char *encoding;
52883fbd 630 char *out;
d2c11a38
JH
631 char *output_encoding = (git_log_output_encoding
632 ? git_log_output_encoding
633 : git_commit_encoding);
52883fbd 634
d2c11a38 635 if (!output_encoding)
4b46e22d
JH
636 output_encoding = "utf-8";
637 else if (!*output_encoding)
52883fbd 638 return NULL;
d2c11a38
JH
639 encoding = get_header(commit, "encoding");
640 if (!encoding || !strcmp(encoding, output_encoding)) {
641 free(encoding);
642 return NULL;
643 }
644 out = reencode_string(commit->buffer, output_encoding, encoding);
52883fbd
JH
645 free(encoding);
646 if (!out)
647 return NULL;
648 return out;
649}
650
651unsigned long pretty_print_commit(enum cmit_fmt fmt,
652 const struct commit *commit,
653 unsigned long len,
654 char *buf, unsigned long space,
3dfb9278 655 int abbrev, const char *subject,
52883fbd
JH
656 const char *after_subject,
657 int relative_date)
e3bc7a3b 658{
000182ea 659 int hdr = 1, body = 0;
e3bc7a3b 660 unsigned long offset = 0;
3eefc189 661 int indent = 4;
f2d42275 662 int parents_shown = 0;
3815f423 663 const char *msg = commit->buffer;
c831da66 664 int plain_non_ascii = 0;
d2c11a38 665 char *reencoded = logmsg_reencode(commit);
52883fbd 666
d2c11a38
JH
667 if (reencoded)
668 msg = reencoded;
3eefc189 669
3eefc189
JH
670 if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
671 indent = 0;
e3bc7a3b 672
c831da66
JH
673 /* After-subject is used to pass in Content-Type: multipart
674 * MIME header; in that case we do not have to do the
675 * plaintext content type even if the commit message has
676 * non 7-bit ASCII character. Otherwise, check if we need
677 * to say this is not a 7-bit ASCII.
678 */
679 if (fmt == CMIT_FMT_EMAIL && !after_subject) {
0da46771
JH
680 int i, ch, in_body;
681
682 for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
683 if (!in_body) {
684 /* author could be non 7-bit ASCII but
d2c11a38 685 * the log may be so; skip over the
0da46771
JH
686 * header part first.
687 */
688 if (ch == '\n' &&
689 i + 1 < len && msg[i+1] == '\n')
690 in_body = 1;
691 }
692 else if (ch & 0x80) {
c831da66 693 plain_non_ascii = 1;
0da46771
JH
694 break;
695 }
696 }
c831da66
JH
697 }
698
e3bc7a3b
LT
699 for (;;) {
700 const char *line = msg;
701 int linelen = get_one_line(msg, len);
702
703 if (!linelen)
704 break;
705
706 /*
707 * We want some slop for indentation and a possible
708 * final "...". Thus the "+ 20".
709 */
710 if (offset + linelen + 20 > space) {
711 memcpy(buf + offset, " ...\n", 8);
712 offset += 8;
713 break;
714 }
715
716 msg += linelen;
717 len -= linelen;
e3bc7a3b 718 if (hdr) {
000182ea
LT
719 if (linelen == 1) {
720 hdr = 0;
3eefc189 721 if ((fmt != CMIT_FMT_ONELINE) && !subject)
d87449c5 722 buf[offset++] = '\n';
000182ea
LT
723 continue;
724 }
725 if (fmt == CMIT_FMT_RAW) {
726 memcpy(buf + offset, line, linelen);
727 offset += linelen;
728 continue;
729 }
28342a5d
LT
730 if (!memcmp(line, "parent ", 7)) {
731 if (linelen != 48)
732 die("bad parent line in commit");
f2d42275 733 continue;
28342a5d 734 }
ff56fe1c 735
f2d42275
JH
736 if (!parents_shown) {
737 offset += add_merge_info(fmt, buf + offset,
738 commit, abbrev);
739 parents_shown = 1;
740 continue;
741 }
ff56fe1c
JH
742 /*
743 * MEDIUM == DEFAULT shows only author with dates.
744 * FULL shows both authors but not dates.
745 * FULLER shows both authors and dates.
746 */
e3bc7a3b 747 if (!memcmp(line, "author ", 7))
ff56fe1c
JH
748 offset += add_user_info("Author", fmt,
749 buf + offset,
3dfb9278
JF
750 line + 7,
751 relative_date);
ff56fe1c
JH
752 if (!memcmp(line, "committer ", 10) &&
753 (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
754 offset += add_user_info("Commit", fmt,
755 buf + offset,
3dfb9278
JF
756 line + 10,
757 relative_date);
e3bc7a3b
LT
758 continue;
759 }
000182ea 760
19b3bd3e
RS
761 if (!subject)
762 body = 1;
763
3eefc189 764 if (is_empty_line(line, &linelen)) {
000182ea
LT
765 if (!body)
766 continue;
3eefc189
JH
767 if (subject)
768 continue;
000182ea
LT
769 if (fmt == CMIT_FMT_SHORT)
770 break;
000182ea 771 }
d87449c5 772
3eefc189 773 if (subject) {
53f420ef
JH
774 int slen = strlen(subject);
775 memcpy(buf + offset, subject, slen);
776 offset += slen;
cdd406e3
JH
777 offset += add_rfc2047(buf + offset, line, linelen);
778 }
779 else {
780 memset(buf + offset, ' ', indent);
781 memcpy(buf + offset + indent, line, linelen);
782 offset += linelen + indent;
3eefc189 783 }
3eefc189 784 buf[offset++] = '\n';
d87449c5
JH
785 if (fmt == CMIT_FMT_ONELINE)
786 break;
c831da66 787 if (subject && plain_non_ascii) {
cdd406e3
JH
788 static const char header[] =
789 "Content-Type: text/plain; charset=UTF-8\n"
790 "Content-Transfer-Encoding: 8bit\n";
791 memcpy(buf + offset, header, sizeof(header)-1);
792 offset += sizeof(header)-1;
cdd406e3 793 }
698ce6f8
JS
794 if (after_subject) {
795 int slen = strlen(after_subject);
796 if (slen > space - offset - 1)
797 slen = space - offset - 1;
798 memcpy(buf + offset, after_subject, slen);
799 offset += slen;
800 after_subject = NULL;
801 }
3eefc189 802 subject = NULL;
d87449c5 803 }
40c2fe00
LT
804 while (offset && isspace(buf[offset-1]))
805 offset--;
806 /* Make sure there is an EOLN for the non-oneline case */
807 if (fmt != CMIT_FMT_ONELINE)
808 buf[offset++] = '\n';
19b3bd3e
RS
809 /*
810 * make sure there is another EOLN to separate the headers from whatever
811 * body the caller appends if we haven't already written a body
812 */
813 if (fmt == CMIT_FMT_EMAIL && !body)
814 buf[offset++] = '\n';
e3bc7a3b 815 buf[offset] = '\0';
52883fbd
JH
816
817 free(reencoded);
e3bc7a3b
LT
818 return offset;
819}
a3437b8c
JS
820
821struct commit *pop_commit(struct commit_list **stack)
822{
823 struct commit_list *top = *stack;
824 struct commit *item = top ? top->item : NULL;
825
826 if (top) {
827 *stack = top->next;
828 free(top);
829 }
830 return item;
831}
832
833int count_parents(struct commit * commit)
834{
96f1e58f 835 int count;
a3437b8c 836 struct commit_list * parents = commit->parents;
96f1e58f
DR
837 for (count = 0; parents; parents = parents->next,count++)
838 ;
a3437b8c
JS
839 return count;
840}
841
6b6dcfc2
FK
842void topo_sort_default_setter(struct commit *c, void *data)
843{
d3ff6f55 844 c->util = data;
6b6dcfc2
FK
845}
846
847void *topo_sort_default_getter(struct commit *c)
848{
d3ff6f55 849 return c->util;
6b6dcfc2
FK
850}
851
ab580ace
JS
852/*
853 * Performs an in-place topological sort on the list supplied.
854 */
4c8725f1 855void sort_in_topological_order(struct commit_list ** list, int lifo)
6b6dcfc2
FK
856{
857 sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
858 topo_sort_default_getter);
859}
860
861void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
862 topo_sort_set_fn_t setter,
863 topo_sort_get_fn_t getter)
ab580ace
JS
864{
865 struct commit_list * next = *list;
2ed02887 866 struct commit_list * work = NULL, **insert;
ab580ace
JS
867 struct commit_list ** pptr = list;
868 struct sort_node * nodes;
869 struct sort_node * next_nodes;
870 int count = 0;
871
872 /* determine the size of the list */
873 while (next) {
874 next = next->next;
875 count++;
876 }
7d6fb370
EW
877
878 if (!count)
879 return;
ab580ace
JS
880 /* allocate an array to help sort the list */
881 nodes = xcalloc(count, sizeof(*nodes));
882 /* link the list to the array */
883 next_nodes = nodes;
884 next=*list;
885 while (next) {
886 next_nodes->list_item = next;
6b6dcfc2 887 setter(next->item, next_nodes);
ab580ace
JS
888 next_nodes++;
889 next = next->next;
890 }
891 /* update the indegree */
892 next=*list;
893 while (next) {
894 struct commit_list * parents = next->item->parents;
895 while (parents) {
896 struct commit * parent=parents->item;
6b6dcfc2
FK
897 struct sort_node * pn = (struct sort_node *) getter(parent);
898
ab580ace
JS
899 if (pn)
900 pn->indegree++;
901 parents=parents->next;
902 }
903 next=next->next;
904 }
905 /*
906 * find the tips
907 *
908 * tips are nodes not reachable from any other node in the list
909 *
910 * the tips serve as a starting set for the work queue.
911 */
912 next=*list;
2ed02887 913 insert = &work;
ab580ace 914 while (next) {
6b6dcfc2 915 struct sort_node * node = (struct sort_node *) getter(next->item);
ab580ace
JS
916
917 if (node->indegree == 0) {
2ed02887 918 insert = &commit_list_insert(next->item, insert)->next;
ab580ace
JS
919 }
920 next=next->next;
921 }
4c8725f1 922
ab580ace 923 /* process the list in topological order */
4c8725f1
JH
924 if (!lifo)
925 sort_by_date(&work);
ab580ace
JS
926 while (work) {
927 struct commit * work_item = pop_commit(&work);
6b6dcfc2 928 struct sort_node * work_node = (struct sort_node *) getter(work_item);
ab580ace
JS
929 struct commit_list * parents = work_item->parents;
930
931 while (parents) {
932 struct commit * parent=parents->item;
6b6dcfc2
FK
933 struct sort_node * pn = (struct sort_node *) getter(parent);
934
ab580ace 935 if (pn) {
6b6dcfc2 936 /*
ab580ace
JS
937 * parents are only enqueued for emission
938 * when all their children have been emitted thereby
939 * guaranteeing topological order.
940 */
941 pn->indegree--;
4c8725f1
JH
942 if (!pn->indegree) {
943 if (!lifo)
944 insert_by_date(parent, &work);
945 else
946 commit_list_insert(parent, &work);
947 }
ab580ace
JS
948 }
949 parents=parents->next;
950 }
951 /*
952 * work_item is a commit all of whose children
953 * have already been emitted. we can emit it now.
954 */
955 *pptr = work_node->list_item;
956 pptr = &(*pptr)->next;
957 *pptr = NULL;
6b6dcfc2 958 setter(work_item, NULL);
ab580ace
JS
959 }
960 free(nodes);
961}
7c6f8aaf
JS
962
963/* merge-rebase stuff */
964
577ed5c2
JH
965/* bits #0..15 in revision.h */
966#define PARENT1 (1u<<16)
967#define PARENT2 (1u<<17)
968#define STALE (1u<<18)
969#define RESULT (1u<<19)
7c6f8aaf
JS
970
971static struct commit *interesting(struct commit_list *list)
972{
973 while (list) {
974 struct commit *commit = list->item;
975 list = list->next;
542ccefe 976 if (commit->object.flags & STALE)
7c6f8aaf
JS
977 continue;
978 return commit;
979 }
980 return NULL;
981}
982
f3249438 983static struct commit_list *merge_bases(struct commit *one, struct commit *two)
7c6f8aaf
JS
984{
985 struct commit_list *list = NULL;
986 struct commit_list *result = NULL;
7c6f8aaf 987
f3249438
JH
988 if (one == two)
989 /* We do not mark this even with RESULT so we do not
990 * have to clean it up.
991 */
992 return commit_list_insert(one, &result);
7c6f8aaf 993
f3249438
JH
994 parse_commit(one);
995 parse_commit(two);
7c6f8aaf 996
f3249438
JH
997 one->object.flags |= PARENT1;
998 two->object.flags |= PARENT2;
999 insert_by_date(one, &list);
1000 insert_by_date(two, &list);
7c6f8aaf
JS
1001
1002 while (interesting(list)) {
f3249438 1003 struct commit *commit;
7c6f8aaf 1004 struct commit_list *parents;
f3249438
JH
1005 struct commit_list *n;
1006 int flags;
7c6f8aaf 1007
f3249438
JH
1008 commit = list->item;
1009 n = list->next;
1010 free(list);
1011 list = n;
7c6f8aaf 1012
f3249438
JH
1013 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
1014 if (flags == (PARENT1 | PARENT2)) {
1015 if (!(commit->object.flags & RESULT)) {
1016 commit->object.flags |= RESULT;
1017 insert_by_date(commit, &result);
1018 }
542ccefe
JH
1019 /* Mark parents of a found merge stale */
1020 flags |= STALE;
7c6f8aaf
JS
1021 }
1022 parents = commit->parents;
1023 while (parents) {
1024 struct commit *p = parents->item;
1025 parents = parents->next;
1026 if ((p->object.flags & flags) == flags)
1027 continue;
1028 parse_commit(p);
1029 p->object.flags |= flags;
1030 insert_by_date(p, &list);
1031 }
1032 }
1033
f3249438
JH
1034 /* Clean up the result to remove stale ones */
1035 list = result; result = NULL;
1036 while (list) {
1037 struct commit_list *n = list->next;
1038 if (!(list->item->object.flags & STALE))
1039 insert_by_date(list->item, &result);
1040 free(list);
1041 list = n;
1042 }
1043 return result;
1044}
7c6f8aaf 1045
f3249438
JH
1046struct commit_list *get_merge_bases(struct commit *one,
1047 struct commit *two,
1048 int cleanup)
1049{
1050 const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1051 struct commit_list *list;
1052 struct commit **rslt;
1053 struct commit_list *result;
1054 int cnt, i, j;
1055
1056 result = merge_bases(one, two);
1057 if (one == two)
1058 return result;
1059 if (!result || !result->next) {
1060 if (cleanup) {
1061 clear_commit_marks(one, all_flags);
1062 clear_commit_marks(two, all_flags);
7c6f8aaf 1063 }
f3249438 1064 return result;
7c6f8aaf
JS
1065 }
1066
f3249438
JH
1067 /* There are more than one */
1068 cnt = 0;
1069 list = result;
1070 while (list) {
1071 list = list->next;
1072 cnt++;
1073 }
1074 rslt = xcalloc(cnt, sizeof(*rslt));
1075 for (list = result, i = 0; list; list = list->next)
1076 rslt[i++] = list->item;
1077 free_commit_list(result);
1078
1079 clear_commit_marks(one, all_flags);
1080 clear_commit_marks(two, all_flags);
1081 for (i = 0; i < cnt - 1; i++) {
1082 for (j = i+1; j < cnt; j++) {
1083 if (!rslt[i] || !rslt[j])
1084 continue;
1085 result = merge_bases(rslt[i], rslt[j]);
1086 clear_commit_marks(rslt[i], all_flags);
1087 clear_commit_marks(rslt[j], all_flags);
1088 for (list = result; list; list = list->next) {
1089 if (rslt[i] == list->item)
1090 rslt[i] = NULL;
1091 if (rslt[j] == list->item)
1092 rslt[j] = NULL;
1093 }
1094 }
58ecf5c1 1095 }
7c6f8aaf 1096
f3249438
JH
1097 /* Surviving ones in rslt[] are the independent results */
1098 result = NULL;
1099 for (i = 0; i < cnt; i++) {
1100 if (rslt[i])
1101 insert_by_date(rslt[i], &result);
1102 }
1103 free(rslt);
7c6f8aaf
JS
1104 return result;
1105}
2ecd2bbc
JH
1106
1107int in_merge_bases(struct commit *rev1, struct commit *rev2)
1108{
1109 struct commit_list *bases, *b;
1110 int ret = 0;
1111
1112 bases = get_merge_bases(rev1, rev2, 1);
1113 for (b = bases; b; b = b->next) {
1114 if (!hashcmp(rev1->object.sha1, b->item->object.sha1)) {
1115 ret = 1;
1116 break;
1117 }
1118 }
1119
1120 free_commit_list(bases);
1121 return ret;
1122}